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

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 0b5fd382b93e675ca96a014e4959488f2dcfc5ce
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri May 11 14:21:35 2012 +0200

      * Suggests instead of Recommends for libdb5.3-java-gcj
      * Explicitly depend on debhelper (>= 9)
      * Split libdb5.3-java to arch independent libdb5.3-java and move JNI
        libraries to libdb5.3-java-jni (Closes: #669992)

diff --git a/debian/control b/debian/control
index 6ae60fb..c2e57f7 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 (>= 8.1.3~),
+Build-Depends: debhelper (>= 9),
 	       tcl-dev,
 	       procps [!hurd-i386],
 	       javahelper,
@@ -130,25 +130,39 @@ Description: Berkeley v5.3 Database Libraries [debug]
  This package provides the debug symbols for the Berkeley v5.3 database
  libraries and binaries.
 
-Package: libdb5.3-java
+Package: libdb5.3-java-jni
 Architecture: any
 Section: java
 Priority: optional
 Depends: ${shlibs:Depends},
 	 ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Breaks: libdb5.3-java (<< ${source:Version})
 Conflicts: libdb5.1-java, libdb5.2-java
-Recommends: libdb5.3-java-gcj
 Multi-Arch: same
 Description: Berkeley v5.3 Database Libraries for Java
  This package provides the Java interface for the Berkeley v5.3 database
  library.
 
+Package: libdb5.3-java
+Architecture: all
+Section: java
+Priority: optional
+Depends: libdb5.3-java-jni (>= ${source:Version}),
+	 ${shlibs:Depends},
+	 ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Suggests: libdb5.3-java-gcj
+Multi-Arch: foreign
+Description: Berkeley v5.3 Database Libraries for Java
+ This package provides the Java interface for the Berkeley v5.3 database
+ library.
+
 Package: libdb5.3-java-gcj
 Architecture: any
 Section: java
 Priority: optional
-Depends: libdb5.3-java (= ${binary:Version}),
+Depends: libdb5.3-java (= ${source:Version}),
 	 ${shlibs:Depends},
 	 ${misc:Depends}
 Description: Berkeley v5.3 Database Libraries for Java (native code)
diff --git a/debian/libdb5.3++.dirs b/debian/libdb5.3-java-jni.dirs
similarity index 100%
copy from debian/libdb5.3++.dirs
copy to debian/libdb5.3-java-jni.dirs
diff --git a/debian/libdb5.3-java.install b/debian/libdb5.3-java-jni.install
similarity index 100%
rename from debian/libdb5.3-java.install
rename to debian/libdb5.3-java-jni.install
diff --git a/debian/libdb5.3-java-jni.lintian-overrides b/debian/libdb5.3-java-jni.lintian-overrides
new file mode 100644
index 0000000..6843c1b
--- /dev/null
+++ b/debian/libdb5.3-java-jni.lintian-overrides
@@ -0,0 +1,2 @@
+# historical reasons
+libdb5.3-java-jni: package-name-doesnt-match-sonames libdb-java-5.3
diff --git a/debian/libdb5.3-java.dirs b/debian/libdb5.3-java.dirs
index 42a1652..13c9f03 100644
--- a/debian/libdb5.3-java.dirs
+++ b/debian/libdb5.3-java.dirs
@@ -1,2 +1 @@
-usr/lib
 usr/share/java
diff --git a/debian/libdb5.3-java.lintian-overrides b/debian/libdb5.3-java.lintian-overrides
deleted file mode 100644
index 1dae1c7..0000000
--- a/debian/libdb5.3-java.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# historical reasons
-libdb5.3-java: package-name-doesnt-match-sonames libdb-java-5.3
diff --git a/debian/rules b/debian/rules
index 78c00c6..82a8b7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,7 +68,7 @@ CONFIGURE_SWITCHES += --enable-java
 DH_PLUGINS += --with=javahelper
 else
 CONFIGURE_SWITCHES += --disable-java
-DH_OPTIONS += -Nlibdb5.3-java -Nlibdb5.3-java-dev -Nlibdb5.3-java-gcj
+DH_OPTIONS += -Nlibdb5.3-java -Nlibdb5.3-java-dev -Nlibdb5.3-java-gcj -Nlibdb5.3-java-jni
 endif
 
 ifeq (no,$(ENABLE_GCJ))

-- 
Berkeley DB Debian packaging