Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream changes result in failure to apply quilt patches #10

Open
artmg opened this issue Jul 25, 2016 · 2 comments
Open

Upstream changes result in failure to apply quilt patches #10

artmg opened this issue Jul 25, 2016 · 2 comments
Labels
bug upstream

Comments

@artmg
Copy link
Owner

artmg commented Jul 25, 2016

Since recent upstream changes (including merge requests 151, 175, 179) the automatic launchpad builds (across all distro versions) fail - build log shows:

Committed revision 748.
Applying quilt patches
Applying patch make_install.patch
patching file NixNote2.pro
Hunk #2 FAILED at 434.
1 out of 2 hunks FAILED -- rejects in file NixNote2.pro
Restoring NixNote2.pro
Patch make_install.patch does not apply (enforce with -f)
Restoring NixNote2.pro
bzr: ERROR: bzrlib.errors.BzrCommandError: Failed to apply quilt patches
@artmg
Copy link
Owner Author

artmg commented Jul 25, 2016

Upstream Pull Request 175 modifies NixNote2.pro - see commit change details

@artmg
Copy link
Owner Author

artmg commented Jul 25, 2016

And check the upstream .pro file against our make_install.patch updates to this same file

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug upstream
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@artmg