I maintain a package using git. So in the normal state in which I check stuff in the the patches are unapplied. The upstream makefiles happen to remake a number of files (to generate random numbers for security). Obviously I don't want to stop that, but I do want to restore those files before I check anything else in. So my normal build sequence might be:
dpkg-buildpackage -us -uc fakeroot debian/rules clean quilt pop -a rm -rf .pc At that point I would expect to have a completely clean git workspace. Ater the upgrade, the patches are unapplied during the dpkg-buildpackage. I can see no way of stopping it. The unapply-patches local option enforces exactly that behaviour which I don't want. I would like the old behaviour at least as an option. On 26/09/11 21:34, Jonathan Nieder wrote: > Hi Nicholas, > > Nicholas Bamber wrote: > >> The following change: >> >> * Changed dpkg-source --after-build to automatically unapply patches that >> it >> has applied during --before-build. >> >> causes a problem where the clean rules of the upstream makefile >> have been patched to ensure that the clean works. In this scenario >> one always wants to do a clean and then unapply the patches. >> >> The offending behaviour used to be optional and not the default. >> The option (which is now presumably meaningless) is still documented >> as being available. >> >> There is no option to turn the offending behaviour off. > > Please forgive me for my ignorance. Which option are you talking > about? Could you give an example of the offending behavior? > > Note that --after-build only unapplies patches when patches were > applied during --before-build (as indicated by > debian/patches/.dpkg-source-applied). So, for example, in the > following sequence > > dpkg-source -x <package>.dsc > cd <package>-<version> > dpkg-buildpackage > > the patches are left applied after build. Similarly, in the following > sequence > > git clone <package>.git > cd <package> > git checkout packaging-with-patches-applied > dpkg-buildpackage > > the patches remain applied after build. And by contrast, in the > following sequence > > git clone <package>.git > cd <package> > git checkout packagin-without-patches-applied > dpkg-buildpackage > > the patches are unapplied after build. > > The --unapply-patches option still exists and functions as advertised, > unless I am missing something. > > Puzzled, > Jonathan -- Nicholas Bamber | http://www.periapt.co.uk/ PGP key 3BFFE73C from pgp.mit.edu -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
