Just switching to dpkg source format 3.0 does not work nicely with git-buildpackage: the source format auto-applies patches and leave it as such after package cleanup, while git-buildpackage expects patches to be unapplied.

As some may have noticed in past threads, I have not liked the approach of extending debian/rules to explicitly unapply patches based on e.g. the existance of the .git directory. I find that a bad hack.

It seems the proper solution is at hand: I noticed at Debian Planet the
following entry: http://raphaelhertzog.com/2010/09/14/how-to-customize-dpkg-sources-behaviour-in-your-debian-source-package/

In that blog entry, Raphaƫl mentions the special file debian/source/local-options which is taken into account during build but not included into the generated source package.

I hereby propose that we recommend generally switching to source format 3.0 (quilt) - even for packages not currently using patches - and add
the following info to debian/source/local-options:

unapply-patches = True
abort-on-uptream-changes = True

Warning: This is completely untested. Just written based on above blog entry. ;-)

 - Jonas

 * Jonas Smedegaard - idealist & Internet-arkitekt
 * Tlf.: +45 40843136  Website: http://dr.jones.dk/

 [x] quote me freely  [ ] ask before reusing  [ ] keep private

Attachment: signature.asc
Description: Digital signature

pkg-multimedia-maintainers mailing list

Reply via email to