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

[Kai Wasserbäch]

The following commit has been merged in the master branch:
commit 541f165048e39947e12dc38d60a633d480a7dfa2
Author: Kai Wasserbäch <curan at debian.org>
Date:   Fri Sep 9 19:10:17 2011 +0200

    Prepare for multiarch
    
    * debian/rules: query ma triplet and pass it to CMake.
    * debian/control:
      - Bumped B-D on debhelper.
      - Bumped B-D on libgtk2.0-dev (multiarch ready since 2.24.5-4).
      - Added Pre-Depends and Multi-Arch entries to binary package.
---
 debian/changelog |    6 ++++++
 debian/control   |    7 ++++++-
 debian/rules     |    5 ++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52854d9..727f425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 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/control:
+      · Bumped B-D on debhelper.
+      · Bumped B-D on libgtk2.0-dev (multiarch ready since 2.24.5-4).
+      · Added Pre-Depends and Multi-Arch entries to binary package.
 
  -- Kai Wasserbäch <curan at debian.org>  Thu, 08 Sep 2011 22:25:50 +0200
 
diff --git a/debian/control b/debian/control
index e35ab6d..5584370 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,10 @@ Section: gnome
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Kai Wasserbäch <curan at debian.org>
-Build-Depends: cmake, debhelper (>= 8), libdbus-glib-1-dev, libgtk2.0-dev
+Build-Depends: cmake,
+ debhelper (>= 8.1.3~),
+ libdbus-glib-1-dev,
+ libgtk2.0-dev (>= 2.24.5-4)
 Standards-Version: 3.9.2
 Homepage: https://projects.kde.org/projects/playground/artwork/oxygen-gtk
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/gtk2-engines-oxygen.git
@@ -11,8 +14,10 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/gtk2-engines
 
 Package: gtk2-engines-oxygen
 Architecture: any
+Pre-Depends: multiarch-support
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: kde-config-gtk-style
+Multi-Arch: same
 Description: Oxygen widget theme for GTK+-based applications
  Oxygen-Gtk is a port of the Oxygen widget style to GTK+.
  .
diff --git a/debian/rules b/debian/rules
index 5ab0e53..9eab08a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,12 @@
 #!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
+		-DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH) \
 		-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 		-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
 		-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"

-- 
gtk2-engines-oxygen packaging