[Pkg-scicomp-commits] gmp/trunk/debian

[Steven Michael Robbins]

SVN commit 4543 by smr:

On amd64, install 32-bit libs in /usr/lib32.

 M  +8 -0      gmp/trunk/debian/changelog  
 M  +3 -0      gmp/trunk/debian/control  
 M  +0 -3      gmp/trunk/debian/rules  


--- gmp/trunk/debian/changelog #4542:4543
@@ -1,3 +1,11 @@
+gmp (2:4.3.1+dfsg-3) unstable; urgency=low
+
+  * rules: On amd64, install 32-bit libs in /usr/lib32.  Closes: #533849.
+  * control: Conflict with libc6-i386 versions prior to change removing
+    /emul/ia32-linux/lib; see #533849 for details.
+
+ -- Steve M. Robbins <smr at debian.org>  Mon, 03 Aug 2009 11:09:08 -0500
+
 gmp (2:4.3.1+dfsg-2) unstable; urgency=low
 
   * rules: Explicitly set NM for the powerpc 64-bit build.  Disable FAT
--- gmp/trunk/debian/control #4542:4543
@@ -61,6 +61,7 @@
 Priority: optional
 Architecture: amd64 ppc64 kfreebsd-amd64
 Depends: ${shlibs:Depends}
+Conflicts: libc6-i386 (<= 2.9-18)
 Description: Multiprecision arithmetic library (32bit)
  GNU MP is a programmer's library for arbitrary precision
  arithmetic (ie, a bignum package).  It can operate on signed
@@ -75,6 +76,7 @@
 Priority: optional
 Architecture: amd64 ppc64 kfreebsd-amd64
 Depends: ${shlibs:Depends}
+Conflicts: libc6-i386 (<= 2.9-18)
 Description: Multiprecision arithmetic library (C++ bindings, 32bit)
  GNU MP is a programmer's library for arbitrary precision
  arithmetic (ie, a bignum package).  It can operate on signed
@@ -87,6 +89,7 @@
 Architecture: amd64 ppc64 kfreebsd-amd64
 Depends: libgmp3-dev (= ${binary:Version}), lib32gmp3 (= ${binary:Version}), lib32gmpxx4 (= ${binary:Version})
 Suggests: libgmp3-doc, libmpfr-dev
+Conflicts: libc6-i386 (<= 2.9-18)
 Description: Multiprecision arithmetic library developers tools (32bit)
  This development package provides the header files and the symbolic
  links to allow compilation and linking of programs that use the
--- gmp/trunk/debian/rules #4542:4543
@@ -37,9 +37,6 @@
 
 lib32dir = usr/lib32
 lib64dir = usr/lib64
-ifeq ($(DEB_HOST_ARCH),amd64)
-  lib32dir = emul/ia32-linux/usr/lib
-endif
 
 
 confflags = --prefix=/usr --enable-cxx --enable-mpbsd