r11967 - in /desktop/experimental/pango1.0/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Jul 16 09:15:24 2007
New Revision: 11967

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11967
Log:
* Strip the RPATH of libs and modules built in the udeb as these confuse
  dh_shlibdeps on 64-bits arches where a spurious /usr/lib RPATH is added
  (because of the /usr/lib versus /usr/lib64 issue); build-dep on chrpath;
  thanks a lot to Frans Pop for discussion; closes: #432258.

Modified:
    desktop/experimental/pango1.0/debian/changelog
    desktop/experimental/pango1.0/debian/control
    desktop/experimental/pango1.0/debian/control.in
    desktop/experimental/pango1.0/debian/rules

Modified: desktop/experimental/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/changelog?rev=11967&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/changelog (original)
+++ desktop/experimental/pango1.0/debian/changelog Mon Jul 16 09:15:24 2007
@@ -1,3 +1,12 @@
+pango1.0 (1.17.4-3) experimental; urgency=high
+
+  * Strip the RPATH of libs and modules built in the udeb as these confuse
+    dh_shlibdeps on 64-bits arches where a spurious /usr/lib RPATH is added
+    (because of the /usr/lib versus /usr/lib64 issue); build-dep on chrpath;
+    thanks a lot to Frans Pop for discussion; closes: #432258.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 16 Jul 2007 00:04:48 +0200
+
 pango1.0 (1.17.4-2) experimental; urgency=high
 
   * Call dh_shlibdeps separately for the udeb and add a

Modified: desktop/experimental/pango1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/control?rev=11967&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/control (original)
+++ desktop/experimental/pango1.0/debian/control Mon Jul 16 09:15:24 2007
@@ -21,7 +21,8 @@
                perl,
                quilt,
                dpkg-dev (>= 1.13.19),
-               libthai-dev (>= 0.1.7)
+               libthai-dev (>= 0.1.7),
+               chrpath
 Standards-Version: 3.7.2
 
 Package: libpango1.0-0

Modified: desktop/experimental/pango1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/control.in?rev=11967&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/control.in (original)
+++ desktop/experimental/pango1.0/debian/control.in Mon Jul 16 09:15:24 2007
@@ -21,7 +21,8 @@
                perl,
                quilt,
                dpkg-dev (>= 1.13.19),
-               libthai-dev (>= 0.1.7)
+               libthai-dev (>= 0.1.7),
+               chrpath
 Standards-Version: 3.7.2
 
 Package: libpango1.0- at SONAME@

Modified: desktop/experimental/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/rules?rev=11967&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/rules (original)
+++ desktop/experimental/pango1.0/debian/rules Mon Jul 16 09:15:24 2007
@@ -192,7 +192,7 @@
 		-e "s#@MODULES_PATH@#$(MODULES_PATH)#g" \
 		-e "s#@MODULE_FILES_D@#$(MODULE_FILES_D)#g" \
 		-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
-		$@.in > $@
+		$@.in >$@
 
 clean:: debian/control
 	dh_testdir
@@ -233,8 +233,14 @@
 	dh_testdir
 	dh_testroot
 	dh_install -s
+	# remove the rpath in libs and modules since a spurious /usr/lib RPATH
+	# appears on 64-bits arches which confuses dh_shlibdeps; the RPATH
+	# isn't needed in the udeb anyway as libcairo's udeb ships libs in
+	# /usr/lib; see #432258
+	chrpath -d debian/$(UDEB_PKG)/$(LIBDIR)/*.so.* \
+		debian/$(UDEB_PKG)/$(MODULES_PATH)/*.so
 	# Remove the thai module to avoid extraneous dependencies
-	rm -f $(CURDIR)/debian/$(UDEB_PKG)/$(MODULES_PATH)/pango-thai-lang.so
+	rm -f debian/$(UDEB_PKG)/$(MODULES_PATH)/pango-thai-lang.so
 	# empty the dependency_libs in the *.la files
 	sed -i "/dependency_libs/ s/'.*'/''/" \
 		debian/$(DEV_PKG)/$(LIBDIR)/*.la