Re: [dpkg-dev] auto-generated patch too easily included (debian/patches/debian-changes-*))
On 16/06/2011 04:52, Micah Gersten wrote: > [...] > I actually use this as a feature. I modify the upstream code, create a source > package, then rename the patch and add DEP-3 info. I think it should be opt-in rather than opt-out. I've had too many occasions where I accidentally introduced a new file, say cscope.out/cscope.files, and it ends up creating an unwanted diff. For that reason, I always work on packages in git. This way I get control over what changes I want in and out of the package. That said, the DEBUILD_DPKG_BUILDPACKAGE_OPTS="--source-option=--abort-on-upstream-changes" method seems to work pretty well, so I think I'll just keep that in my .devscripts. -- Kind regards, Loong Jin signature.asc Description: OpenPGP digital signature -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: [dpkg-dev] auto-generated patch too easily included (debian/patches/debian-changes-*))
On 06/15/2011 12:40 PM, Dave Walker wrote: > > Hi, > > 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). > > 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. > > The alternative fix would be a dput hook. > > Thoughts? > > I have raised a bug to track this: > https://launchpad.net/bugs/797839 > > Kind Regards, > Dave Walker > I actually use this as a feature. I modify the upstream code, create a source package, then rename the patch and add DEP-3 info. Micah -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: [dpkg-dev] auto-generated patch too easily included (debian/patches/debian-changes-*))
On 15/06/11 19:33, Andreas Moog wrote: On 06/15/2011 07:40 PM, Dave Walker wrote: 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). There is a lintian tag for this, format-3.0-but-debian-changes-patch. 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. 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 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 -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: [dpkg-dev] auto-generated patch too easily included (debian/patches/debian-changes-*))
On 06/15/2011 07:40 PM, Dave Walker wrote: > 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). There is a lintian tag for this, format-3.0-but-debian-changes-patch. > 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. 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 signature.asc Description: OpenPGP digital signature -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
Re: [dpkg-dev] auto-generated patch too easily included (debian/patches/debian-changes-*))
On Wednesday, June 15, 2011 12:40:27 PM Dave Walker wrote: > Hi, > > 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). > > 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. > > The alternative fix would be a dput hook. > > Thoughts? > > I have raised a bug to track this: > https://launchpad.net/bugs/797839 Please don't make the Ubuntu default different than the Debian default. Scott K -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
[dpkg-dev] auto-generated patch too easily included (debian/patches/debian-changes-*))
Hi, 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). 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. The alternative fix would be a dput hook. Thoughts? I have raised a bug to track this: https://launchpad.net/bugs/797839 Kind Regards, Dave Walker -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
