r29078 - in /desktop/unstable/gtk+2.0/debian: ./ patches/
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Jul 22 18:43:29 UTC 2011
Author: biebl
Date: Fri Jul 22 18:43:29 2011
New Revision: 29078
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29078
Log:
* Build for multiarch. Closes: #634118
* Bump gobject-introspection build-dependency for multiarch tuple support.
* debian/patches/098_multiarch_module_path.patch: Fall back to the
hard-coded pre-multiarch module directory.
* Build-depend on debhelper 8.1.3 and add Pre-Depends: ${misc:Pre-Depends}
for multiarch-support.
* Make the -dev packages depend on a multiarch-capable version of
pkg-config.
Added:
desktop/unstable/gtk+2.0/debian/libgail-dev.install.in
- copied, changed from r29066, desktop/unstable/gtk+2.0/debian/libgail-dev.install
desktop/unstable/gtk+2.0/debian/libgail18.install.in
- copied, changed from r29066, desktop/unstable/gtk+2.0/debian/libgail18.install
desktop/unstable/gtk+2.0/debian/patches/098_multiarch_module_path.patch
Removed:
desktop/unstable/gtk+2.0/debian/libgail-dev.install
desktop/unstable/gtk+2.0/debian/libgail18.install
Modified:
desktop/unstable/gtk+2.0/debian/changelog
desktop/unstable/gtk+2.0/debian/control
desktop/unstable/gtk+2.0/debian/control.in
desktop/unstable/gtk+2.0/debian/gir1.2-gtk-2.0.install.in
desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postinst.in
desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postrm.in
desktop/unstable/gtk+2.0/debian/libgtk2.0-0.triggers.in
desktop/unstable/gtk+2.0/debian/patches/series
desktop/unstable/gtk+2.0/debian/rules
Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Fri Jul 22 18:43:29 2011
@@ -1,3 +1,17 @@
+gtk+2.0 (2.24.5-4) unstable; urgency=low
+
+ [ Steve Langasek ]
+ * Build for multiarch. Closes: #634118
+ * Bump gobject-introspection build-dependency for multiarch tuple support.
+ * debian/patches/098_multiarch_module_path.patch: Fall back to the
+ hard-coded pre-multiarch module directory.
+ * Build-depend on debhelper 8.1.3 and add Pre-Depends: ${misc:Pre-Depends}
+ for multiarch-support.
+ * Make the -dev packages depend on a multiarch-capable version of
+ pkg-config.
+
+ -- Michael Biebl <biebl at debian.org> Fri, 22 Jul 2011 20:41:32 +0200
+
gtk+2.0 (2.24.5-3) unstable; urgency=low
* Revert "gdk: Make background changes queue a repaint" which causes
Modified: desktop/unstable/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control [utf-8] Fri Jul 22 18:43:29 2011
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3),
gettext,
gtk-doc-tools (>= 1.11),
pkg-config,
@@ -28,10 +28,10 @@
libxfixes-dev (>= 1:3.0.0-3),
libcairo2-dev (>= 1.6.4-6.1),
gnome-pkg-tools (>= 0.11),
- dpkg-dev (>= 1.13.19),
+ dpkg-dev (>= 1.16.0),
x11proto-xext-dev,
libcups2-dev (>= 1.2),
- gobject-introspection (>= 0.9.12-4~),
+ gobject-introspection (>= 0.10.8-2),
libgirepository1.0-dev (>= 0.9.3),
gir1.2-glib-2.0,
gir1.2-freedesktop,
@@ -63,6 +63,8 @@
libgtk2.0-bin
Suggests: librsvg2-common,
gvfs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -95,6 +97,7 @@
Architecture: all
Depends: ${misc:Depends}
Recommends: libgtk2.0-0
+Multi-Arch: foreign
Description: common files for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -109,6 +112,7 @@
Depends: ${misc:Depends},
libgtk2.0-0 (>= ${source:Version}),
libgtk2.0-common
+Multi-Arch: foreign
Description: programs for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -139,7 +143,7 @@
libxfixes-dev (>= 1:3.0.0-3),
libxcomposite-dev (>= 1:0.2.0-3),
libxdamage-dev (>= 1:1.0.1-3),
- pkg-config,
+ pkg-config (>= 0.26-1),
libxml2-utils
Recommends: python (>= 2.4),
debhelper
@@ -161,6 +165,7 @@
Depends: libgtk2.0-0 (= ${binary:Version}),
libgtk2.0-common,
${misc:Depends}
+Multi-Arch: same
Description: GTK+ libraries and debugging symbols
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -179,6 +184,7 @@
Recommends: libglib2.0-doc,
libatk1.0-doc,
libpango1.0-doc
+Multi-Arch: foreign
Description: documentation for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -242,6 +248,8 @@
${shlibs:Depends},
libgtk2.0-0 (= ${binary:Version})
Replaces: libgail17, libgtk2.0-0 (<< 2.14.5)
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: GNOME Accessibility Implementation Library -- shared libraries
Gail implements ATK interfaces for GTK+ widgets which are dynamically
loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -255,6 +263,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
libgail18 (= ${binary:Version})
+Multi-Arch: foreign
Description: GNOME Accessibility Implementation Library -- common modules
Gail implements ATK interfaces for GTK+ widgets which are dynamically
loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -270,7 +279,7 @@
libgail18 (= ${binary:Version}),
libgail-common (= ${binary:Version}),
libgtk2.0-dev (= ${binary:Version}),
- pkg-config,
+ pkg-config (>= 0.26-1),
libatk1.0-dev (>= 1.13.0)
Suggests: libgail-doc
Replaces: libgtk2.0-dev (<< 2.14.5)
@@ -289,6 +298,7 @@
Depends: ${misc:Depends}, libgail18 (= ${binary:Version})
Recommends: libgtk2.0-0-dbg
Replaces: libgtk2.0-0-dbg (<< 2.14.5)
+Multi-Arch: same
Description: Gail libraries and debugging symbols
Gail is the "GNOME Accessibility Implementation Library".
.
@@ -301,6 +311,7 @@
Section: doc
Depends: ${misc:Depends}, lynx | www-browser
Replaces: libgtk2.0-doc (<< 2.14.5)
+Multi-Arch: foreign
Description: documentation files of the Gail library
Gail implements ATK interfaces for GTK+ widgets which are dynamically
loadable at runtime by a GTK+ application. Once loaded, those parts of
Modified: desktop/unstable/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/control.in?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/control.in [utf-8] Fri Jul 22 18:43:29 2011
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3),
gettext,
gtk-doc-tools (>= 1.11),
pkg-config,
@@ -28,10 +28,10 @@
libxfixes-dev (>= 1:3.0.0-3),
libcairo2-dev (>= 1.6.4-6.1),
gnome-pkg-tools (>= 0.11),
- dpkg-dev (>= 1.13.19),
+ dpkg-dev (>= 1.16.0),
x11proto-xext-dev,
libcups2-dev (>= 1.2),
- gobject-introspection (>= 0.9.12-4~),
+ gobject-introspection (>= 0.10.8-2),
libgirepository1.0-dev (>= 0.9.3),
gir1.2-glib-2.0,
gir1.2-freedesktop,
@@ -63,6 +63,8 @@
@BIN_PKG@
Suggests: librsvg2-common,
gvfs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -95,6 +97,7 @@
Architecture: all
Depends: ${misc:Depends}
Recommends: @SHARED_PKG@
+Multi-Arch: foreign
Description: common files for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -109,6 +112,7 @@
Depends: ${misc:Depends},
@SHARED_PKG@ (>= ${source:Version}),
@COMMON_PKG@
+Multi-Arch: foreign
Description: programs for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -139,7 +143,7 @@
libxfixes-dev (>= 1:3.0.0-3),
libxcomposite-dev (>= 1:0.2.0-3),
libxdamage-dev (>= 1:1.0.1-3),
- pkg-config,
+ pkg-config (>= 0.26-1),
libxml2-utils
Recommends: python (>= 2.4),
debhelper
@@ -161,6 +165,7 @@
Depends: @SHARED_PKG@ (= ${binary:Version}),
@COMMON_PKG@,
${misc:Depends}
+Multi-Arch: same
Description: GTK+ libraries and debugging symbols
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -179,6 +184,7 @@
Recommends: libglib2.0-doc,
libatk1.0-doc,
libpango1.0-doc
+Multi-Arch: foreign
Description: documentation for the GTK+ graphical user interface library
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -242,6 +248,8 @@
${shlibs:Depends},
@SHARED_PKG@ (= ${binary:Version})
Replaces: libgail17, libgtk2.0-0 (<< 2.14.5)
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Description: GNOME Accessibility Implementation Library -- shared libraries
Gail implements ATK interfaces for GTK+ widgets which are dynamically
loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -255,6 +263,7 @@
Depends: ${misc:Depends},
${shlibs:Depends},
libgail18 (= ${binary:Version})
+Multi-Arch: foreign
Description: GNOME Accessibility Implementation Library -- common modules
Gail implements ATK interfaces for GTK+ widgets which are dynamically
loadable at runtime by a GTK+ application. Once loaded, those parts of
@@ -270,7 +279,7 @@
libgail18 (= ${binary:Version}),
libgail-common (= ${binary:Version}),
@DEV_PKG@ (= ${binary:Version}),
- pkg-config,
+ pkg-config (>= 0.26-1),
libatk1.0-dev (>= 1.13.0)
Suggests: libgail-doc
Replaces: libgtk2.0-dev (<< 2.14.5)
@@ -289,6 +298,7 @@
Depends: ${misc:Depends}, libgail18 (= ${binary:Version})
Recommends: @DEBUG_PKG@
Replaces: libgtk2.0-0-dbg (<< 2.14.5)
+Multi-Arch: same
Description: Gail libraries and debugging symbols
Gail is the "GNOME Accessibility Implementation Library".
.
@@ -301,6 +311,7 @@
Section: doc
Depends: ${misc:Depends}, lynx | www-browser
Replaces: libgtk2.0-doc (<< 2.14.5)
+Multi-Arch: foreign
Description: documentation files of the Gail library
Gail implements ATK interfaces for GTK+ widgets which are dynamically
loadable at runtime by a GTK+ application. Once loaded, those parts of
Modified: desktop/unstable/gtk+2.0/debian/gir1.2-gtk-2.0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/gir1.2-gtk-2.0.install.in?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/gir1.2-gtk-2.0.install.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/gir1.2-gtk-2.0.install.in [utf-8] Fri Jul 22 18:43:29 2011
@@ -1,1 +1,1 @@
-debian/install/shared/usr/lib/girepository-1.0/ usr/lib/
+debian/install/shared/@LIBDIR@/girepository-1.0/ usr/lib/
Copied: desktop/unstable/gtk+2.0/debian/libgail-dev.install.in (from r29066, desktop/unstable/gtk+2.0/debian/libgail-dev.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgail-dev.install.in?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgail-dev.install [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/libgail-dev.install.in [utf-8] Fri Jul 22 18:43:29 2011
@@ -1,5 +1,4 @@
debian/install/shared/usr/include/gail* /usr/include
-debian/install/shared/usr/lib/libgail*.so /usr/lib
-debian/install/shared/usr/lib/libgail*.la /usr/lib
-debian/install/static/usr/lib/libgail*.a /usr/lib
-debian/install/shared/usr/lib/pkgconfig/gail*.pc /usr/lib/pkgconfig
+debian/install/shared/@LIBDIR@/libgail*.so @LIBDIR@
+debian/install/static/@LIBDIR@/libgail*.a @LIBDIR@
+debian/install/shared/@LIBDIR@/pkgconfig/gail*.pc @LIBDIR@/pkgconfig
Copied: desktop/unstable/gtk+2.0/debian/libgail18.install.in (from r29066, desktop/unstable/gtk+2.0/debian/libgail18.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgail18.install.in?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgail18.install [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/libgail18.install.in [utf-8] Fri Jul 22 18:43:29 2011
@@ -1,1 +1,1 @@
-debian/install/shared/usr/lib/libgail*.so.* /usr/lib
+debian/install/shared/@LIBDIR@/libgail*.so.* @LIBDIR@
Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0.postinst.in?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postinst.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postinst.in [utf-8] Fri Jul 22 18:43:29 2011
@@ -7,10 +7,13 @@
continue
fi
case $trigger in
- /@MODULES_BASE_PATH@/immodules)
+ /@MODULES_BASE_PATH@/immodules|/@OLD_MODULES_BASE_PATH@/immodules)
# This is triggered everytime an application installs a
# GTK immodule loader
- /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/gtk.immodules || true
+ /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 \
+ /@MODULES_BASE_PATH@/immodules/*.so \
+ /@OLD_MODULES_BASE_PATH@/immodules/*.so \
+ > /@MODULES_BASE_PATH@/gtk.immodules || true
;;
esac
done
@@ -20,7 +23,12 @@
#DEBHELPER#
# Also handle the initial installation
-if [ -d /@MODULES_BASE_PATH@/immodules ]; then
- /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 /@MODULES_BASE_PATH@/immodules/*.so > /@MODULES_BASE_PATH@/gtk.immodules || true
+if [ -d /@MODULES_BASE_PATH@/immodules ] \
+ || [ -d /@OLD_MODULES_BASE_PATH@/immodules ]
+then
+ /@LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 \
+ /@MODULES_BASE_PATH@/immodules/*.so \
+ /@OLD_MODULES_BASE_PATH@/immodules/*.so \
+ > /@MODULES_BASE_PATH@/gtk.immodules || true
fi
Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postrm.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0.postrm.in?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postrm.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0.postrm.in [utf-8] Fri Jul 22 18:43:29 2011
@@ -10,7 +10,7 @@
#DEBHELPER#
-if [ -d /@MODULES_BASE_PATH@ ]; then
+if [ -d /@MODULES_BASE_PATH@/immodules ]; then
# Purge the cache
rm -f /@MODULES_BASE_PATH@/gtk.immodules
rmdir -p --ignore-fail-on-non-empty /@MODULES_BASE_PATH@
Modified: desktop/unstable/gtk+2.0/debian/libgtk2.0-0.triggers.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/libgtk2.0-0.triggers.in?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/libgtk2.0-0.triggers.in [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/libgtk2.0-0.triggers.in [utf-8] Fri Jul 22 18:43:29 2011
@@ -1,1 +1,2 @@
interest /@MODULES_BASE_PATH@/immodules
+interest /@OLD_MODULES_BASE_PATH@/immodules
Added: desktop/unstable/gtk+2.0/debian/patches/098_multiarch_module_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/098_multiarch_module_path.patch?rev=29078&op=file
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/098_multiarch_module_path.patch (added)
+++ desktop/unstable/gtk+2.0/debian/patches/098_multiarch_module_path.patch [utf-8] Fri Jul 22 18:43:29 2011
@@ -1,0 +1,48 @@
+Description: Fall back to the hard-coded pre-multiarch module directory
+ Include /usr/lib/gtk-2.0 in the path as a fallback when building for
+ multiarch, to maintain compatibility with packages installing modules to
+ the old directories.
+Author: Steve Langasek <steve.langasek at linaro.org>
+Forwarded: not-needed
+
+Index: gtk+2.0-2.24.3/gtk/gtkmodules.c
+===================================================================
+--- gtk+2.0-2.24.3.orig/gtk/gtkmodules.c
++++ gtk+2.0-2.24.3/gtk/gtkmodules.c
+@@ -60,6 +60,7 @@
+ gchar *home_gtk_dir = NULL;
+ gchar *module_path;
+ gchar *default_dir;
++ gchar *pre_multiarch_dir = NULL;
+ static gchar **result = NULL;
+
+ if (result)
+@@ -74,21 +75,23 @@
+
+ if (exe_prefix)
+ default_dir = g_build_filename (exe_prefix, "lib", "gtk-2.0", NULL);
+- else
++ else {
+ default_dir = g_build_filename (GTK_LIBDIR, "gtk-2.0", NULL);
++ pre_multiarch_dir = "/usr/lib/gtk-2.0";
++ }
+
+ if (module_path_env && home_gtk_dir)
+ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+- module_path_env, home_gtk_dir, default_dir, NULL);
++ module_path_env, home_gtk_dir, default_dir, pre_multiarch_dir, NULL);
+ else if (module_path_env)
+ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+- module_path_env, default_dir, NULL);
++ module_path_env, default_dir, pre_multiarch_dir, NULL);
+ else if (home_gtk_dir)
+ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+- home_gtk_dir, default_dir, NULL);
++ home_gtk_dir, default_dir, pre_multiarch_dir, NULL);
+ else
+ module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
+- default_dir, NULL);
++ default_dir, pre_multiarch_dir, NULL);
+
+ g_free (home_gtk_dir);
+ g_free (default_dir);
Modified: desktop/unstable/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/series?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/series [utf-8] Fri Jul 22 18:43:29 2011
@@ -14,3 +14,4 @@
064_gir_build_workaround.patch
065_tracker-0-10.patch
066_Revert-gdk-Make-background-changes-queue-a-repaint.patch
+098_multiarch_module_path.patch
Modified: desktop/unstable/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/rules?rev=29078&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/rules [utf-8] Fri Jul 22 18:43:29 2011
@@ -27,10 +27,12 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+DEB_BUILD_OPTIONS += multiarch
# relative libdir
ifneq (,$(findstring multiarch,$(DEB_BUILD_OPTIONS)))
-LIBDIR := usr/lib/$(DEB_HOST_GNU_TYPE)
+LIBDIR := usr/lib/$(DEB_HOST_MULTIARCH)
else
LIBDIR := usr/lib
endif
@@ -61,6 +63,7 @@
# relative base directory for all types of modules
MODULES_BASE_PATH := $(LIBDIR)/gtk-$(APIVER)/$(GTK_BINARY_VERSION)
+OLD_MODULES_BASE_PATH := usr/lib/gtk-$(APIVER)/$(GTK_BINARY_VERSION)
# package names
SHARED_PKG := libgtk$(APIVER)-$(SONAME)
@@ -234,6 +237,7 @@
-e "s#@LIBDIR@#$(LIBDIR)#g" \
-e 's#@OPTLIBDIR@#$(OPTLIBDIR)#g' \
-e "s#@MODULES_BASE_PATH@#$(MODULES_BASE_PATH)#g" \
+ -e "s#@OLD_MODULES_BASE_PATH@#$(OLD_MODULES_BASE_PATH)#g" \
$@.in \
$(wildcard $(if $(filter opt,$(FLAVORS)),$@.opt)) \
> $@
More information about the pkg-gnome-commits
mailing list