[pkg-db-commits] [SCM] Berkeley DB Debian packaging branch, debian-sid, updated. debian/5.1.25-10-12-gd1c2ac9

Tue Jun 28 12:35:39 UTC 2011

The following commit has been merged in the debian-sid branch:
commit b2481fd5589199e644ce19050166ce44528c5d0e
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jun 28 10:16:33 2011 +0200

    Apply MultiArch patch (Courtesy of Steve Langasek) (Closes: #631318)

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 797ad09..75ce971 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: standard
 Maintainer: Debian Berkeley DB Group <pkg-db-devel at lists.alioth.debian.org>
 Uploaders: Ondřej Surý <ondrej at debian.org>
 Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
 	       tcl-dev,
 	       procps [!hurd-i386],
 	       javahelper,
@@ -38,6 +38,8 @@ Description: Berkeley v5.1 Database Libraries [development]
 
 Package: libdb5.1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends}
 Description: Berkeley v5.1 Database Libraries [runtime]
@@ -48,6 +50,7 @@ Package: db5.1-util
 Architecture: any
 Section: database
 Priority: optional
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
 	 ${misc:Depends}
 Description: Berkeley v5.1 Database Utilities
@@ -80,6 +83,8 @@ Description: Berkeley v5.1 SQL Database Utilities
 
 Package: libdb5.1++
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends}
 Priority: optional
@@ -104,6 +109,8 @@ Package: libdb5.1-tcl
 Architecture: any
 Section: interpreters
 Priority: extra
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libdb4.6-tcl, libdb4.7-tcl, libdb4.8-tcl
 Depends: ${tcl:Depends},
 	 ${shlibs:Depends},
@@ -118,6 +125,7 @@ Section: debug
 Priority: extra
 Depends: libdb5.1 (= ${binary:Version}),
 	 ${misc:Depends}
+Multi-Arch: same
 Description: Berkeley v5.1 Database Libraries [debug]
  This package provides the debug symbols for the Berkeley v5.1 database
  libraries and binaries.
@@ -128,7 +136,9 @@ Section: java
 Priority: optional
 Depends: ${shlibs:Depends},
 	 ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Recommends: libdb5.1-java-gcj
+Multi-Arch: same
 Description: Berkeley v5.1 Database Libraries for Java
  This package provides the Java interface for the Berkeley v5.1 database
  library.
@@ -174,6 +184,8 @@ Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends},
 	 ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Berkeley v5.1 Database Libraries [SQL runtime]
  This is the runtime package for programs that use the v5.1 Berkeley
  database SQL library.
@@ -194,6 +206,8 @@ Architecture: any
 Priority: extra
 Depends: ${shlibs:Depends},
 	 ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Berkeley v5.1 Database Libraries [STL runtime]
  This is the runtime package for programs that use the v5.1 Berkeley
  database STL library.
diff --git a/debian/libdb5.1++-dev.install b/debian/libdb5.1++-dev.install
index 1267e96..178a58d 100644
--- a/debian/libdb5.1++-dev.install
+++ b/debian/libdb5.1++-dev.install
@@ -1,3 +1,3 @@
 usr/include/db_cxx.h
-usr/lib/libdb_cxx-*.a
-usr/lib/libdb_cxx.*
+usr/lib/*/libdb_cxx-*.a
+usr/lib/*/libdb_cxx.*
diff --git a/debian/libdb5.1++.install b/debian/libdb5.1++.install
index 1e8c29a..9b057ab 100644
--- a/debian/libdb5.1++.install
+++ b/debian/libdb5.1++.install
@@ -1 +1 @@
-usr/lib/libdb_cxx-*.so
+usr/lib/*/libdb_cxx-*.so
diff --git a/debian/libdb5.1-dev.install b/debian/libdb5.1-dev.install
index 55d38f1..e11220e 100644
--- a/debian/libdb5.1-dev.install
+++ b/debian/libdb5.1-dev.install
@@ -1,4 +1,4 @@
 usr/include/db.h
 usr/include/db_185.h
-usr/lib/libdb-*.a
-usr/lib/libdb.*
+usr/lib/*/libdb-*.a
+usr/lib/*/libdb.*
diff --git a/debian/libdb5.1-java-dev.install b/debian/libdb5.1-java-dev.install
index af660af..a979703 100644
--- a/debian/libdb5.1-java-dev.install
+++ b/debian/libdb5.1-java-dev.install
@@ -1,2 +1,2 @@
-usr/lib/libdb_java-*.a
-usr/lib/libdb_java.*
+usr/lib/*/libdb_java-*.a
+usr/lib/*/libdb_java.*
diff --git a/debian/libdb5.1-java.install b/debian/libdb5.1-java.install
index af89ed2..ba00d13 100644
--- a/debian/libdb5.1-java.install
+++ b/debian/libdb5.1-java.install
@@ -1 +1 @@
-usr/lib/libdb_java-5.1*.so
+usr/lib/*/libdb_java-5.1*.so
diff --git a/debian/libdb5.1-java.jlibs b/debian/libdb5.1-java.jlibs
index 8919591..dadcc35 100644
--- a/debian/libdb5.1-java.jlibs
+++ b/debian/libdb5.1-java.jlibs
@@ -1 +1 @@
-debian/tmp/usr/lib/db.jar
+debian/tmp/usr/lib/*/db.jar
diff --git a/debian/libdb5.1-sql-dev.install b/debian/libdb5.1-sql-dev.install
index ec56383..0b4f78e 100644
--- a/debian/libdb5.1-sql-dev.install
+++ b/debian/libdb5.1-sql-dev.install
@@ -1,3 +1,3 @@
 usr/include/dbsql.h
-usr/lib/libdb_sql-*.a
-usr/lib/libdb_sql.*
+usr/lib/*/libdb_sql-*.a
+usr/lib/*/libdb_sql.*
diff --git a/debian/libdb5.1-sql.install b/debian/libdb5.1-sql.install
index a397e33..27d1034 100644
--- a/debian/libdb5.1-sql.install
+++ b/debian/libdb5.1-sql.install
@@ -1 +1 @@
-usr/lib/libdb_sql-*.so
+usr/lib/*/libdb_sql-*.so
diff --git a/debian/libdb5.1-stl-dev.install b/debian/libdb5.1-stl-dev.install
index 83c5e06..3677f86 100644
--- a/debian/libdb5.1-stl-dev.install
+++ b/debian/libdb5.1-stl-dev.install
@@ -1,3 +1,3 @@
 usr/include/dbstl*.h
-usr/lib/libdb_stl-*.a
-usr/lib/libdb_stl.*
+usr/lib/*/libdb_stl-*.a
+usr/lib/*/libdb_stl.*
diff --git a/debian/libdb5.1-stl.install b/debian/libdb5.1-stl.install
index c89c632..6ad6d55 100644
--- a/debian/libdb5.1-stl.install
+++ b/debian/libdb5.1-stl.install
@@ -1 +1 @@
-usr/lib/libdb_stl-*.so
+usr/lib/*/libdb_stl-*.so
diff --git a/debian/libdb5.1-tcl.install b/debian/libdb5.1-tcl.install
index 5b043ca..904aabb 100644
--- a/debian/libdb5.1-tcl.install
+++ b/debian/libdb5.1-tcl.install
@@ -1 +1 @@
-usr/lib/libdb_tcl*
+usr/lib/*/libdb_tcl*
diff --git a/debian/libdb5.1.install b/debian/libdb5.1.install
index c7f5fcf..9634660 100644
--- a/debian/libdb5.1.install
+++ b/debian/libdb5.1.install
@@ -1 +1 @@
-usr/lib/libdb-*.so
+usr/lib/*/libdb-*.so
diff --git a/debian/rules b/debian/rules
index 07d0e0a..8b37fe4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Don't try to build this file if missing
 /usr/share/gcj/debian_defaults /usr/share/javahelper/java-vars.mk:
@@ -121,13 +122,13 @@ override_dh_auto_install:
 	dh_auto_install -Ddist -Bbuild
 
 # Remove .la files
-	rm -f $(CURDIR)/debian/tmp/usr/lib/*.la
+	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 # Remove libdb*-5.so from all packages, we don't provide generic libdb5 packages
-	rm -f $(CURDIR)/debian/tmp/usr/lib/libdb*5.so
+	rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb*5.so
 
-	rm -f debian/tmp/usr/lib/libdb.a
-	ln -s libdb-$(bdbversion).a $(CURDIR)/debian/tmp/usr/lib/libdb.a
+	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a
+	ln -s libdb-$(bdbversion).a $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a
 
 # Compare built-in signature and fail build if it is different
 	cc -o$(CURDIR)/debian/db_signature \

-- 
Berkeley DB Debian packaging

