r43842 - in /packages/gmp/trunk/debian: changelog control rules

[smr at users.alioth.debian.org]

Author: smr
Date: Tue Aug 30 04:07:02 2011
New Revision: 43842

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43842
Log:
Build library packages as multi-arch.

Modified:
    packages/gmp/trunk/debian/changelog
    packages/gmp/trunk/debian/control
    packages/gmp/trunk/debian/rules

Modified: packages/gmp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/changelog?rev=43842&op=diff
==============================================================================
--- packages/gmp/trunk/debian/changelog (original)
+++ packages/gmp/trunk/debian/changelog Tue Aug 30 04:07:02 2011
@@ -17,8 +17,12 @@
     several user-level routines, e.g., mpz_invert, but only for operands
     of at least 3000 bits (for smaller operands, a simpler algorithm is
     used).
-
- -- Steve M. Robbins <smr at debian.org>  Mon, 29 Aug 2011 20:58:05 -0500
+  
+  * control:
+  * rules: Apply patch (thanks, Riku Voipio) for multiarch, except we do
+    not mark libgmp-dev as multiarch.  Closes: #638959.
+
+ -- Steve M. Robbins <smr at debian.org>  Mon, 29 Aug 2011 23:06:19 -0500
 
 gmp (2:5.0.1+dfsg-7) unstable; urgency=low
 

Modified: packages/gmp/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/control?rev=43842&op=diff
==============================================================================
--- packages/gmp/trunk/debian/control (original)
+++ packages/gmp/trunk/debian/control Tue Aug 30 04:07:02 2011
@@ -2,7 +2,7 @@
 Homepage: http://gmplib.org/
 Section: libs
 Priority: optional
-Build-Depends: m4, debhelper (>= 7), quilt, gcc-multilib [amd64 kfreebsd-amd64 powerpc ppc64], g++-multilib [amd64 kfreebsd-amd64 powerpc ppc64]
+Build-Depends: m4, debhelper (>= 8.1.3), quilt, gcc-multilib [amd64 kfreebsd-amd64 powerpc ppc64], g++-multilib [amd64 kfreebsd-amd64 powerpc ppc64]
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/gmp/trunk/
@@ -14,6 +14,8 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Multiprecision arithmetic library
  GNU MP is a programmer's library for arbitrary precision
  arithmetic (ie, a bignum package).  It can operate on signed
@@ -27,6 +29,8 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Conflicts: libgmp3, libgmpxx4
 Replaces: libgmp3
 Description: Multiprecision arithmetic library (C++ bindings)

Modified: packages/gmp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmp/trunk/debian/rules?rev=43842&op=diff
==============================================================================
--- packages/gmp/trunk/debian/rules (original)
+++ packages/gmp/trunk/debian/rules Tue Aug 30 04:07:02 2011
@@ -18,6 +18,7 @@
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 MAKE_CHECK = : disabled make check
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -74,6 +75,8 @@
   CXX64 = g++ $(m64)
   MAKE_CHECK = : disabled make check
 endif
+
+confflags_ma = $(confflags) --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 CC   = $(DEB_HOST_GNU_TYPE)-gcc
 CC32 = $(DEB_HOST_GNU_TYPE)-gcc $(m32)
@@ -106,7 +109,7 @@
 configure: patch configure-stamp
 configure-stamp:
 	mkdir -p build
-	cd build && ../configure $(confflags) \
+	cd build && ../configure $(confflags_ma) \
 	    AR=$(AR) CC="$(CC)" CFLAGS="$(CFLAGS)" \
 	    CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)"
 	CC="$(DEB_HOST_GNU_TYPE)-gcc" sh debian/fix-gmp-h.sh build
@@ -168,12 +171,12 @@
 install: build-stamp install-prep
 	$(MAKE) DESTDIR=`pwd`/debian/tmp -C build install
 
-	dh_install -plibgmp10 usr/lib/libgmp.so.*
-	dh_install -plibgmpxx4ldbl usr/lib/libgmpxx.so.*
-
-	dh_install -plibgmp-dev usr/lib/lib*.so
-	dh_install -plibgmp-dev usr/lib/lib*.a
-	dh_install -plibgmp-dev usr/lib/lib*.la
+	dh_install -plibgmp10 usr/lib/*/libgmp.so.*
+	dh_install -plibgmpxx4ldbl usr/lib/*/libgmpxx.so.*
+
+	dh_install -plibgmp-dev usr/lib/*/lib*.so
+	dh_install -plibgmp-dev usr/lib/*/lib*.a
+	dh_install -plibgmp-dev usr/lib/*/lib*.la
 	dh_install -plibgmp-dev usr/include
 	dh_install -plibgmp-dev -Xgmp-mparam.h build/gmp*.h usr/include