r15782 - /desktop/unstable/gtk+2.0/debian/

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sat Apr 26 15:35:48 UTC 2008 

Author: joss
Date: Sat Apr 26 15:35:48 2008
New Revision: 15782

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15782
Log:
* Apply multiarch patch by Javier Serrano Polo, replacing all 
  occurrences of usr/lib by $(LIBDIR). Closes: #468100.
* rules: don't compress .sgml and .devhelp files.

Added:
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.install.in
      - copied, changed from r15779, desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.install
Removed:
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.install
Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/dh_gtkmodules.in
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0-udeb.install.in
    desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.install.in
    desktop/unstable/gtk+2.0/debian/libgtk2.0-0.install.in
    desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.links.in
    desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.install.in
    desktop/unstable/gtk+2.0/debian/rules
    desktop/unstable/gtk+2.0/debian/update-gdkpixbuf-loaders.in
    desktop/unstable/gtk+2.0/debian/update-gtk-immodules.in

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Sat Apr 26 15:35:48 2008
@@ -25,6 +25,9 @@
   * 061_foreign_colormaps.patch: stolen from upstream SVN. Don't call 
     XFreeColormap on foreign colormaps, this causes crashes in e.g. 
     vinagre. Closes: #477199.
+  * Apply multiarch patch by Javier Serrano Polo, replacing all 
+    occurrences of usr/lib by $(LIBDIR). Closes: #468100.
+  * rules: don't compress .sgml and .devhelp files.
 
  -- Loic Minier <lool at dooz.org>  Thu, 17 Apr 2008 12:34:24 +0200
 

Modified: desktop/unstable/gtk+2.0/debian/dh_gtkmodules.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/dh_gtkmodules.in?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/dh_gtkmodules.in (original)
+++ desktop/unstable/gtk+2.0/debian/dh_gtkmodules.in Sat Apr 26 15:35:48 2008
@@ -58,7 +58,7 @@
 if ($ENV{GTK_QUERYLOADERS}) {
     $queryloaders = $ENV{GTK_QUERYLOADERS};
 } else {
-    $queryloaders = '/usr/lib/libgtk2.0-0/gdk-pixbuf-query-loaders';
+    $queryloaders = '/@LIBDIR@/libgtk2.0-0/gdk-pixbuf-query-loaders';
 }
 
 # gtk-query-immodules-2.0 helper (generates an IM module file on its
@@ -67,7 +67,7 @@
 if ($ENV{GTK_QUERYIMMODULES}) {
     $queryimmodules = $ENV{GTK_QUERYIMMODULES};
 } else {
-    $queryimmodules = '/usr/lib/libgtk2.0-0/gtk-query-immodules-2.0';
+    $queryimmodules = '/@LIBDIR@/libgtk2.0-0/gtk-query-immodules-2.0';
 }
 
 # relative Gtk base module path

Modified: desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0-udeb.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk-directfb-2.0-0-udeb.install.in?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0-udeb.install.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0-udeb.install.in Sat Apr 26 15:35:48 2008
@@ -1,3 +1,3 @@
 # from the directfb flavor
 debian/install/directfb/@MODULES_BASE_PATH@/loaders/libpixbufloader-png.so @MODULES_BASE_PATH@/loaders
-debian/install/directfb/usr/lib/*.so.* usr/lib
+debian/install/directfb/@LIBDIR@/*.so.* @LIBDIR@

Copied: desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.install.in (from r15779, desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk-directfb-2.0-0.install.in?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.install (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-0.install.in Sat Apr 26 15:35:48 2008
@@ -1,2 +1,2 @@
 # from the directfb flavor
-debian/install/directfb/usr/lib/*directfb*.so.* usr/lib
+debian/install/directfb/@LIBDIR@/*directfb*.so.* @LIBDIR@

Modified: desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk-directfb-2.0-dev.install.in?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.install.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk-directfb-2.0-dev.install.in Sat Apr 26 15:35:48 2008
@@ -1,6 +1,6 @@
 # from the directfb flavor
 debian/install/directfb/usr/include/gtk- at APIVER@/gdk/*directfb* usr/include/gtk- at APIVER@/gdk
-debian/install/directfb/usr/lib/*directfb*.so usr/lib
-debian/install/directfb/usr/lib/pkgconfig/* usr/lib/pkgconfig/@DIRECTFB_PKG@
-debian/install/directfb/usr/lib/pkgconfig/*directfb* usr/lib/pkgconfig
-debian/install/directfb/usr/lib/gtk- at APIVER@/include/gdkconfig.h usr/lib/gtk- at APIVER@/include/directfb
+debian/install/directfb/@LIBDIR@/*directfb*.so @LIBDIR@
+debian/install/directfb/@LIBDIR@/pkgconfig/* @LIBDIR@/pkgconfig/@DIRECTFB_PKG@
+debian/install/directfb/@LIBDIR@/pkgconfig/*directfb* @LIBDIR@/pkgconfig
+debian/install/directfb/@LIBDIR@/gtk- at APIVER@/include/gdkconfig.h @LIBDIR@/gtk- at APIVER@/include/directfb

Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0.install.in?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0.install.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0.install.in Sat Apr 26 15:35:48 2008
@@ -1,12 +1,12 @@
 # from Debian
-debian/update-gdkpixbuf-loaders usr/lib/@SHARED_PKG@
-debian/update-gtk-immodules usr/lib/@SHARED_PKG@
+debian/update-gdkpixbuf-loaders @LIBDIR@/@SHARED_PKG@
+debian/update-gtk-immodules @LIBDIR@/@SHARED_PKG@
 # from the shared flavor
 debian/install/shared/etc/gtk- at APIVER@/im-multipress.conf etc/gtk- at APIVER@
-debian/install/shared/usr/bin/gdk-pixbuf-query-loaders usr/lib/@SHARED_PKG@
-debian/install/shared/usr/bin/gtk-query-immodules-2.0 usr/lib/@SHARED_PKG@
-debian/install/shared/usr/bin/gtk-update-icon-cache usr/lib/@SHARED_PKG@
+debian/install/shared/usr/bin/gdk-pixbuf-query-loaders @LIBDIR@/@SHARED_PKG@
+debian/install/shared/usr/bin/gtk-query-immodules-2.0 @LIBDIR@/@SHARED_PKG@
+debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@
 debian/install/shared/@MODULES_BASE_PATH@/loaders/*.so @MODULES_BASE_PATH@/loaders
 debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules
 debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends
-debian/install/shared/usr/lib/*.so.* usr/lib
+debian/install/shared/@LIBDIR@/*.so.* @LIBDIR@

Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-bin.links.in?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.links.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-bin.links.in Sat Apr 26 15:35:48 2008
@@ -1,8 +1,8 @@
-usr/lib/@SHARED_PKG@/gdk-pixbuf-query-loaders usr/bin/gdk-pixbuf-query-loaders
-usr/lib/@SHARED_PKG@/gtk-query-immodules- at APIVER@ usr/bin/gtk-query-immodules- at APIVER@
-usr/lib/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache
-usr/lib/@SHARED_PKG@/update-gtk-immodules usr/sbin/update-gtk-immodules
-usr/lib/@SHARED_PKG@/update-gdkpixbuf-loaders usr/sbin/update-gdkpixbuf-loaders
+ at LIBDIR@/@SHARED_PKG@/gdk-pixbuf-query-loaders usr/bin/gdk-pixbuf-query-loaders
+ at LIBDIR@/@SHARED_PKG@/gtk-query-immodules- at APIVER@ usr/bin/gtk-query-immodules- at APIVER@
+ at LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache
+ at LIBDIR@/@SHARED_PKG@/update-gtk-immodules usr/sbin/update-gtk-immodules
+ at LIBDIR@/@SHARED_PKG@/update-gdkpixbuf-loaders usr/sbin/update-gdkpixbuf-loaders
 usr/share/doc/@COMMON_PKG@/changelog.gz usr/share/doc/@BIN_PKG@/changelog.gz
 usr/share/doc/@COMMON_PKG@/NEWS.gz usr/share/doc/@BIN_PKG@/NEWS.gz
 usr/share/doc/@COMMON_PKG@/README.gz usr/share/doc/@BIN_PKG@/README.gz

Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-dev.install.in?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.install.in (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-dev.install.in Sat Apr 26 15:35:48 2008
@@ -4,11 +4,11 @@
 debian/install/shared/usr/bin/gdk-pixbuf-csource  usr/bin
 debian/install/shared/usr/bin/gtk-builder-convert usr/bin
 debian/install/shared/usr/include usr
-debian/install/shared/usr/lib/*.la usr/lib
-debian/install/shared/usr/lib/*.so usr/lib
-debian/install/shared/usr/lib/pkgconfig usr/lib
-debian/install/shared/usr/lib/gtk- at APIVER@/include usr/lib/gtk- at APIVER@
+debian/install/shared/@LIBDIR@/*.la @LIBDIR@
+debian/install/shared/@LIBDIR@/*.so @LIBDIR@
+debian/install/shared/@LIBDIR@/pkgconfig @LIBDIR@
+debian/install/shared/@LIBDIR@/gtk- at APIVER@/include @LIBDIR@/gtk- at APIVER@
 debian/install/shared/usr/share/aclocal usr/share
 debian/install/shared/usr/share/man/man1/gdk-pixbuf-csource.1 usr/share/man/man1/
 # from the static flavor
-debian/install/static/usr/lib/*.a usr/lib
+debian/install/static/@LIBDIR@/*.a @LIBDIR@

Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules (original)
+++ desktop/unstable/gtk+2.0/debian/rules Sat Apr 26 15:35:48 2008
@@ -95,8 +95,15 @@
 installdir = $(installbasedir)/$*
 installbasedir = $(CURDIR)/debian/install
 
+# relative libdir
+ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
+LIBDIR := usr/lib/$(DEB_HOST_GNU_TYPE)
+else
+LIBDIR := usr/lib
+endif
+
 # relative base directory for all types of modules
-MODULES_BASE_PATH := usr/lib/gtk-$(APIVER)/$(GTK_BINARY_VERSION)
+MODULES_BASE_PATH := $(LIBDIR)/gtk-$(APIVER)/$(GTK_BINARY_VERSION)
 
 # relative directory to store the generated IM module files
 IMMODULE_FILES_D := $(MODULES_BASE_PATH)/immodule-files.d
@@ -107,6 +114,7 @@
 # configure flags
 common_configure_flags := \
 			--prefix=/usr \
+			--libdir=/$(LIBDIR) \
 			--mandir=\$${prefix}/share/man \
 			--infodir=\$${prefix}/share/info \
 			--sysconfdir=/etc \
@@ -196,10 +204,10 @@
 
 install: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS))
 	# Add necessary dependencies for the static build to Libs.private
-	a=$$(grep ^Libs: $(installbasedir)/shared/usr/lib/pkgconfig/gdk-pixbuf-2.0.pc) ; \
-	b=$$(grep ^Libs: $(installbasedir)/static/usr/lib/pkgconfig/gdk-pixbuf-2.0.pc) ; \
+	a=$$(grep ^Libs: $(installbasedir)/shared/$(LIBDIR)/pkgconfig/gdk-pixbuf-2.0.pc) ; \
+	b=$$(grep ^Libs: $(installbasedir)/static/$(LIBDIR)/pkgconfig/gdk-pixbuf-2.0.pc) ; \
 	c=$$(for i in $$b; do echo $$a| grep -q -e $$i || echo $$i; done) ; \
-	echo Libs.private: $$c >> $(installbasedir)/shared/usr/lib/pkgconfig/gdk-pixbuf-2.0.pc
+	echo Libs.private: $$c >> $(installbasedir)/shared/$(LIBDIR)/pkgconfig/gdk-pixbuf-2.0.pc
 
 # gross kludge to force control generation with the %.in target
 clean::
@@ -225,6 +233,7 @@
 		-e "s#@PIXBUF_PKG@#$(PIXBUF_PKG)#g" \
 		-e "s#@GNOME_TEAM@#$(UPLOADERS)#g" \
 		-e "s#@GTK_BINARY_VERSION@#$(GTK_BINARY_VERSION)#g" \
+		-e "s#@LIBDIR@#$(LIBDIR)#g" \
 		-e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \
 		$@.in > $@
 
@@ -262,7 +271,7 @@
 	dh_installdocs -p$(COMMON_PKG) -i
 	dh_installman -i
 	dh_link -i
-	dh_compress -i
+	dh_compress -i -X.sgml -X.devhelp
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i
@@ -274,12 +283,12 @@
 	dh_testroot
 	dh_install -s
 	# empty the dependency_libs in the *.la files
-	sed -i "/dependency_libs/ s/'.*'/''/" debian/$(DEV_PKG)/usr/lib/*.la
+	sed -i "/dependency_libs/ s/'.*'/''/" debian/$(DEV_PKG)/$(LIBDIR)/*.la
 	# we don't need the rpath in the udeb
-	chrpath -d debian/$(UDEB_PKG)/usr/lib/*directfb*.so.*
-	# fix permissions of binaries below /usr/lib/$(SHARED_PKG)
+	chrpath -d debian/$(UDEB_PKG)/$(LIBDIR)/*directfb*.so.*
+	# fix permissions of binaries below /$(LIBDIR)/$(SHARED_PKG)
 	for f in update-gdkpixbuf-loaders update-gtk-immodules; do \
-	    chmod 755 debian/$(SHARED_PKG)/usr/lib/$(SHARED_PKG)/$$f; \
+	    chmod 755 debian/$(SHARED_PKG)/$(LIBDIR)/$(SHARED_PKG)/$$f; \
 	done
 	# changelog.gz symlinks will be overwritten by dh_link
 	dh_installchangelogs -s ChangeLog
@@ -297,14 +306,14 @@
 	debian/$(DEV_PKG)/usr/bin/dh_gtkmodules -p$(PIXBUF_PKG)
 	# generate an IM module file and a GdkPixbuf loader file for the shared
 	# library
-	LD_LIBRARY_PATH=debian/$(SHARED_PKG)/usr/lib:$(LD_LIBRARY_PATH) \
+	LD_LIBRARY_PATH=debian/$(SHARED_PKG)/$(LIBDIR):$(LD_LIBRARY_PATH) \
 	GTK_QUERYLOADERS=$(installbasedir)/shared/usr/bin/gdk-pixbuf-query-loaders \
 	GTK_QUERYIMMODULES=$(installbasedir)/shared/usr/bin/gtk-query-immodules-2.0 \
 		debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \
 			-k \
 			-p$(SHARED_PKG)
 	# generate a GdkPixbuf loader config file for the udeb
-	LD_LIBRARY_PATH=debian/$(UDEB_PKG)/usr/lib:$(LD_LIBRARY_PATH) \
+	LD_LIBRARY_PATH=debian/$(UDEB_PKG)/$(LIBDIR):$(LD_LIBRARY_PATH) \
 	GTK_QUERYLOADERS=$(installbasedir)/directfb/usr/bin/gdk-pixbuf-query-loaders \
 		debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \
 			-k \
@@ -313,8 +322,8 @@
 	dh_link -s
 	dh_strip -s --dbg-package=$(DEBUG_PKG) -N$(UDEB_PKG)
 	dh_strip -s -p$(UDEB_PKG)
-	dh_compress -s
-	dh_fixperms -s -Xusr/lib/$(SHARED_PKG)
+	dh_compress -s -X.sgml -X.devhelp
+	dh_fixperms -s -X$(LIBDIR)/$(SHARED_PKG)
 	dh_makeshlibs -p$(SHARED_PKG) \
 		-X$(MODULES_BASE_PATH) \
 		-V"$(SHARED_PKG) (>= $(SHVER))" \
@@ -332,7 +341,7 @@
 		sed -n -r -e 's/(([^ ]+: )?([^ ]+) ([^ ]+)) .*/\1/p' \
 			> debian/shlibs.local
 	dh_shlibdeps -s -N$(UDEB_PKG)
-	dh_shlibdeps -p$(UDEB_PKG) -l/usr/lib/libcairo-directfb/lib/
+	dh_shlibdeps -p$(UDEB_PKG) -l/$(LIBDIR)/libcairo-directfb/lib/
 	-rm -f debian/shlibs.local
 	dh_gencontrol -s
 	dh_md5sums -s
@@ -340,7 +349,7 @@
 
 list-missing:
 	perl -w debian/dh_listmissing.pl $(foreach f,$(FLAVORS),$(subst $(CURDIR)/,,$(installbasedir))/$(f)) 2>&1 | \
-	    egrep -v '(\.la|usr/lib/gtk-2.0/$(GTK_BINARY_VERSION)/[^/]+/[^/]+\.a) has been installed' >&2
+	    egrep -v '(\.la|$(LIBDIR)/gtk-2.0/$(GTK_BINARY_VERSION)/[^/]+/[^/]+\.a) has been installed' >&2
 
 binary: binary-indep binary-arch
 .PHONY: patch configure build check install clean binary-indep binary-arch list-missing binary

Modified: desktop/unstable/gtk+2.0/debian/update-gdkpixbuf-loaders.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/update-gdkpixbuf-loaders.in?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/update-gdkpixbuf-loaders.in (original)
+++ desktop/unstable/gtk+2.0/debian/update-gdkpixbuf-loaders.in Sat Apr 26 15:35:48 2008
@@ -11,7 +11,7 @@
 TMPFILE=$(mktemp -t "gtk+$APIVER-$VERSION.XXXXXXXXXX")
 
 echo -n "Updating the gdk-pixbuf loaders list for Gtk+ $VERSION..."
-"/usr/lib/$SHARED_PKG/gdk-pixbuf-query-loaders" > $TMPFILE
+"/@LIBDIR@/$SHARED_PKG/gdk-pixbuf-query-loaders" > $TMPFILE
 if [ "x`cat "$TMPFILE" | grep -v '^#'`" = "x" ]; then
     echo "no gdk-pixbuf loader found."
 else

Modified: desktop/unstable/gtk+2.0/debian/update-gtk-immodules.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/update-gtk-immodules.in?rev=15782&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/update-gtk-immodules.in (original)
+++ desktop/unstable/gtk+2.0/debian/update-gtk-immodules.in Sat Apr 26 15:35:48 2008
@@ -12,8 +12,8 @@
 TMPFILE=$(mktemp -t "gtk+$APIVER-$VERSION.XXXXXXXXXX")
 
 echo -n "Updating the IM modules list for Gtk+ $VERSION..."
-"/usr/lib/$SHARED_PKG/gtk-query-immodules-$APIVER" \
-    $(find "/usr/lib/gtk-$APIVER/$GTK_BINARY_VERSION/immodules" -name '*.so') \
+"/@LIBDIR@/$SHARED_PKG/gtk-query-immodules-$APIVER" \
+    $(find "/@LIBDIR@/gtk-$APIVER/$GTK_BINARY_VERSION/immodules" -name '*.so') \
     > "$TMPFILE"
 if [ "x`cat "$TMPFILE" | grep -v '^#'`" = "x" ]; then
     echo "no Gtk+ IM modules found."

More information about the pkg-gnome-commits mailing list