On Mon, 22 Oct 2012 18:49:32 +0200, Jakub Wilk wrote: > >>The "Version: " string could occur in the changelog, causing a > >>little explosion: > >> > >>$ dch --bin-NMU 'I added Version: here to break this package' > >>$ dpkg-buildpackage -B > >>[...] > >>dh_gencontrol -a -- -v'1:1.0.0-15.1+b1 * I added here to break this > >>package' > >>dh_md5sums -a > >>dh_builddeb -a > >>dpkg-deb: error: parsing file 'debian/python-kjbuckets/DEBIAN/control' near > >>line 3 package 'python-kjbuckets': > >>error in Version string '1:1.0.0-15.1+b1 * I added here to break this > >>package': version string has embedded spaces > >>dh_builddeb: dpkg-deb --build debian/python-kjbuckets .. returned exit code > >>2 > >>make: *** [binary-arch] Error 1 > > > >Oops. Nice catch, thanks. > > > >I greppd through a couple of source packages, and I found all kind > >of interesting regexps for this case. > >But I think anchoring the regexp at the beginning of the string > >should be enough? > > > >dpkg-parsechangelog | sed -n 's/^Version: //p' > > Yes, this one should be fine.
Thanks for double-checking! I've re-uploaded the package to DELAYED/2 with the attached debdiff. Cheers, gregor -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: R.E.M.: E-Bow The Letter
diff -u gadfly-1.0.0/debian/rules gadfly-1.0.0/debian/rules --- gadfly-1.0.0/debian/rules +++ gadfly-1.0.0/debian/rules @@ -7,7 +7,7 @@ DEFAULT_PYTHON = python$(VER) -kjb_version=1:$${source:Version} +kjb_version=1:$(shell dpkg-parsechangelog | sed -n 's/^Version: //p') include /usr/share/python/python.mk diff -u gadfly-1.0.0/debian/control gadfly-1.0.0/debian/control --- gadfly-1.0.0/debian/control +++ gadfly-1.0.0/debian/control @@ -4,7 +4,7 @@ Maintainer: Matthias Klose <d...@debian.org> Standards-Version: 3.9.1 XS-Python-Version: all -Build-Depends: debhelper (>= 7), python-all-dev (>= 2.6.6-14) +Build-Depends: debhelper (>= 7), python-all-dev (>= 2.6.6-14), dpkg-dev (>= 1.16.9) Package: gadfly Section: interpreters diff -u gadfly-1.0.0/debian/changelog gadfly-1.0.0/debian/changelog --- gadfly-1.0.0/debian/changelog +++ gadfly-1.0.0/debian/changelog @@ -1,3 +1,16 @@ +gadfly (1.0.0-15.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "build wrong version of the packaging during a binNMU": + - debian/rules: get binary package version from dpkg-parsechangelog + instead of using ${source:Version}; thanks to Guillem Jover for the + patch, and to Jakub Wilk for the improvement + - debian/control: build-depend on dpkg-dev (>= 1.16.9) + (cf. #690823) + (Closes: #623578) + + -- gregor herrmann <gre...@debian.org> Mon, 22 Oct 2012 19:10:00 +0200 + gadfly (1.0.0-15) unstable; urgency=low * Build using dh_python2 instead of dh_pycentral. Closes: #616818.
signature.asc
Description: Digital signature