[SCM] gtk2-engines-oxygen packaging branch, master, updated. debian/1.1.2-1-4-gf70a243

[Kai Wasserbäch]

The following commit has been merged in the master branch:
commit f70a24332e5f0260e9202ecc1fbdd04e1a17449e
Author: Kai Wasserbäch <curan at debian.org>
Date:   Mon Sep 12 11:04:05 2011 +0200

    debian/patches/use-sane-prefix-to-install-engine.patch: Added.
---
 debian/changelog                                   |    2 +-
 debian/patches/series                              |    1 +
 .../use-sane-prefix-to-install-engine.patch        |   30 ++++++++++++++++++++
 debian/rules                                       |    1 -
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e14f9a3..c9f388d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ gtk2-engines-oxygen (1.1.2-2) UNRELEASED; urgency=low
 
   * debian/control: Updated Vcs-* entries to point to anonscm.d.o.
   * Prepare for multiarch:
-    - debian/rules: query ma triplet and pass it to CMake.
+    - debian/patches/use-sane-prefix-to-install-engine.patch: Added.
     - debian/control:
       · Bumped B-D on debhelper.
       · Bumped B-D on libgtk2.0-dev (multiarch ready since 2.24.5-4).
diff --git a/debian/patches/series b/debian/patches/series
index 625ddbd..6c56076 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 dont-build-demos.patch
+use-sane-prefix-to-install-engine.patch
diff --git a/debian/patches/use-sane-prefix-to-install-engine.patch b/debian/patches/use-sane-prefix-to-install-engine.patch
new file mode 100644
index 0000000..1062f29
--- /dev/null
+++ b/debian/patches/use-sane-prefix-to-install-engine.patch
@@ -0,0 +1,30 @@
+From: Kai Wasserbäch <curan at debian.org>
+Description: Use Gtk's libdir as install prefix for the engine
+ Ask pkg-config for the libdir, this allows an easy multiarch
+ installation of the engine. Otherwise we'd need to pass
+ "-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)" to CMake during configuration,
+ which makes backporting more complex than needed. (Now you only need
+ to lower the B-Ds on debhelper and libgtk2.0-dev).
+Last-Update: 2011-09-12
+Bug: https://bugs.kde.org/show_bug.cgi?id=281857
+Forwarded: https://bugs.kde.org/attachment.cgi?id=63581
+---
+ CMakeLists.txt |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -101,7 +101,12 @@ exec_program(
+ 	ARGS --variable=gtk_binary_version gtk+-2.0
+ 	OUTPUT_VARIABLE GTK_BIN_VERSION )
+ 
+-set( INSTALL_PATH_GTK_ENGINES "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/gtk-2.0/${GTK_BIN_VERSION}/engines" CACHE PATH "The directory in which to install the theme engine library( eg. /usr/lib/gtk-2.0/2.4.0/engines )" )
++exec_program(
++  ${PKGCONFIG_EXECUTABLE}
++  ARGS --variable=libdir gtk+-2.0
++  OUTPUT_VARIABLE GTK_LIBDIR_PREFIX )
++
++set( INSTALL_PATH_GTK_ENGINES "${GTK_LIBDIR_PREFIX}/gtk-2.0/${GTK_BIN_VERSION}/engines" CACHE PATH "The directory in which to install the theme engine library( eg. /usr/lib/gtk-2.0/2.4.0/engines )" )
+ set( INSTALL_PATH_GTK_THEMES "${CMAKE_INSTALL_PREFIX}/share/themes" CACHE PATH "The directory in which to install the theme data( eg. /usr/share/themes )" )
+ set( GTK_THEME_DIR ${INSTALL_PATH_GTK_THEMES}/oxygen-gtk )
+ 
diff --git a/debian/rules b/debian/rules
index b5faebb..c3cba52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
 		-DDEBIAN_NO_DEMOS=1 \
 		-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 		-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \

-- 
gtk2-engines-oxygen packaging