[pkg-db-commits] [db] 01/02: Add myself to uploaders. Apply changes from Ubuntu packaging.

Thu Aug 15 12:43:40 UTC 2013

This is an automated email from the git hooks/post-receive script.

xnox pushed a commit to branch debian-sid
in repository db.

commit 0b3c624d7f03110f3be3dca9d233d80eaf5ad721
Author: Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>
Date:   Thu Aug 15 13:30:04 2013 +0100

    Add myself to uploaders. Apply changes from Ubuntu packaging.
    
    * Add myself to uploaders.
    
    Apply changes from Ubuntu packaging:
    * debian/patches/link-sql-libs: Add new patch to fix FTBFS due to
      missing -ldl link on libdb_sql-5.1.
    * Search for tcl in the multiarch location, conditionally.
    * Enable historic dbm interface. Thanks Wookey. (LP: #1126392)
    * Cross building fixes (LP: #1105368):
      - do not run tests when crossbuilding, when nocheck is enabled or stage1.
      - do not check db_signature in stage1 build.
      - comment that tcl:native is needed for cross-builds.
    * Really clean the build directory.
    * Use the autotools-dev dh addon, so that we update all the
      config.guess/config.sub copies rather than just the one in dist/.
    * Introduce a stage1 build to skip the java and the tcl bindings.
---
 debian/build_signature_amd64.txt       |    1 +
 debian/changelog                       |   20 ++++++++++
 debian/control                         |    7 +++-
 debian/patches/007-link-sql-libs.patch |   15 ++++++++
 debian/patches/series                  |    1 +
 debian/rules                           |   63 ++++++++++++++++++++++++++++----
 6 files changed, 99 insertions(+), 8 deletions(-)

diff --git a/debian/build_signature_amd64.txt b/debian/build_signature_amd64.txt
new file mode 100644
index 0000000..3c5ce87
--- /dev/null
+++ b/debian/build_signature_amd64.txt
@@ -0,0 +1 @@
+7e5b311c
diff --git a/debian/changelog b/debian/changelog
index a76a770..8140a82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+db (5.1.29-7) UNRELEASED; urgency=low
+
+  * Add myself to uploaders.
+  
+  Apply changes from Ubuntu packaging:
+  * debian/patches/link-sql-libs: Add new patch to fix FTBFS due to
+    missing -ldl link on libdb_sql-5.1.
+  * Search for tcl in the multiarch location, conditionally.
+  * Enable historic dbm interface. Thanks Wookey. (LP: #1126392)
+  * Cross building fixes (LP: #1105368):
+    - do not run tests when crossbuilding, when nocheck is enabled or stage1.
+    - do not check db_signature in stage1 build.
+    - comment that tcl:native is needed for cross-builds.
+  * Really clean the build directory.
+  * Use the autotools-dev dh addon, so that we update all the
+    config.guess/config.sub copies rather than just the one in dist/.
+  * Introduce a stage1 build to skip the java and the tcl bindings.
+
+ -- Dmitrijs Ledkovs <xnox at debian.org>  Thu, 15 Aug 2013 12:47:21 +0100
+
 db (5.1.29-6) unstable; urgency=low
 
   * Ensure that backwards compatible Java bytecode is built (Closes: #688138)
diff --git a/debian/control b/debian/control
index 2d20092..893da9d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,14 @@ Source: db
 Section: libs
 Priority: standard
 Maintainer: Debian Berkeley DB Group <pkg-db-devel at lists.alioth.debian.org>
-Uploaders: Ondřej Surý <ondrej at debian.org>
+Uploaders: Ondřej Surý <ondrej at debian.org>, Dmitrijs Ledkovs <xnox at debian.org>
 Standards-Version: 3.9.3
+# For cross building one also needs tcl8.4:native (ie. such that it
+# can be executed to pre-process sqlite3 components).
+# For DEB_STAGE=stage1 build tcl-dev, javahelper, default-jdk,
+# gcj-native-helper can be dropped
 Build-Depends: debhelper (>= 9),
+	       autotools-dev (>= 20100122.1),
 	       tcl-dev,
 	       procps [!hurd-i386],
 	       javahelper,
diff --git a/debian/patches/007-link-sql-libs.patch b/debian/patches/007-link-sql-libs.patch
new file mode 100644
index 0000000..72bb5be
--- /dev/null
+++ b/debian/patches/007-link-sql-libs.patch
@@ -0,0 +1,15 @@
+Description: Link libdb_sql-5.3 with the right libraries.
+Author: Iain Lane <iain.lane at canonical.com>
+Bug-Upstream: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=712262
+
+--- db5.3-5.3.21.orig/dist/Makefile.in
++++ db5.3-5.3.21/dist/Makefile.in
+@@ -897,7 +897,7 @@ $(libsql_version): $(SQL_OBJS)
+ 
+ # Shared SQL library.
+ $(libsqlso_target): $(SQL_OBJS)
+-	$(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(SQL_OBJS) $(LIBCSO_LIBS)
++	$(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(SQL_OBJS) $(LIBCSO_LIBS) @SQL_LIBS@
+ 	$(RM) $(libsql)
+ 	$(LN) -s .libs/$(libsql_version) $(libsql)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 05e17ec..9f84092 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 004-tclsleep.patch
 005-pg_crypt_size.patch
 006-mutex_alignment.patch
+007-link-sql-libs.patch
diff --git a/debian/rules b/debian/rules
index ed30026..6d187e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,15 +32,23 @@ GCJ_BROKEN_ARCHS = ia64 sparc mips sh4
 GCJ_NATIVE_ARCHS = $(filter-out $(GCJ_BROKEN_ARCHS), $(gcj_native_archs))
 
 ENABLE_JAVA=no
-ENABLE_GJ=no
+ENABLE_GCJ=no
 
 ifeq (,$(filter $(DEB_HOST_ARCH), $(JAVA_BROKEN_ARCHS)))
-ENABLE_JAVA=yes
+  ENABLE_JAVA=yes
 ifneq (,$(filter $(DEB_HOST_ARCH), $(GCJ_NATIVE_ARCHS)))
-ENABLE_GCJ=yes
+  ENABLE_GCJ=yes
 endif
 endif
 
+ifeq ($(DEB_STAGE),stage1)
+  ENABLE_JAVA=no
+  ENABLE_GCJ=no
+  ENABLE_TCL=no
+else
+  ENABLE_TCL=yes
+endif
+
 CONFIGURE_SWITCHES =    --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--localstatedir=/var \
@@ -50,9 +58,36 @@ CONFIGURE_SWITCHES =    --prefix=/usr \
 			--enable-compat185 \
 			--enable-sql \
 			--enable-stl \
-			--enable-tcl \
-			--with-tcl=/usr/lib \
-			--enable-test
+			--enable-dbm \
+			--prefix=/usr
+
+ifeq ($(ENABLE_TCL),yes)
+  ENABLE_TESTS=yes
+  CONFIGURE_SWITCHES += --enable-tcl
+ifneq (,$(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/tcl*))
+  CONFIGURE_SWITCHES += --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)
+else
+  CONFIGURE_SWITCHES += --with-tcl=/usr/lib
+endif
+else
+  ENABLE_TESTS=no
+  CONFIGURE_SWITCHES += --disable-tcl
+  DH_OPTIONS += -Nlibdb5.1-tcl
+endif
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+  ENABLE_TESTS=no
+endif
+
+ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+  ENABLE_TESTS=no
+endif
+
+ifeq ($(ENABLE_TESTS),yes)
+  CONFIGURE_SWITCHES += --enable-test
+else
+  CONFIGURE_SWITCHES += --disable-test
+endif
 
 ifeq (zx86_64-linux-gnuz,z$(DEB_HOST_GNU_TYPE)z)
 CONFIGURE_SWITCHES += --with-mutex=POSIX/pthreads/library
@@ -76,6 +111,11 @@ ifeq (no,$(ENABLE_GCJ))
 DH_OPTIONS += -Nlibdb5.1-java-gcj
 endif
 
+ifeq (no,$(ENABLE_SQL))
+DH_OPTIONS += -Nlibdb5.1-sql
+  CONFIGURE_SWITCHES += --disable-sql
+endif
+
 
 BROKEN_CPUS = zs390z
 VERY_BROKEN_CPUS = zm68kz zhppaz
@@ -91,7 +131,7 @@ version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
 version_major=$(shell expr `pwd` : '.*-\([0-9]*\).[0-9.]*')
 
 %:
-	dh $@ $(DH_PLUGINS)
+	dh $@ --with=autotools-dev $(DH_PLUGINS)
 
 override_dh_auto_configure:
 	JAVACFLAGS="$(JAVACFLAGS)" dh_auto_configure -Ddist -Bbuild -- $(CONFIGURE_SWITCHES)
@@ -134,6 +174,8 @@ override_dh_auto_install:
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a
 	ln -s libdb-$(bdbversion).a $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdb.a
 
+# only works for the native build
+ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
 # Compare built-in signature and fail build if it is different
 	cc -o$(CURDIR)/debian/db_signature \
 	   -I$(CURDIR)/debian/tmp/usr/include \
@@ -144,11 +186,14 @@ override_dh_auto_install:
 
 	echo -n "Berkeley DB signature is:"; $(CURDIR)/debian/db_signature
 
+ifneq ($(DEB_STAGE),stage1)
 	if [ -f $(CURDIR)/debian/saved_signature_$(DEB_HOST_ARCH).txt ]; then \
 	    cmp $(CURDIR)/debian/saved_signature_$(DEB_HOST_ARCH).txt         \
 	        $(CURDIR)/debian/build_signature_$(DEB_HOST_ARCH).txt         \
 	    || ( echo "Region environment signatures differ."; exit 1; );     \
 	fi
+endif
+endif
 
 	mv $(CURDIR)/debian/tmp/usr/bin/dbsql $(CURDIR)/debian/tmp/usr/bin/db_sql
 	rm -f $(CURDIR)/debian/tmp/usr/bin/sqlite3
@@ -159,7 +204,9 @@ override_dh_auto_install:
 
 override_dh_install:
 	dh_install -a -Xusr/doc --list-missing
+ifeq ($(ENABLE_TCL),yes)
 	tcltk-depends
+endif
 
 override_dh_installdocs:
 	dh_installdocs -pdb5.1-doc
@@ -169,6 +216,8 @@ override_dh_strip:
 	dh_strip -s --dbg-package=libdb5.1-dbg
 
 override_dh_clean:
+	rm -rf build
+	rm -f $(CURDIR)/debian/db_signature
 	DH_OPTIONS="" dh_clean
 
 override_jh_build:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-db/db.git

