[xml/sgml-pkgs] Bug#647340: libexpat1-dev: Broken symbolic links

[Jonathan Nieder]

severity 647340 grave
tags 647340 + patch
quit

Michael Rasmussen wrote:

> Severity: critical
> Justification: breaks unrelated software

Programs building against libexpat are not unrelated. :)

> $ file /usr/lib/x86_64-linux-gnu/libexpatw.so
> /usr/lib/x86_64-linux-gnu/libexpatw.so: broken symbolic link to `libexpatw.so.1.5.2'

Yep.  It looks like the patch for bug#637101 was incomplete.  I would
suggest rolling back to 2.0.1-7 for now, since expat is a
reverse-build-dependency of many packages.

By the way, which DSOs actually need to be in /lib?

Thanks for your work,
Jonathan
-------------- next part --------------
diff -u expat-2.0.1/debian/changelog expat-2.0.1/debian/changelog
--- expat-2.0.1/debian/changelog
+++ expat-2.0.1/debian/changelog
@@ -1,3 +1,10 @@
+expat (2.0.1-7.2) local; urgency=low
+
+  * Back out changes from the last NMU.  (Closes: #647340; reopens:
+    #632261, #637101).
+
+ -- Jonathan Nieder <jrnieder at gmail.com>  Wed, 02 Nov 2011 00:12:07 -0500
+
 expat (2.0.1-7.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u expat-2.0.1/debian/libexpat1-dev.install expat-2.0.1/debian/libexpat1-dev.install
--- expat-2.0.1/debian/libexpat1-dev.install
+++ expat-2.0.1/debian/libexpat1-dev.install
@@ -1,6 +1,6 @@
 usr/include
-usr/lib/*/*.a
-usr/lib/*/*.la
-usr/lib/*/*.so
+usr/lib/*.a
+usr/lib/*.la
+usr/lib/*.so
 ../../doc/*	usr/share/doc/libexpat1-dev/expat.html/
 ../../conftools/expat.m4 usr/share/aclocal/
diff -u expat-2.0.1/debian/libexpat1-udeb.install expat-2.0.1/debian/libexpat1-udeb.install
--- expat-2.0.1/debian/libexpat1-udeb.install
+++ expat-2.0.1/debian/libexpat1-udeb.install
@@ -1 +1 @@
-lib/*/libexpat.so.*	lib
+usr/lib/libexpat.so.*
diff -u expat-2.0.1/debian/rules expat-2.0.1/debian/rules
--- expat-2.0.1/debian/rules
+++ expat-2.0.1/debian/rules
@@ -11,7 +11,6 @@
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 BUILD64 = $(filter $(DEB_HOST_ARCH), i386 powerpc sparc s390)
 
@@ -48,12 +47,12 @@
 build/config.status: configure
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	 ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH))
+	 ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man)
 
 buildw/config.status: configure
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="$(CFLAGS) -DXML_UNICODE" LDFLAGS="$(LDFLAGS)" \
-	 ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH))
+	 ../configure $(CONFFLAGS) --prefix=/usr --mandir=\$${prefix}/share/man)
 
 build64/config.status: configure
 	dh_testdir
@@ -97,10 +96,6 @@
 	$(MAKE) -C build64/ installlib DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) -C buildw64/ installlib LIBRARY=libexpatw.la DESTDIR=$(CURDIR)/debian/tmp APIHEADER=
 endif
-	# Move to /lib so that zfsutils can use it.
-	mkdir -p $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)
-	mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.* \
-		$(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/
 
 binary-indep: build install
 binary-arch: build install
@@ -119,7 +114,7 @@
 	          $(CURDIR)/debian/libexpat1-dev/usr/share/aclocal/*
 	dh_makeshlibs -s -V --add-udeb=$(UPACKAGE)
 	dh_installdeb -s
-	dh_shlibdeps -s -l $(CURDIR)/debian/libexpat1/usr/lib/$(DEB_HOST_MULTIARCH):$(CURDIR)/debian/lib64expat1/usr/lib64
+	dh_shlibdeps -s -l $(CURDIR)/debian/libexpat1/usr/lib:$(CURDIR)/debian/lib64expat1/usr/lib64
 	dh_gencontrol -s
 	dh_md5sums -s
 	dh_builddeb -s
diff -u expat-2.0.1/debian/control expat-2.0.1/debian/control
--- expat-2.0.1/debian/control
+++ expat-2.0.1/debian/control
@@ -5,8 +5,7 @@
 Uploaders: Ardo van Rangelrooij <ardo at debian.org>,
  Daniel Leidert (dale) <daniel.leidert at wgdd.de>
 Standards-Version: 3.8.3
-Build-Depends: debhelper (>= 8.1.3), dpatch, docbook-to-man,
- dpkg-dev (>= 1.16.0),
+Build-Depends: debhelper (>= 5.0.22), dpatch, docbook-to-man,
  gcc-multilib [i386 powerpc sparc s390]
 Homepage: http://expat.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/expat/trunk/
@@ -61,8 +60,6 @@
 Architecture: any
 Conflicts: wink (<= 1.5.1060-4)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Description: XML parsing C library - runtime library
  This package contains the runtime, shared library of expat, the C
  library for parsing XML. Expat is a stream-oriented parser in
diff -u expat-2.0.1/debian/libexpat1.install expat-2.0.1/debian/libexpat1.install
--- expat-2.0.1/debian/libexpat1.install
+++ expat-2.0.1/debian/libexpat1.install
@@ -1 +1 @@
-lib/*/*.so.*
+usr/lib/*.so.*