[pkg-db-commits] [SCM] Berkeley DB v4.7 Debian packaging branch, debian-sid, updated. debian/4.7.25-19-5-g07cbaa6

Tue Jun 28 14:39:50 UTC 2011

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

    Remove libdb4.7 library package

diff --git a/debian/control b/debian/control
index 7ab0393..58c819f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,17 +9,12 @@ Homepage: http://www.oracle.com/technology/software/products/berkeley-db/index.h
 Vcs-Browser: http://git.debian.org/?p=pkg-db/db4.7.git
 Vcs-Git: git://git.debian.org/pkg-db/db4.7.git
 
-Package: libdb4.7
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Berkeley v4.7 Database Libraries [runtime]
- This is the runtime package for programs that use the v4.7 Berkeley
- database library.
-
 Package: db4.7-util
 Architecture: any
 Section: database
 Depends: ${shlibs:Depends}
+Conflicts: libdb4.7
+Replaces: libdb4.7
 Description: Berkeley v4.7 Database Utilities
  This package provides different tools for manipulating databases
  in the Berkeley v4.7 database format, and includes:
diff --git a/debian/java-gcj.postinst b/debian/java-gcj.postinst
deleted file mode 100644
index f034268..0000000
--- a/debian/java-gcj.postinst
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-if which rebuild-gcj-db >/dev/null 2>&1; then
-	rebuild-gcj-db
-fi
diff --git a/debian/java-gcj.postrm b/debian/java-gcj.postrm
deleted file mode 100644
index f034268..0000000
--- a/debian/java-gcj.postrm
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-
-if which rebuild-gcj-db >/dev/null 2>&1; then
-	rebuild-gcj-db
-fi
diff --git a/debian/lib++.postinst b/debian/lib++.postinst
deleted file mode 100644
index 5f5cb2f..0000000
--- a/debian/lib++.postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-	(configure)
-        ldconfig
-	;;
-esac
diff --git a/debian/lib.postinst b/debian/lib.postinst
index 5f5cb2f..6fbfb89 100644
--- a/debian/lib.postinst
+++ b/debian/lib.postinst
@@ -1,7 +1,7 @@
 #!/bin/sh -e
 
 case "$1" in
-	(configure)
+       (configure)
         ldconfig
-	;;
+       ;;
 esac
diff --git a/debian/libjava.postinst b/debian/libjava.postinst
deleted file mode 100644
index 5f5cb2f..0000000
--- a/debian/libjava.postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-	(configure)
-        ldconfig
-	;;
-esac
diff --git a/debian/libtcl.postinst b/debian/libtcl.postinst
deleted file mode 100644
index 5f5cb2f..0000000
--- a/debian/libtcl.postinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-case "$1" in
-	(configure)
-        ldconfig
-	;;
-esac
diff --git a/debian/rules b/debian/rules
index 3d60c0f..1ca0ed4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ CONFIGURE_SWITCHES =    --prefix=/usr \
 			--enable-tcl \
 			--enable-test
 
-DB_BINARY_PKGS = libdb4.7 db4.7-util
+DB_BINARY_PKGS = db4.7-util
 
 ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 CONFIGURE_VARS += STRIP=":"
@@ -60,7 +60,7 @@ clean:
 	$(checkdir)
 	rm -rf obj
 	rm -f build install-stamp
-	-rm -rf debian/tmp debian/$(package)* debian/lib$(package)* core
+	-rm -rf debian/tmp debian/$(package)* core
 	-rm -f debian/substvars.*
 	rm -rf debian/libdb*
 
@@ -77,40 +77,20 @@ install-stamp: build
 binary-arch: checkroot build install-stamp
 	$(checkdir)
 
-	rm -rf debian/lib$(package)-dev debian/$(package)-util debian/lib$(package)
-	$(INSTALL_DIR) debian/lib$(package)-dev/usr/lib \
-			debian/$(package)-util/usr/share/man/man1 \
-			debian/lib$(package)/usr/lib
+	rm -rf debian/$(package)-util
+	$(INSTALL_DIR) debian/$(package)-util/usr/share/man/man1 \
+	               debian/$(package)-util/usr/lib
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	strip --remove-section=.note --remove-section=.comment \
-	      debian/tmp/usr/lib/*.so debian/tmp/usr/bin/*
-	strip --strip-debug debian/tmp/usr/lib/*.a
+	  debian/tmp/usr/bin/* debian/tmp/usr/lib/*.so
 endif
 
-	chmod 644 debian/tmp/usr/lib/*.so debian/tmp/usr/include/*.h
+	# Install only /usr/bin binaries
+	chmod 644 debian/tmp/usr/lib/*.so
 	chmod 755 debian/tmp/usr/bin/*
-
-	cp -a debian/tmp/usr/include debian/lib$(package)-dev/usr
 	cp -a debian/tmp/usr/bin debian/$(package)-util/usr
-	cp -a debian/tmp/usr/lib/*.so debian/tmp/usr/lib/*.a \
-	        debian/lib$(package)-dev/usr/lib
-	mv debian/lib$(package)-dev/usr/lib/libdb-$(bdbversion).so debian/lib$(package)/usr/lib
-
-	# Remove extra TCL library
-	rm -f debian/lib$(package)-dev/usr/lib/*tcl*
-
-	# Remove -ldb from libdb*-dev package
-	rm -f debian/lib$(package)-dev/usr/lib/libdb.a
-	rm -f debian/lib$(package)-dev/usr/lib/libdb.so
-	rm -f debian/lib$(package)-dev/usr/lib/libdb-4.so
-	rm -f debian/lib$(package)++-dev/usr/lib/libdb_cxx.a
-	rm -f debian/lib$(package)++-dev/usr/lib/libdb_cxx.so
-	rm -f debian/lib$(package)++-dev/usr/lib/libdb_cxx-4.so
-	rm -f debian/lib$(package)-java-dev/usr/lib/libdb_java.so
-	rm -f debian/lib$(package)-java-dev/usr/lib/libdb_java-4.so
-	rm -f debian/lib$(package)-tcl/usr/lib/libdb_tcl.so
-	rm -f debian/lib$(package)-tcl/usr/lib/libdb_tcl-4.so
+	cp -a debian/tmp/usr/lib/libdb-$(bdbversion).so debian/$(package)-util/usr/lib
 
 	cd debian/$(package)-util/usr/bin && for i in * ; \
 	 do mv $$i `echo $$i | sed 's/db/$(package)/'` ; \
@@ -126,8 +106,8 @@ endif
 	   gzip -9fq debian/$${i}/usr/share/doc/$${i}/changelog.Debian ; \
 	done
 
-	echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs
-	$(INSTALL_SCRIPT) debian/lib.postinst debian/lib$(package)/DEBIAN/postinst
+	echo 'libdb $(bdbversion) $(package)-util' >debian/$(package)-util/DEBIAN/shlibs
+	$(INSTALL_SCRIPT) debian/lib.postinst debian/$(package)-util/DEBIAN/postinst
 
 	for i in $(DB_BINARY_PKGS); \
 	do dpkg-shlibdeps -Tdebian/substvars.$${i} -dDepends `find debian/$${i}/usr/lib -name "*.so"` `find debian/$${i}/usr/bin -type f` ; \
diff --git a/debian/runtests.tclsh b/debian/runtests.tclsh
deleted file mode 100644
index 592e892..0000000
--- a/debian/runtests.tclsh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/tclsh
-
-source ../test/test.tcl
-#run_std
-
-global one_test
-source ../test/include.tcl
-
-set one_test "ALL"
-set display 1
-set run 1
-
-fileremove -f ALL.OUT
-
-set o [open ALL.OUT a]
-puts -nonewline "Modified test suite run started at: "
-puts [clock format [clock seconds] -format "%H:%M %D"]
-puts [berkdb version -string]
-
-puts -nonewline $o "Modified test suite run started at: "
-puts $o [clock format [clock seconds] -format "%H:%M %D"]
-puts $o [berkdb version -string]
-
-close $o
-
-	set test_list {
-	{"environment"		"env"}
-	{"archive"		"archive"}
-	{"backup"		"backup"}
-	{"locking"		"lock"}
-	{"logging"		"log"}
-	{"memory pool"		"memp"}
-	{"transaction"		"txn"}
-	{"byte-order"		"byte"}
-	{"recno backing file"	"rsrc"}
-	{"DBM interface"	"dbm"}
-	{"NDBM interface"	"ndbm"}
-	{"Hsearch interface"	"hsearch"}
-	}
-#{"file operations"      "fop"}
-#{"deadlock detection"   "dead"}
-#{"subdatabase"          "sdb"}
-#{"secondary index"      "sindex"}
-
-foreach pair $test_list {
-	set msg [lindex $pair 0]
-set cmd [lindex $pair 1]
-puts "Running $msg tests ([clock format [clock seconds] -format "%H:%M:%S"])"
-if [catch {exec /usr/bin/tclsh << \
-			"source ../test/test.tcl; r $cmd" \
-		>>& ALL.OUT } res] {
-		set o [open ALL.OUT a]
-	puts $o "FAIL: $cmd test: $res"
-	close $o
-}
-}

-- 
Berkeley DB v4.7 Debian packaging

