diff -Nru hwloc-1.4.1/debian/changelog hwloc-1.4.1/debian/changelog
--- hwloc-1.4.1/debian/changelog	2012-03-28 01:44:31.000000000 +0200
+++ hwloc-1.4.1/debian/changelog	2012-07-06 11:36:21.000000000 +0200
@@ -1,3 +1,11 @@
+hwloc (1.4.1-2.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Restore ABI compatibility symlinks and provide/replace/conflict, except
+    with non-dangling symlinks this time.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 06 Jul 2012 11:36:02 +0200
+
 hwloc (1.4.1-2) unstable; urgency=low
 
   * Remove ABI compatibility symlinks and provide/replace/conflict, ldconfig
diff -Nru hwloc-1.4.1/debian/control hwloc-1.4.1/debian/control
--- hwloc-1.4.1/debian/control	2012-03-28 01:43:21.000000000 +0200
+++ hwloc-1.4.1/debian/control	2012-07-06 11:27:59.000000000 +0200
@@ -87,6 +87,9 @@
 Multi-Arch: same
 Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: libhwloc0, libhwloc1, libhwloc2, libhwloc3, libhwloc4
+Replaces: libhwloc0, libhwloc1, libhwloc2, libhwloc3, libhwloc4
+Conflicts: libhwloc0, libhwloc1, libhwloc2, libhwloc3, libhwloc4
 Description: Hierarchical view of the machine - shared libs
  libhwloc provides a portable abstraction (across OS, versions,
  architectures, ...) of the hierarchical topology of modern architectures. It
diff -Nru hwloc-1.4.1/debian/libhwloc5.links.in hwloc-1.4.1/debian/libhwloc5.links.in
--- hwloc-1.4.1/debian/libhwloc5.links.in	1970-01-01 01:00:00.000000000 +0100
+++ hwloc-1.4.1/debian/libhwloc5.links.in	2012-07-06 11:58:31.000000000 +0200
@@ -0,0 +1,5 @@
+usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.0
+usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.2
+usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.3
+usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.5 usr/lib/@DEB_HOST_MULTIARCH@/libhwloc.so.4
diff -Nru hwloc-1.4.1/debian/rules hwloc-1.4.1/debian/rules
--- hwloc-1.4.1/debian/rules	2011-09-14 17:14:03.000000000 +0200
+++ hwloc-1.4.1/debian/rules	2012-07-06 11:34:59.000000000 +0200
@@ -35,7 +35,7 @@
 	cd obj-nox && ../configure $(CROSS) $(confflags) --disable-cairo
 
 
-build: build-stamp-x build-stamp-nox
+build: build-stamp-x build-stamp-nox debian/libhwloc5.links
 build-stamp-x: obj-x/config.status
 	dh_testdir
 
@@ -51,11 +51,15 @@
 
 	touch $@
 
+debian/libhwloc5.links: debian/libhwloc5.links.in
+	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' < $< > $@
+
 clean: 
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp-x
 	rm -f build-stamp-nox
+	rm -f debian/libhwloc5.links
 
 	rm -fr obj-x obj-nox
 	rm -f config.sub config.guess