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

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 8a6c9d91f2c005fb1267b5f7e5d18c3ef238f940
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jun 28 10:22:54 2011 +0200

    Remove libdb++ for good.
    
    This reverts commit cd779e0e0ac0637111d15f9af75471affa07eb72.
    
    Conflicts:
    
    	debian/control
    	debian/rules

diff --git a/debian/control b/debian/control
index c9dc2cb..c3d730c 100644
--- a/debian/control
+++ b/debian/control
@@ -43,19 +43,3 @@ 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}
-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
-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.
diff --git a/debian/rules b/debian/rules
index a7f694c..56319cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,35 +16,22 @@ 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 \
 			--with-tcl=/usr/lib \
 			--enable-tcl \
 			--enable-test
 
-DB_BINARY_PKGS = libdb4.8 libdb4.8-dev libdb4.8++ libdb4.8++-dev db4.8-util
+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
@@ -102,34 +89,41 @@ 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)/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
 
 	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
 
-	rm -f debian/lib$(package)-dev/usr/lib/libdb.a
-	ln -s libdb-$(bdbversion).a debian/lib$(package)-dev/usr/lib/libdb.a
+	# 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
 
 	cd debian/$(package)-util/usr/bin && for i in * ; \
 	 do mv $$i `echo $$i | sed 's/db/$(package)/'` ; \
@@ -146,8 +140,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