[Fakeroot-commits] [SCM] Debian packaging of fakeroot branch, master, updated. debian/1.14.3-260-g0dc05cd

[Clint Adams]

The following commit has been merged in the master branch:
commit da3ab1dfa00ae64983c79a21d2c7e7caed681710
Author: Clint Adams <clint at debian.org>
Date:   Thu Nov 28 13:59:15 2013 -0500

    Use Piotr Roszatycki's ld.so path hack instead of find.

diff --git a/debian/patches/series b/debian/patches/series
index 8e0a4fd..fdca789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 eglibc-fts-without-LFS
 Fix-FTBFS
-fakeroot-Determine-library-paths-at-run-time
diff --git a/debian/rules b/debian/rules
index 24ce52e..4c65b86 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,12 +31,12 @@ LIB_DIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 obj-sysv/config.status:
 	$(checkdir)
 	mkdir obj-sysv
-	cd obj-sysv && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/${LIB_DIR}/libfakeroot --program-suffix=-sysv $(CONFARGS)
+	cd obj-sysv && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/$(LIB_DIR)/libfakeroot --program-suffix=-sysv $(CONFARGS)
 
 obj-tcp/config.status:
 	$(checkdir)
 	mkdir obj-tcp
-	cd obj-tcp && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/${LIB_DIR}/libfakeroot --with-ipc=tcp --program-suffix=-tcp $(CONFARGS)
+	cd obj-tcp && CFLAGS="$(CFLAGS)" ../configure --prefix=/usr --mandir=/usr/share/man --libdir=/$(LIB_DIR)/libfakeroot --with-ipc=tcp --program-suffix=-tcp $(CONFARGS)
 
 build: build-arch build-indep
 build-arch: build-stamp
@@ -83,37 +83,37 @@ binary-arch: build checkroot
 
 	cd obj-tcp && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
 
-	chmod 644 debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-0.so
-	mv debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-0.so debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-tcp.so
-	rm debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot.so
+	chmod 644 debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-0.so
+	mv debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-0.so debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-tcp.so
+	rm debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot.so
 
 	cd obj-sysv && $(MAKE) DESTDIR="$(CURDIR)/debian/tmp" install
 
-	chmod 644 debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-0.so
-	mv debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-0.so debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-sysv.so
-	rm debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot.so
+	chmod 644 debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-0.so
+	mv debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-0.so debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-sysv.so
+	rm debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot.so
 
-#	$(INSTALL_SCRIPT) scripts/fakeroot debian/tmp/usr/bin/
 	$(INSTALL_DIR) debian/tmp/usr/share/doc/fakeroot \
-		           debian/tmp/${LIB_DIR}/libfakeroot
+		           debian/tmp/$(LIB_DIR)/libfakeroot \
+		           debian/libfakeroot/etc/ld.so.conf.d
+	echo /usr/lib/$(DEB_HOST_MULTIARCH)/libfakeroot > debian/libfakeroot/etc/ld.so.conf.d/fakeroot-$(DEB_HOST_MULTIARCH).conf
 	$(INSTALL_FILE) README doc/README.saving DEBUG debian/tmp/usr/share/doc/fakeroot/
 	( echo "fakeroot was written originally by"; \
 	  echo "joost witteveen"                   ; \
 	  echo "------------------------------------------------"; \
 	  cat COPYING) > debian/tmp/usr/share/doc/fakeroot/copyright
-#	cd obj-sysv && ./libtool --finish $(CURDIR)/debian/tmp/${LIB_DIR}/fakeroot
-	rm -f debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot.*a*
+#	cd obj-sysv && ./libtool --finish $(CURDIR)/debian/tmp/$(LIB_DIR)/fakeroot
+	rm -f debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot.*a*
 	rm -f debian/tmp/usr/bin/simple
 	$(INSTALL_FILE) debian/copyright debian/tmp/usr/share/doc/fakeroot/copyright
 	$(INSTALL_FILE) debian/changelog debian/tmp/usr/share/doc/fakeroot/changelog.Debian
 	find debian/tmp -name '*.1' -or -name changelog.Debian | \
 		xargs gzip -9fn
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	$(STRIP) --remove-section=.comment --remove-section=.note --strip-unneeded debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-sysv.so
-	$(STRIP) --remove-section=.comment --remove-section=.note --strip-unneeded debian/tmp/${LIB_DIR}/libfakeroot/libfakeroot-tcp.so
+	$(STRIP) --remove-section=.comment --remove-section=.note --strip-unneeded debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-sysv.so
+	$(STRIP) --remove-section=.comment --remove-section=.note --strip-unneeded debian/tmp/$(LIB_DIR)/libfakeroot/libfakeroot-tcp.so
 	$(STRIP) --remove-section=.comment --remove-section=.note debian/tmp/usr/bin/faked-sysv
 	$(STRIP) --remove-section=.comment --remove-section=.note debian/tmp/usr/bin/faked-tcp
-#	$(STRIP) --strip-debug debian/tmp/${LIB_DIR}/libfakeroot.a
 endif
 	$(INSTALL_DIR) debian/fakeroot/DEBIAN debian/libfakeroot/DEBIAN
 
@@ -128,6 +128,7 @@ endif
 
 	$(INSTALL_SCRIPT) debian/fakeroot.postrm debian/fakeroot/DEBIAN/postrm
 	$(INSTALL_SCRIPT) debian/fakeroot.prerm debian/fakeroot/DEBIAN/prerm
+	echo /etc/ld.so.conf.d/fakeroot-$(DEB_HOST_MULTIARCH).conf >debian/libfakeroot/DEBIAN/conffiles
 ifneq ($(DEB_HOST_GNU_SYSTEM),gnu)
 	sed 's/@FAKEROOT_SYSV_ALTPRIO@/50/;s/@FAKEROOT_TCP_ALTPRIO@/30/;' \
 		debian/fakeroot.postinst.in > debian/fakeroot.postinst
@@ -139,7 +140,7 @@ endif
 	rm -f debian/fakeroot.postinst
 	# We can just use the deps for faked.
 	dpkg-shlibdeps -Tdebian/libfakeroot.substvars \
-		debian/libfakeroot/${LIB_DIR}/libfakeroot/*.so
+		debian/libfakeroot/$(LIB_DIR)/libfakeroot/*.so
 	dpkg-shlibdeps -Tdebian/fakeroot.substvars \
 		debian/fakeroot/usr/bin/faked-sysv \
 		debian/fakeroot/usr/bin/faked-tcp

-- 
Debian packaging of fakeroot