Bug#339685: glib2.0: Not binNMU-able using + notation.

[Kurt Roeckx]

On Fri, Nov 18, 2005 at 09:49:49AM +0100, Sebastien Bacher wrote:
> On ven, 2005-11-18 at 00:54 +0100, Kurt Roeckx wrote:
> 
> > allow the old scheme anymore.  For some reason we ended up with
> > libglib2.0-0 depending on libglib2.0-udeb
> 
> Please debug this so we can know that next upload will not do the same.
> 
> 
> > Maybe I can get the archive to accept the -1.0.1 again, but I'm
> > not sure (yete).  Would you have a problem if I did an NMU for this?
> 
> No need of a NMU, I'm responsive. Start by figuring why you Depends on a
> udeb.

We haven't really found the root cause of this, but the attached
patch fixes it.


Kurt

-------------- next part --------------
diff -u glib2.0-2.8.4/debian/rules glib2.0-2.8.4/debian/rules
--- glib2.0-2.8.4/debian/rules
+++ glib2.0-2.8.4/debian/rules
@@ -35,7 +35,7 @@
 
 ##
 debversion=$(shell dpkg-parsechangelog | grep '^Version: ' | sed -e 's/^Version: //')
-version=$(shell echo ${debversion} | sed -e 's/-[A-Za-z0-9\.]*$$//g' -e 's/+[A-Za-z0-9\.]*$$//g')
+version=$(shell echo ${debversion} | sed -e 's/-[A-Za-z0-9\.\+]*$$//g')
 major=$(shell echo ${version} | sed -e 's/\(^[0-9]*\)\.[0-9]*\.[0-9]*$$/\1/')
 minor=$(shell echo ${version} | sed -e 's/^[0-9]*\.\([0-9]*\)\.[0-9]*$$/\1/')
 rel=$(shell echo ${version} | sed -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\)$$/\1/')
@@ -250,12 +250,10 @@
 	dh_strip -a --dbg-package=libglib$(apiver)-$(soname)
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -a -Nlibglib$(apiver)-$(soname)-dbg
 	dh_makeshlibs	-plibglib$(apiver)-$(soname) \
 			-V "libglib${apiver}-${soname} (>= ${shver})"
 	dh_installdeb -a
-	dh_shlibdeps -l$(libpath) -a
-	cat debian/*/DEBIAN/shlibs > debian/shlibs.local
+	dh_shlibdeps -ldebian/libglib$(apiver)-$(soname)/usr/lib -Llibglib$(apiver)-$(soname) -a
 	dh_gencontrol -a -Nlibglib$(apiver)-udeb
 	dh_md5sums -a -Nlibglib$(apiver)-udeb
 	dh_builddeb -a -Nlibglib$(apiver)-udeb
diff -u glib2.0-2.8.4/debian/changelog glib2.0-2.8.4/debian/changelog
--- glib2.0-2.8.4/debian/changelog
+++ glib2.0-2.8.4/debian/changelog
@@ -1,3 +1,16 @@
+glib2.0 (2.8.4-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Change the extraction of the version from the debian version so it
+    properly gives the upstream version when using binNMUs.
+    (Closes: #339685)
+  * Remove extra call to dh_makeshlibs for the udeb, since udebs can't
+    have shlibs in the first place.
+  * Call dh_shlibdeps with the proper arguments, instead of copying
+    the shlibs to shlibs.local
+
+ -- kurt Roeckx <kurt at roeckx.be>  Sat, 19 Nov 2005 20:27:30 +0100
+
 glib2.0 (2.8.4-1) unstable; urgency=low
 
   * New upstream version.