[pkg-fgfs-crew] r227 - in /simgear/trunk/debian: changelog control rules

[ovek at users.alioth.debian.org]

Author: ovek
Date: Sun Aug  5 16:16:49 2012
New Revision: 227

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=227
Log:
Another multiarchification fix.

Modified:
    simgear/trunk/debian/changelog
    simgear/trunk/debian/control
    simgear/trunk/debian/rules

Modified: simgear/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/changelog?rev=227&op=diff
==============================================================================
--- simgear/trunk/debian/changelog (original)
+++ simgear/trunk/debian/changelog Sun Aug  5 16:16:49 2012
@@ -1,3 +1,11 @@
+simgear (2.6.0-3) unstable; urgency=low
+
+  * Build-Depend on debhelper 8.1.3.
+  * Changed debian/rules to give /usr/lib/$(DEB_HOST_MULTIARCH)
+    instead of /usr/lib/* to dh_install, to maybe ease any backports.
+
+ -- Ove Kaaven <ovek at arcticnet.no>  Sun, 05 Aug 2012 18:01:16 +0200
+
 simgear (2.6.0-2) unstable; urgency=low
 
   * Added multi-arch control fields to debian/control,

Modified: simgear/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/control?rev=227&op=diff
==============================================================================
--- simgear/trunk/debian/control (original)
+++ simgear/trunk/debian/control Sun Aug  5 16:16:49 2012
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian FlightGear Crew <pkg-fgfs-crew at lists.alioth.debian.org>
 Uploaders: Ove Kaaven <ovek at arcticnet.no>
-Build-Depends: debhelper (>> 5),
+Build-Depends: debhelper (>> 8.1.3),
  libx11-dev, libxext-dev, libxi-dev, libice-dev, libsm-dev, libxt-dev, libxmu-dev,
  libgl1-mesa-dev | xlibmesa-gl-dev | libgl-dev,
  libglu1-mesa-dev | libglu1-xorg-dev | xlibmesa-glu-dev | libglu-dev,

Modified: simgear/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/debian/rules?rev=227&op=diff
==============================================================================
--- simgear/trunk/debian/rules (original)
+++ simgear/trunk/debian/rules Sun Aug  5 16:16:49 2012
@@ -14,6 +14,8 @@
 NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 MAKEFLAGS += -j$(NUMJOBS)
 endif
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 deb_version := $(lastword $(shell dpkg-parsechangelog|grep "^Version: "))
 version := $(shell echo $(deb_version)|sed -n 's,^\(.*\)-[^-]*$$,\1,p')
@@ -75,10 +77,10 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 	# Install shared libraries
-	dh_install -p$(package) --autodest debian/tmp/usr/lib/*/*.so.*
-	dh_install -psimgear-dev --autodest debian/tmp/usr/lib/*/*.so
+	dh_install -p$(package) --autodest debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.*
+	dh_install -psimgear-dev --autodest debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so
 	# Install static libraries
-	dh_install -psimgear-dev --autodest debian/tmp/usr/lib/*/*.a
+	dh_install -psimgear-dev --autodest debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.a
 	# Install headers
 	dh_install -psimgear-dev --autodest debian/tmp/usr/include