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

Ondřej Surý ondrej at sury.org
Tue May 3 14:36:48 UTC 2011 

The following commit has been merged in the debian-sid branch:
commit 609cd0bd708c125feb1c6d6cb37a30ea531f448d
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Apr 20 18:52:32 2011 +0200

    Remove java builds, they are broken on several platforms anyway

diff --git a/debian/control b/debian/control
index 843b1aa..11d7826 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,10 @@ Priority: standard
 Maintainer: Debian Berkeley DB Group <pkg-db-devel at lists.alioth.debian.org>
 Uploaders: Ondřej Surý <ondrej at debian.org>
 Standards-Version: 3.9.2
-Build-Depends: procps [!hurd-i386],
-	       default-jdk [!alpha !arm !avr32 !hppa !hurd-i386 !m32r],
-	       gcj-native-helper [!alpha !arm !avr32 !hppa !hurd-i386 !m32r]
+Build-Depends: procps [!hurd-i386]
 Homepage: http://www.oracle.com/technology/software/products/berkeley-db/index.html
 Vcs-Browser: http://git.debian.org/?p=pkg-db/db4.7.git;a=summary
-Vcs-Git: git://git.debian.org/git/pkg-db/db4.7/db.git
+Vcs-Git: git://git.debian.org/git/pkg-db/db4.7.git
 
 Package: libdb4.7-dev
 Architecture: any
@@ -51,43 +49,3 @@ Description: Berkeley v4.7 Database Utilities
   - db4.7_upgrade: upgrades the version of files and the databases they
     contain.
   - db4.7_verify: check the structure of files and their databases.
-
-Package: libdb4.7-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: libdb4.7 (= ${binary:Version})
-Description: Berkeley v4.7 Database Libraries [debug]
- This package provides the debug symbols for the Berkeley v4.7 database
- library.
-
-Package: libdb4.7-java
-Architecture: any
-Section: oldlibs
-Priority: optional
-Depends: ${shlibs:Depends}
-Recommends: libdb4.7-java-gcj
-Description: Berkeley v4.7 Database Libraries for Java
- This package provides the Java interface for the Berkeley v4.7 database
- library.
-
-Package: libdb4.7-java-gcj
-Architecture: any
-Section: oldlibs
-Priority: optional
-Depends: libdb4.7-java (= ${binary:Version}), libgcj-common (>> 1:4.1.1-13), ${shlibs:Depends}
-Description: Berkeley v4.7 Database Libraries for Java (native code)
- This package provides the Java interface for the Berkeley v4.7 database
- library.
- .
- This package contains the natively compiled code for use by gij.
-
-Package: libdb4.7-java-dev
-Architecture: any
-Section: libdevel
-Priority: optional
-Conflicts: libdb-java-dev, libdb4.6-java-dev
-Depends: ${shlibs:Depends}, libdb4.7-java (= ${binary:Version})
-Description: Berkeley v4.7 Database Libraries for Java [development]
- This package provides the Java interface for the Berkeley v4.7 database
- library.
diff --git a/debian/rules b/debian/rules
index 3a9e6ce..320a744 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,10 +24,6 @@ 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)
 
-JAVA_UNSUPPORTED_CPUS = zalphaz zarmz zavr32z zhppaz zm32rz
-JAVA_UNSUPPORTED_SYSTEMS = zgnuz zknetbsd-gnuz
--include /usr/share/gcj/debian_defaults
-
 CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" 
 CONFIGURE_SWITCHES =    --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
@@ -40,35 +36,12 @@ CONFIGURE_SWITCHES =    --prefix=/usr \
 			--disable-tcl \
 			--disable-test
 
-DB_BINARY_PKGS = libdb4.7 libdb4.7-dev db4.7-util libdb4.7-dbg
-
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
-JAVA_HOME = /usr/lib/jvm/default-java
-JAVA_BIN = $(JAVA_HOME)/bin
-CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-JAVACFLAGS = -source 1.5
-CONFIGURE_VARS += GCJ="$(JAVA_BIN)/gcj"
-CONFIGURE_VARS += JAVAC="$(JAVA_BIN)/javac"
-CONFIGURE_VARS += JAVA="$(JAVA_BIN)/java" JAR="$(JAVA_BIN)/jar"
-CONFIGURE_VARS += JAVACFLAGS="$(JAVACFLAGS)"
-CONFIGURE_SWITCHES += --enable-java
-DB_BINARY_PKGS += libdb4.7-java libdb4.7-java-dev
-ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
-DB_BINARY_PKGS += libdb4.7-java-gcj
-endif
-endif
-endif
+DB_BINARY_PKGS = libdb4.7 libdb4.7-dev db4.7-util
 
 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.7
 bdbversion=4.7
 
@@ -108,18 +81,10 @@ 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)-java debian/lib$(package)-java-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)-java/usr/lib \
-			debian/lib$(package)-java/usr/share/java \
-			debian/lib$(package)-java-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 \
@@ -127,9 +92,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	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/*
 
@@ -137,41 +99,6 @@ 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
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
-	cp -a debian/tmp/usr/lib/db.jar \
-		debian/lib$(package)-java/usr/share/java/lib$(package)-java-$(version).jar
-	ln -s lib$(package)-java-$(version).jar \
-		debian/lib$(package)-java/usr/share/java/lib$(package)-java.jar
-ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
-	mkdir debian/lib$(package)-java-gcj
-	(TMPFILE=$$(mktemp -t sourcelist.XXXXXXXXXX) && \
-	find $(CURDIR) -type f ! -type l >$$TMPFILE && \
-	aot-compile -L /usr/lib/gcj -c -fsource-filename=$$TMPFILE debian/lib$(package)-java debian/lib$(package)-java-gcj/usr/lib/gcj; \
-	retval=$?; \
-	rm -f $$TMPFILE; exit $$retval)
-	mkdir -p debian/lib$(package)-java-gcj/usr/share/gcj/classmap.d
-	mv debian/lib$(package)-java-gcj/usr/lib/gcj/*.db debian/lib$(package)-java-gcj/usr/share/gcj/classmap.d
-
-#	objcopy --only-keep-debug debian/lib$(package)-java-gcj/usr/lib/gcj/lib$(package)-java-$(version).jar.so
-#                                  debian/lib$(package)-dbg/usr/lib/debug/usr/lib/gcj/lib$(package)-java-$(version).jar.so.debug
-#
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	strip --strip-unneeded debian/lib$(package)-java-gcj/usr/lib/gcj/lib$(package)-java-$(version).jar.so
-endif
-endif
-endif
-endif
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
-	mv debian/lib$(package)-dev/usr/lib/*java* debian/lib$(package)-java/usr/lib
-
-	mv debian/lib$(package)-java/usr/lib/libdb*.a \
-	   debian/lib$(package)-java/usr/lib/libdb_java.so \
-	   debian/lib$(package)-java/usr/lib/libdb_java-4.so \
-	   debian/lib$(package)-java-dev/usr/lib/
-endif
-endif
 	mv debian/lib$(package)-dev/usr/lib/libdb-$(bdbversion).so debian/lib$(package)/usr/lib
 
 	rm -f debian/lib$(package)-dev/usr/lib/libdb.a
@@ -192,17 +119,6 @@ endif
 	done
 
 	echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
-	echo 'libdb_java $(bdbversion) lib$(package)-java' >debian/lib$(package)-java/DEBIAN/shlibs
-	$(INSTALL_SCRIPT) debian/libjava.postinst debian/lib$(package)-java/DEBIAN/postinst
-
-ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
-	$(INSTALL_SCRIPT) debian/java-gcj.postrm debian/lib$(package)-java-gcj/DEBIAN/postrm
-	$(INSTALL_SCRIPT) debian/java-gcj.postinst debian/lib$(package)-java-gcj/DEBIAN/postinst
-endif
-endif
-endif
 	$(INSTALL_SCRIPT) debian/lib.postinst debian/lib$(package)/DEBIAN/postinst
 
 	for i in $(DB_BINARY_PKGS); \

-- 
Berkeley DB v4.7 Debian packaging

More information about the pkg-db-commits mailing list