Package: db
Version: 5.1.25-10
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
Hi Ondřej,
I've just applied a patch to the db package in Ubuntu to convert it to
multiarch (putting it on par with where the db4.8 package was in Ubuntu
natty). As multiarch support has landed in Debian unstable as well, it
would be great if you would include this in your next upload of db to
unstable - as this is the last change needed to have multiarch
co-installable libpam-modules in Debian. :)
Explanatory changelog entry from the Ubuntu upload:
* Build for multiarch, adding build-dependency on debhelper 8.1.3 and
bumping compat level to 9.
* Add Pre-Depends: ${misc:Pre-Depends} to library packages for
multiarch-support.
Thanks for considering the patch.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/compat'
--- debian/compat 2011-04-20 14:07:51 +0000
+++ debian/compat 2011-06-22 05:45:17 +0000
@@ -1 +1 @@
-7
+9
=== modified file 'debian/control'
--- debian/control 2011-04-24 22:24:00 +0000
+++ debian/control 2011-06-22 07:40:28 +0000
@@ -4,7 +4,7 @@
Maintainer: Debian Berkeley DB Group <pkg-db-de...@lists.alioth.debian.org>
Uploaders: Ondřej Surý <ond...@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,
@@ -40,6 +41,8 @@
Architecture: any
Section: libs
Priority: standard
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Berkeley v5.1 Database Libraries [runtime]
@@ -50,6 +53,7 @@
Architecture: any
Section: database
Priority: optional
+Multi-Arch: foreign
Depends: ${shlibs:Depends},
${misc:Depends}
Description: Berkeley v5.1 Database Utilities
@@ -82,6 +86,8 @@
Package: libdb5.1++
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Section: libs
@@ -107,6 +113,8 @@
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},
@@ -121,6 +129,7 @@
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.
@@ -131,7 +140,9 @@
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.
@@ -178,6 +189,8 @@
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.
@@ -199,6 +212,8 @@
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.
=== modified file 'debian/libdb5.1++-dev.install'
--- debian/libdb5.1++-dev.install 2011-04-20 14:07:51 +0000
+++ debian/libdb5.1++-dev.install 2011-06-22 05:47:52 +0000
@@ -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.*
=== modified file 'debian/libdb5.1++.install'
--- debian/libdb5.1++.install 2011-04-20 14:07:51 +0000
+++ debian/libdb5.1++.install 2011-06-22 05:48:34 +0000
@@ -1 +1 @@
-usr/lib/libdb_cxx-*.so
+usr/lib/*/libdb_cxx-*.so
=== modified file 'debian/libdb5.1-dev.install'
--- debian/libdb5.1-dev.install 2011-04-20 14:07:51 +0000
+++ debian/libdb5.1-dev.install 2011-06-22 05:47:42 +0000
@@ -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.*
=== modified file 'debian/libdb5.1-java-dev.install'
--- debian/libdb5.1-java-dev.install 2011-04-20 14:07:51 +0000
+++ debian/libdb5.1-java-dev.install 2011-06-22 05:51:18 +0000
@@ -1,2 +1,2 @@
-usr/lib/libdb_java-*.a
-usr/lib/libdb_java.*
+usr/lib/*/libdb_java-*.a
+usr/lib/*/libdb_java.*
=== modified file 'debian/libdb5.1-java.install'
--- debian/libdb5.1-java.install 2011-04-21 00:21:34 +0000
+++ debian/libdb5.1-java.install 2011-06-22 05:50:17 +0000
@@ -1 +1 @@
-usr/lib/libdb_java-5.1*.so
+usr/lib/*/libdb_java-5.1*.so
=== modified file 'debian/libdb5.1-java.jlibs'
--- debian/libdb5.1-java.jlibs 2011-04-21 08:51:57 +0000
+++ debian/libdb5.1-java.jlibs 2011-06-22 06:52:58 +0000
@@ -1 +1 @@
-debian/tmp/usr/lib/db.jar
+debian/tmp/usr/lib/*/db.jar
=== modified file 'debian/libdb5.1-sql-dev.install'
--- debian/libdb5.1-sql-dev.install 2011-04-20 14:07:51 +0000
+++ debian/libdb5.1-sql-dev.install 2011-06-22 05:50:30 +0000
@@ -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.*
=== modified file 'debian/libdb5.1-sql.install'
--- debian/libdb5.1-sql.install 2011-04-20 14:07:51 +0000
+++ debian/libdb5.1-sql.install 2011-06-22 05:50:37 +0000
@@ -1 +1 @@
-usr/lib/libdb_sql-*.so
+usr/lib/*/libdb_sql-*.so
=== modified file 'debian/libdb5.1-stl-dev.install'
--- debian/libdb5.1-stl-dev.install 2011-04-20 14:07:51 +0000
+++ debian/libdb5.1-stl-dev.install 2011-06-22 05:50:47 +0000
@@ -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.*
=== modified file 'debian/libdb5.1-stl.install'
--- debian/libdb5.1-stl.install 2011-04-20 14:07:51 +0000
+++ debian/libdb5.1-stl.install 2011-06-22 05:51:26 +0000
@@ -1 +1 @@
-usr/lib/libdb_stl-*.so
+usr/lib/*/libdb_stl-*.so
=== modified file 'debian/libdb5.1-tcl.install'
--- debian/libdb5.1-tcl.install 2011-04-20 14:07:51 +0000
+++ debian/libdb5.1-tcl.install 2011-06-22 05:50:56 +0000
@@ -1 +1 @@
-usr/lib/libdb_tcl*
+usr/lib/*/libdb_tcl*
=== modified file 'debian/libdb5.1.install'
--- debian/libdb5.1.install 2011-04-20 14:07:51 +0000
+++ debian/libdb5.1.install 2011-06-22 05:48:28 +0000
@@ -1 +1 @@
-usr/lib/libdb-*.so
+usr/lib/*/libdb-*.so
=== modified file 'debian/rules'
--- debian/rules 2011-04-24 22:24:00 +0000
+++ debian/rules 2011-06-22 05:56:29 +0000
@@ -18,6 +18,7 @@
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:
@@ -120,13 +121,13 @@
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
mv $(CURDIR)/debian/tmp/usr/bin/dbsql
$(CURDIR)/debian/tmp/usr/bin/db_sql
rm -f $(CURDIR)/debian/tmp/usr/bin/sqlite3
