r13744 - packages/trunk/libphysfs/debian

[Patrick Matthäi]

Author: pmatthaei
Date: 2012-07-11 19:47:02 +0000 (Wed, 11 Jul 2012)
New Revision: 13744

Modified:
   packages/trunk/libphysfs/debian/changelog
   packages/trunk/libphysfs/debian/compat
   packages/trunk/libphysfs/debian/control
   packages/trunk/libphysfs/debian/libphysfs-dev.install
   packages/trunk/libphysfs/debian/libphysfs1.install
   packages/trunk/libphysfs/debian/rules
Log:
* Add multiarch support.
  Closes: #680607
TODO: Fix libinstall path. NOT READY YET!


Modified: packages/trunk/libphysfs/debian/changelog
===================================================================
--- packages/trunk/libphysfs/debian/changelog	2012-07-11 19:21:37 UTC (rev 13743)
+++ packages/trunk/libphysfs/debian/changelog	2012-07-11 19:47:02 UTC (rev 13744)
@@ -1,6 +1,9 @@
 libphysfs (2.0.2-7) UNRELEASED; urgency=low
 
   * Wrap all debian/control fields.
+  * Add multiarch support.
+    Closes: #680607
+TODO: Fix libinstall path. NOT READY YET!
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 11 Jul 2012 21:21:19 +0200
 

Modified: packages/trunk/libphysfs/debian/compat
===================================================================
--- packages/trunk/libphysfs/debian/compat	2012-07-11 19:21:37 UTC (rev 13743)
+++ packages/trunk/libphysfs/debian/compat	2012-07-11 19:47:02 UTC (rev 13744)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/libphysfs/debian/control
===================================================================
--- packages/trunk/libphysfs/debian/control	2012-07-11 19:21:37 UTC (rev 13743)
+++ packages/trunk/libphysfs/debian/control	2012-07-11 19:47:02 UTC (rev 13744)
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Barry deFreese <bdefreese at debian.org>,
  Patrick Matthäi <pmatthaei at debian.org>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 9),
  cmake,
  doxygen,
  autotools-dev,
@@ -36,6 +36,7 @@
 Provides: libphysfs-1.0-0
 Conflicts: libphysfs-1.0-0
 Replaces: libphysfs-1.0-0
+Multi-Arch: same
 Description: filesystem abstraction library for game programmers
  The PhysicsFS filesystem abstraction library provides a simple C
  interface to aid game programmers in utilizing game assets packaged in
@@ -47,6 +48,7 @@
  libphysfs1 (= ${binary:Version})
 Priority: extra
 Section: debug
+Multi-Arch: same
 Description: filesystem abstraction library for game programmers (debug symbols)
  The PhysicsFS filesystem abstraction library provides a simple C
  interface to aid game programmers in utilizing game assets packaged in

Modified: packages/trunk/libphysfs/debian/libphysfs-dev.install
===================================================================
--- packages/trunk/libphysfs/debian/libphysfs-dev.install	2012-07-11 19:21:37 UTC (rev 13743)
+++ packages/trunk/libphysfs/debian/libphysfs-dev.install	2012-07-11 19:47:02 UTC (rev 13744)
@@ -1,6 +1,6 @@
 debian/tmp/usr/bin/* usr/bin
 debian/tmp/usr/include/* usr/include
-debian/tmp/usr/lib/lib*.a usr/lib
-debian/tmp/usr/lib/lib*.so usr/lib
+debian/tmp/usr/lib/*/lib*.a
+debian/tmp/usr/lib/*/lib*.so
 docs/html/* usr/share/doc/libphysfs1/html
 docs/latex/* usr/share/doc/libphysfs1/latex

Modified: packages/trunk/libphysfs/debian/libphysfs1.install
===================================================================
--- packages/trunk/libphysfs/debian/libphysfs1.install	2012-07-11 19:21:37 UTC (rev 13743)
+++ packages/trunk/libphysfs/debian/libphysfs1.install	2012-07-11 19:47:02 UTC (rev 13744)
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.* usr/lib
+debian/tmp/usr/lib/*/lib*.so.*

Modified: packages/trunk/libphysfs/debian/rules
===================================================================
--- packages/trunk/libphysfs/debian/rules	2012-07-11 19:21:37 UTC (rev 13743)
+++ packages/trunk/libphysfs/debian/rules	2012-07-11 19:47:02 UTC (rev 13744)
@@ -9,6 +9,7 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -29,7 +30,7 @@
 
 config.status:
 	dh_testdir
-	cmake -D CMAKE_INSTALL_PREFIX=/usr .
+	cmake -D CMAKE_INSTALL_PREFIX=/usr -DINSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) .
 
 build: build-stamp
 build-stamp: config.status