[pkg-db-commits] [SCM] UNNAMED PROJECT branch, debian-sid, updated. debian/5.1.25-5-6-g37006a6

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 60c8c687cf61d5964245ca8d2b2a397cf3bf1ab9
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Apr 20 23:02:31 2011 +0200

    Let jh_installlibs handle db.jar

diff --git a/debian/libdb5.1-java.install b/debian/libdb5.1-java.install
index 94cb746..af89ed2 100644
--- a/debian/libdb5.1-java.install
+++ b/debian/libdb5.1-java.install
@@ -1,2 +1 @@
-usr/share/java/*.jar
 usr/lib/libdb_java-5.1*.so
diff --git a/debian/libdb5.1-java.jlibs b/debian/libdb5.1-java.jlibs
new file mode 100644
index 0000000..d173620
--- /dev/null
+++ b/debian/libdb5.1-java.jlibs
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libdb5.1.jar
diff --git a/debian/rules b/debian/rules
index 39a6729..e9df6a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,9 +102,10 @@ endif
 
 override_dh_auto_install:
 	dh_auto_install -Ddist -Bbuild
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/java
+
 	mv $(CURDIR)/debian/tmp/usr/lib/db.jar \
-		$(CURDIR)/debian/tmp/usr/share/java/lib$(package)-java-$(version).jar
+	   $(CURDIR)/debian/tmp/usr/lib/libdb$(bdbversion).jar
+
 # Remove .la files
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*.la
 

-- 
UNNAMED PROJECT