Dear Michael, On Wed, Dec 12, 2012 at 01:34:52PM +0100, Michael Franzl wrote: > On 12/11/2012 10:04 PM, Cédric Boutillier wrote: > >I do not feel completely comfortable with the fact that you patch files > >that are not installed. If you want to preserve the changes for later, > >may I propose you to split the patch into two: one for files in > >examples, the other for benchmark/, and keep just the one for examples/ > >in debian/patches/series? > Ok, I removed the patches for the benchmarks and restored them to > the upstream version. > >Please also, keep the master branch with the patches unapplied (this is > >a convention we use in the Ruby team). > I manually restored the upstream file contents (the patches are > still there) but now dpkg-source raises: > pkg-source: error: aborting due to unexpected upstream changes > I would need help with this. I cannot find your changes in your repo on github. Have you pushed the changes? Could you check the diff between the master branch and the upstream branch with 'git diff --diff-filter=M master upstream' and see what changed? Try also to remove the files (packages and tarballs) in your parent directory, to check there is no conflict with them. When I committed the following changes on the repo I have - unapplied patches with dquilt pop -a (and removed .pc) - git checkout upstream .gitignore I could build the package with git-buildpackage --git-pbuilder. One last thing I overlooked: could you please create debian/source/local-options with the one line: ----8<---- unapply-patches ---->8---- so that patches get unapplied after the build? Greetings, Cédric
Attachment:
signature.asc
Description: Digital signature