<html> <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"> </head> <body bgcolor="#FFFFFF" text="#000000"> On 15/06/11 19:33, Andreas Moog wrote: <blockquote cite="mid:4DF8FAE4.4040203@ubuntu.com" type="cite"> <pre wrap="">On 06/15/2011 07:40 PM, Dave Walker wrote: </pre> <blockquote type="cite"> <pre wrap="">Currently, if the upstream code is changed (anything other than debian/*).. When dpkg-buildpackage is run, an automated patch is created. This is a really nice feature, but it is very easy to miss this. I have seen multiple uploads where these auto-generated patches have been included accidentally (I have also been guilty of this). </pre> </blockquote> <pre wrap=""> There is a lintian tag for this, format-3.0-but-debian-changes-patch. </pre> <blockquote type="cite"> <pre wrap="">This can be overridden locally with: $ cat ~/.devscripts DEBUILD_DPKG_BUILDPACKAGE_OPTS="--source-option=--abort-on-upstream-changes" I think the chance of someone wanting an auto-generated patch is low, and would like to suggest the default is changed to fail to create the source package. </pre> </blockquote> <pre wrap=""> If that is done, people will run into a problem when they try to change a problematic debian package. That might introduce unnecessary diffs to debian. (because the package will fail on ubuntu) If you want to change the default, it would be better to coordinate with debian. Cheers, Andreas </pre> <fieldset class="mimeAttachmentHeader"></fieldset> </blockquote> Hi, Actually, it seems that it only fails if it introduces a new diff. I just touched a package untouched from Debian, which had a debian-changes-* patch (accidental i believe!) and added a new patch. Using this configuration option, it built as expected. Therefore, i'm not quite sure I understand the concern you outlined. However, as mentioned on the bug report Raphaël has already identified this concern and is landing a fix in Debian. Hurray. Everyone wins. Kind Regards, Dave Walker </body> </html>