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

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 4600514c34fc550a0d6db396789a0270234e4d3a
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon May 2 12:31:54 2011 +0200

    Synchronize db4.7 and db4.8 rules after removing libdb4.8++* and libdb4.8-dbg, but keep -ldb

diff --git a/debian/rules b/debian/rules
index e2bf2f4..7bdb3e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,34 +16,21 @@ 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)
 
-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_VARS = CC=gcc CFLAGS="$(CFLAGS)" 
 CONFIGURE_SWITCHES =    --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--localstatedir=/var \
 			--sysconfdir=/etc \
 			--libexecdir=/usr/lib \
-			--enable-cxx \
+			--disable-cxx \
 			--enable-compat185 \
 			--disable-tcl \
 			--disable-test
 
-DB_BINARY_PKGS = libdb4.8 libdb4.8-dev libdb4.8++ libdb4.8++-dev db4.8-util libdb4.8-dbg
+DB_BINARY_PKGS = libdb4.8 libdb4.8-dev db4.8-util
 
 ifeq (zx86_64-linux-gnuz,z$(DEB_HOST_GNU_TYPE)z)
 CONFIGURE_SWITCHES += --with-mutex=POSIX/pthreads/library
@@ -62,11 +49,6 @@ 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
 
@@ -106,27 +88,17 @@ install-stamp: build
 binary-arch: checkroot build install-stamp
 	$(checkdir)
 
-	rm -rf debian/lib$(package)-dev debian/$(package)-util debian/lib$(package) \
-		debian/lib$(package)++ debian/lib$(package)++-dev
+	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 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
+			debian/lib$(package)/usr/lib
 
 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/*
 
@@ -134,13 +106,19 @@ endif
 	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
 
-	rm -f debian/lib$(package)-dev/usr/lib/libdb.a
-	ln -s libdb-$(bdbversion).a debian/lib$(package)-dev/usr/lib/libdb.a
+	# 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
 
 	cd debian/$(package)-util/usr/bin && for i in * ; \
 	 do mv $$i `echo $$i | sed 's/db/$(package)/'` ; \
@@ -157,8 +135,6 @@ 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