[pkg-db-commits] [SCM] Berkeley DB v4.7 Debian packaging branch, debian-sid, updated. debian/4.8.30-8-6-g8e29047

Thu May 26 19:16:01 UTC 2011

The following commit has been merged in the debian-sid branch:
commit cd779e0e0ac0637111d15f9af75471affa07eb72
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed May 11 13:02:34 2011 +0200

    Revert libdb++ removal.

diff --git a/debian/control b/debian/control
index 5d6f43e..7e36c9a 100644
--- a/debian/control
+++ b/debian/control
@@ -46,3 +46,29 @@ Description: Berkeley v4.8 Database Utilities
   - db4.8_upgrade: upgrades the version of files and the databases they
     contain.
   - db4.8_verify: check the structure of files and their databases.
+
+Package: libdb4.8++
+Architecture: any
+Depends: ${shlibs:Depends}
+Section: oldlibs
+Description: Berkeley v4.8 Database Libraries for C++ [runtime]
+ This is the runtime package for programs that use the Berkeley v4.8
+ database library.  This is only for programs which use the C++ interface.
+
+Package: libdb4.8++-dev
+Architecture: any
+Conflicts: libdb4.6++-dev, libdb4.7++-dev
+Section: libdevel
+Depends: libdb4.8++ (= ${binary:Version}), libdb4.8-dev (= ${binary:Version})
+Description: Berkeley v4.8 Database Libraries for C++ [development]
+ This is the development package which contains headers and static
+ libraries for the Berkeley v4.8 database library.  This is only for
+ programs which will use the C++ interface.
+
+Package: libdb4.8-dbg
+Architecture: any
+Section: debug
+Depends: libdb4.8 (= ${binary:Version})
+Description: Berkeley v4.8 Database Libraries [debug]
+ This package provides the debug symbols for the Berkeley v4.8 database
+ library.
diff --git a/debian/rules b/debian/rules
index 56319cc..67abda0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,22 +16,35 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 INSTALL_PROGRAM += -s
 endif
 
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+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)
 
-CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" 
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+        CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/tcl8.5" 
+	TCLDIR=/usr/lib/tcl8.5
+else
+        CONFIGURE_VARS = CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++ CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/$(DEB_HOST_GNU_TYPE)/include/tcl8.5"
+	TCLDIR=/usr/$(DEB_HOST_GNU_TYPE)/lib/tcl8.5
+endif
+
 CONFIGURE_SWITCHES =    --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--localstatedir=/var \
 			--sysconfdir=/etc \
 			--libexecdir=/usr/lib \
-			--disable-cxx \
+			--enable-cxx \
 			--enable-compat185 \
 			--with-tcl=/usr/lib \
 			--enable-tcl \
 			--enable-test
 
-DB_BINARY_PKGS = libdb4.8 libdb4.8-dev db4.8-util
+DB_BINARY_PKGS = libdb4.8 libdb4.8-dev libdb4.8++ libdb4.8++-dev db4.8-util libdb4.8-dbg
 
 ifeq (zx86_64-linux-gnuz,z$(DEB_HOST_GNU_TYPE)z)
 CONFIGURE_SWITCHES += --with-mutex=POSIX/pthreads/library
@@ -50,6 +63,11 @@ ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 CONFIGURE_VARS += STRIP=":"
 endif
 
+BROKEN_CPUS = zs390z
+VERY_BROKEN_CPUS = zm68kz zhppaz
+BROKEN_SYSTEMS = zgnuz
+VERY_BROKEN_SYSTEMS =
+
 package=db4.8
 bdbversion=4.8
 
@@ -89,41 +107,41 @@ install-stamp: build
 binary-arch: checkroot build install-stamp
 	$(checkdir)
 
-	rm -rf debian/lib$(package)-dev debian/$(package)-util debian/lib$(package)
+	rm -rf debian/lib$(package)-dev debian/$(package)-util debian/lib$(package) \
+		debian/lib$(package)++ debian/lib$(package)++-dev
 	$(INSTALL_DIR) debian/lib$(package)-dev/usr/lib \
 			debian/$(package)-util/usr/share/man/man1 \
-			debian/lib$(package)/usr/lib
+			debian/lib$(package)/usr/lib debian/lib$(package)++/usr/lib \
+			debian/lib$(package)++-dev/usr/include \
+			debian/lib$(package)++-dev/usr/lib \
+			debian/lib$(package)-dbg/usr/lib/debug/usr/lib
+
+	$(OBJCOPY) --only-keep-debug debian/tmp/usr/lib/libdb-$(bdbversion).so \
+                                  debian/lib$(package)-dbg/usr/lib/debug/usr/lib/libdb-$(bdbversion).so.debug
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	strip --remove-section=.note --remove-section=.comment \
+	$(STRIP) --remove-section=.note --remove-section=.comment \
 	      debian/tmp/usr/lib/*.so debian/tmp/usr/bin/*
-	strip --strip-debug debian/tmp/usr/lib/*.a
+	$(STRIP) --strip-debug debian/tmp/usr/lib/*.a
 endif
 
+	$(OBJCOPY) --add-gnu-debuglink=debian/lib$(package)-dbg/usr/lib/debug/usr/lib/libdb-$(bdbversion).so.debug \
+				debian/tmp/usr/lib/libdb-$(bdbversion).so
+
 	chmod 644 debian/tmp/usr/lib/*.so debian/tmp/usr/include/*.h
 	chmod 755 debian/tmp/usr/bin/*
 
-	rm -f debian/tmp/usr/include/db_cxx.h
 	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/*cxx* debian/lib$(package)++-dev/usr/lib
+	mv debian/lib$(package)-dev/usr/include/*cxx* debian/lib$(package)++-dev/usr/include
 	mv debian/lib$(package)-dev/usr/lib/libdb-$(bdbversion).so debian/lib$(package)/usr/lib
+	mv debian/lib$(package)++-dev/usr/lib/libdb_cxx-$(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 packages
-	#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
+	rm -f debian/lib$(package)-dev/usr/lib/libdb.a
+	ln -s libdb-$(bdbversion).a debian/lib$(package)-dev/usr/lib/libdb.a
 
 	cd debian/$(package)-util/usr/bin && for i in * ; \
 	 do mv $$i `echo $$i | sed 's/db/$(package)/'` ; \
@@ -140,6 +158,8 @@ endif
 	done
 
 	echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs
+	echo 'libdb_cxx $(bdbversion) lib$(package)++' >debian/lib$(package)++/DEBIAN/shlibs
+	$(INSTALL_SCRIPT) debian/lib++.postinst debian/lib$(package)++/DEBIAN/postinst
 	$(INSTALL_SCRIPT) debian/lib.postinst debian/lib$(package)/DEBIAN/postinst
 
 	for i in $(DB_BINARY_PKGS); \

-- 
Berkeley DB v4.7 Debian packaging

