[pkg-db-commits] [db] 01/04: Build only db5.1-util as a final phase of db5.1->db5.3 transition
Ondrej Sury
ondrej at moszumanska.debian.org
Thu Jul 31 09:14:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
ondrej pushed a commit to branch debian-sid
in repository db.
commit 1ed84a78a6c3d20a4d71153f2aff2b143eed29af
Author: Ondřej Surý <ondrej at sury.org>
Date: Wed Feb 19 14:29:42 2014 +0100
Build only db5.1-util as a final phase of db5.1->db5.3 transition
---
debian/control | 198 +----------------------------
debian/db5.1-doc.docs | 1 -
debian/db5.1-sql-util.dirs | 2 -
debian/db5.1-sql-util.install | 1 -
debian/db5.1-util.install | 1 +
debian/libdb5.1++-dev.dirs | 2 -
debian/libdb5.1++-dev.install | 3 -
debian/libdb5.1++.dirs | 1 -
debian/libdb5.1++.install | 1 -
debian/libdb5.1++.lintian-overrides | 2 -
debian/libdb5.1-dev.dirs | 2 -
debian/libdb5.1-dev.install | 4 -
debian/libdb5.1-java-dev.dirs | 1 -
debian/libdb5.1-java-dev.install | 2 -
debian/libdb5.1-java-gcj.dirs | 2 -
debian/libdb5.1-java-jni.dirs | 1 -
debian/libdb5.1-java-jni.install | 1 -
debian/libdb5.1-java-jni.lintian-overrides | 2 -
debian/libdb5.1-java.dirs | 1 -
debian/libdb5.1-java.jlibs | 1 -
debian/libdb5.1-sql-dev.dirs | 2 -
debian/libdb5.1-sql-dev.install | 3 -
debian/libdb5.1-sql.dirs | 1 -
debian/libdb5.1-sql.install | 1 -
debian/libdb5.1-sql.lintian-overrides | 4 -
debian/libdb5.1-stl-dev.dirs | 2 -
debian/libdb5.1-stl-dev.install | 3 -
debian/libdb5.1-stl.dirs | 1 -
debian/libdb5.1-stl.install | 1 -
debian/libdb5.1-stl.lintian-overrides | 2 -
debian/libdb5.1-tcl.dirs | 1 -
debian/libdb5.1-tcl.install | 1 -
debian/libdb5.1-tcl.lintian-overrides | 2 -
debian/libdb5.1.dirs | 1 -
debian/libdb5.1.docs | 1 -
debian/libdb5.1.install | 1 -
debian/libdb5.1.lintian-overrides | 2 -
debian/rules | 125 +-----------------
debian/runtests.tclsh | 56 --------
39 files changed, 8 insertions(+), 431 deletions(-)
diff --git a/debian/control b/debian/control
index 893da9d..2580b3b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,54 +3,15 @@ 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>, 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
+Standards-Version: 3.9.5
Build-Depends: debhelper (>= 9),
autotools-dev (>= 20100122.1),
tcl-dev,
- procps [!hurd-i386],
- javahelper,
- default-jdk,
- gcj-native-helper
+ procps [!hurd-i386]
Homepage: http://www.oracle.com/technology/software/products/berkeley-db/index.html
Vcs-Browser: http://git.debian.org/?p=pkg-db/db.git
Vcs-Git: git://git.debian.org/pkg-db/db.git
-Package: db5.1-doc
-Architecture: all
-Section: doc
-Priority: optional
-Depends: ${misc:Depends}
-Description: Berkeley v5.1 Database Documentation [html]
- This package contains documentation in HTML format for all of
- the APIs (C, C++, C#, STL, Java, Tcl) and utilities provided
- by version 5.1 of Berkeley DB.
-
-Package: libdb5.1-dev
-Architecture: any
-Section: libdevel
-Priority: extra
-Depends: libdb5.1 (= ${binary:Version}),
- ${misc:Depends}
-Suggests: db5.1-doc
-Conflicts: libdb4.6-dev, libdb4.7-dev, libdb4.8-dev
-Description: Berkeley v5.1 Database Libraries [development]
- This is the development package which contains headers and static
- libraries for the Berkeley v5.1 database library.
-
-Package: libdb5.1
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Berkeley v5.1 Database Libraries [runtime]
- This is the runtime package for programs that use the v5.1 Berkeley
- database library.
-
Package: db5.1-util
Architecture: any
Section: database
@@ -74,158 +35,3 @@ Description: Berkeley v5.1 Database Utilities
- db5.1_upgrade: upgrades the version of files and the databases they
contain.
- db5.1_verify: check the structure of files and their databases.
-
-Package: db5.1-sql-util
-Architecture: any
-Section: database
-Priority: extra
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Berkeley v5.1 SQL Database Utilities
- This package provides different tools for manipulating databases
- in the Berkeley v5.1 SQL database format, and includes:
- - db5.1_sql: sqlite3 compatible command-line utility
-
-Package: libdb5.1++
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Priority: optional
-Description: Berkeley v5.1 Database Libraries for C++ [runtime]
- This is the runtime package for programs that use the Berkeley v5.1
- database library. This is only for programs which use the C++ interface.
-
-Package: libdb5.1++-dev
-Architecture: any
-Section: libdevel
-Priority: extra
-Depends: libdb5.1++ (= ${binary:Version}),
- libdb5.1-dev (= ${binary:Version}),
- ${misc:Depends}
-Conflicts: libdb4.6++-dev, libdb4.7++-dev, libdb4.8++-dev
-Description: Berkeley v5.1 Database Libraries for C++ [development]
- This is the development package which contains headers and static
- libraries for the Berkeley v5.1 database library. This is only for
- programs which will use the C++ interface.
-
-Package: libdb5.1-tcl
-Architecture: any
-Section: interpreters
-Priority: extra
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libdb4.6-tcl, libdb4.7-tcl, libdb4.8-tcl
-Depends: ${tcl:Depends},
- ${shlibs:Depends},
- ${misc:Depends}
-Description: Berkeley v5.1 Database Libraries for Tcl [module]
- This package provides a Tcl module suitable for accessing Berkeley v5.1
- databases from within Tcl programs.
-
-Package: libdb5.1-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: libdb5.1 (= ${binary:Version}),
- ${misc:Depends}
-Multi-Arch: same
-Description: Berkeley v5.1 Database Libraries [debug]
- This package provides the debug symbols for the Berkeley v5.1 database
- libraries and binaries.
-
-Package: libdb5.1-java-jni
-Architecture: any
-Section: java
-Priority: optional
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Breaks: libdb5.1-java (<< ${source:Version})
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Berkeley v5.1 Database Libraries for Java
- This package provides the Java interface for the Berkeley v5.1 database
- library.
-
-Package: libdb5.1-java
-Architecture: all
-Section: java
-Priority: optional
-Depends: libdb5.1-java-jni (>= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Suggests: libdb5.1-java-gcj
-Description: Berkeley v5.1 Database Libraries for Java
- This package provides the Java interface for the Berkeley v5.1 database
- library.
-
-Package: libdb5.1-java-gcj
-Architecture: any
-Section: java
-Priority: optional
-Depends: libdb5.1-java (= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Description: Berkeley v5.1 Database Libraries for Java (native code)
- This package provides the Java interface for the Berkeley v5.1 database
- library.
- .
- This package contains the natively compiled code for use by gij.
-
-Package: libdb5.1-java-dev
-Architecture: any
-Section: libdevel
-Priority: optional
-Depends: libdb5.1-java (= ${source:Version}),
- ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: libdb4.6-java-dev, libdb4.7-java-dev, libdb4.8-java-dev
-Description: Berkeley v5.1 Database Libraries for Java [development]
- This package provides the Java interface for the Berkeley v5.1 database
- library.
-
-Package: libdb5.1-sql-dev
-Architecture: any
-Section: libdevel
-Priority: extra
-Depends: libdb5.1-sql (= ${binary:Version}),
- ${misc:Depends}
-Suggests: db5.1-doc
-Description: Berkeley v5.1 Database Libraries [SQL development]
- This is the development package which contains headers and static
- libraries for the Berkeley v5.1 database library.
-
-Package: libdb5.1-sql
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Berkeley v5.1 Database Libraries [SQL runtime]
- This is the runtime package for programs that use the v5.1 Berkeley
- database SQL library.
-
-Package: libdb5.1-stl-dev
-Architecture: any
-Section: libdevel
-Priority: extra
-Depends: libdb5.1-stl (= ${binary:Version}),
- ${misc:Depends}
-Suggests: db5.1-doc
-Description: Berkeley v5.1 Database Libraries [STL development]
- This is the development package which contains headers and static
- libraries for the Berkeley v5.1 database library.
-
-Package: libdb5.1-stl
-Architecture: any
-Priority: extra
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: Berkeley v5.1 Database Libraries [STL runtime]
- This is the runtime package for programs that use the v5.1 Berkeley
- database STL library.
diff --git a/debian/db5.1-doc.docs b/debian/db5.1-doc.docs
deleted file mode 100644
index 350dde5..0000000
--- a/debian/db5.1-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/docs/*
diff --git a/debian/db5.1-sql-util.dirs b/debian/db5.1-sql-util.dirs
deleted file mode 100644
index 98d1583..0000000
--- a/debian/db5.1-sql-util.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff --git a/debian/db5.1-sql-util.install b/debian/db5.1-sql-util.install
deleted file mode 100644
index eec6063..0000000
--- a/debian/db5.1-sql-util.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/db5.1_sql
diff --git a/debian/db5.1-util.install b/debian/db5.1-util.install
index 55e09fb..0e241e8 100644
--- a/debian/db5.1-util.install
+++ b/debian/db5.1-util.install
@@ -11,3 +11,4 @@ usr/bin/db5.1_replicate
usr/bin/db5.1_stat
usr/bin/db5.1_upgrade
usr/bin/db5.1_verify
+usr/lib/*/libdb-*.so
diff --git a/debian/libdb5.1++-dev.dirs b/debian/libdb5.1++-dev.dirs
deleted file mode 100644
index da07fdd..0000000
--- a/debian/libdb5.1++-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include
-usr/lib
diff --git a/debian/libdb5.1++-dev.install b/debian/libdb5.1++-dev.install
deleted file mode 100644
index 178a58d..0000000
--- a/debian/libdb5.1++-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/db_cxx.h
-usr/lib/*/libdb_cxx-*.a
-usr/lib/*/libdb_cxx.*
diff --git a/debian/libdb5.1++.dirs b/debian/libdb5.1++.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libdb5.1++.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libdb5.1++.install b/debian/libdb5.1++.install
deleted file mode 100644
index 9b057ab..0000000
--- a/debian/libdb5.1++.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdb_cxx-*.so
diff --git a/debian/libdb5.1++.lintian-overrides b/debian/libdb5.1++.lintian-overrides
deleted file mode 100644
index 2d9136e..0000000
--- a/debian/libdb5.1++.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# historical reasons
-libdb5.1++: package-name-doesnt-match-sonames libdb-cxx-5.1
\ No newline at end of file
diff --git a/debian/libdb5.1-dev.dirs b/debian/libdb5.1-dev.dirs
deleted file mode 100644
index da07fdd..0000000
--- a/debian/libdb5.1-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include
-usr/lib
diff --git a/debian/libdb5.1-dev.install b/debian/libdb5.1-dev.install
deleted file mode 100644
index e11220e..0000000
--- a/debian/libdb5.1-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/db.h
-usr/include/db_185.h
-usr/lib/*/libdb-*.a
-usr/lib/*/libdb.*
diff --git a/debian/libdb5.1-java-dev.dirs b/debian/libdb5.1-java-dev.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libdb5.1-java-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libdb5.1-java-dev.install b/debian/libdb5.1-java-dev.install
deleted file mode 100644
index a979703..0000000
--- a/debian/libdb5.1-java-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libdb_java-*.a
-usr/lib/*/libdb_java.*
diff --git a/debian/libdb5.1-java-gcj.dirs b/debian/libdb5.1-java-gcj.dirs
deleted file mode 100644
index 38c8e1b..0000000
--- a/debian/libdb5.1-java-gcj.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/gcj
-usr/share/gcj
diff --git a/debian/libdb5.1-java-jni.dirs b/debian/libdb5.1-java-jni.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libdb5.1-java-jni.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libdb5.1-java-jni.install b/debian/libdb5.1-java-jni.install
deleted file mode 100644
index ba00d13..0000000
--- a/debian/libdb5.1-java-jni.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdb_java-5.1*.so
diff --git a/debian/libdb5.1-java-jni.lintian-overrides b/debian/libdb5.1-java-jni.lintian-overrides
deleted file mode 100644
index fc75418..0000000
--- a/debian/libdb5.1-java-jni.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# historical reasons
-libdb5.1-java-jni: package-name-doesnt-match-sonames libdb-java-5.1
diff --git a/debian/libdb5.1-java.dirs b/debian/libdb5.1-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/libdb5.1-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libdb5.1-java.jlibs b/debian/libdb5.1-java.jlibs
deleted file mode 100644
index dadcc35..0000000
--- a/debian/libdb5.1-java.jlibs
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/*/db.jar
diff --git a/debian/libdb5.1-sql-dev.dirs b/debian/libdb5.1-sql-dev.dirs
deleted file mode 100644
index da07fdd..0000000
--- a/debian/libdb5.1-sql-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include
-usr/lib
diff --git a/debian/libdb5.1-sql-dev.install b/debian/libdb5.1-sql-dev.install
deleted file mode 100644
index 0b4f78e..0000000
--- a/debian/libdb5.1-sql-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/dbsql.h
-usr/lib/*/libdb_sql-*.a
-usr/lib/*/libdb_sql.*
diff --git a/debian/libdb5.1-sql.dirs b/debian/libdb5.1-sql.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libdb5.1-sql.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libdb5.1-sql.install b/debian/libdb5.1-sql.install
deleted file mode 100644
index 27d1034..0000000
--- a/debian/libdb5.1-sql.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdb_sql-*.so
diff --git a/debian/libdb5.1-sql.lintian-overrides b/debian/libdb5.1-sql.lintian-overrides
deleted file mode 100644
index e555242..0000000
--- a/debian/libdb5.1-sql.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# historical reasons
-libdb5.1-sql: package-name-doesnt-match-sonames libdb-sql-5.1
-# not true, libdb5.1-sql provides sqlite3 ABI
-libdb5.1-sql: embedded-library * sqlite
diff --git a/debian/libdb5.1-stl-dev.dirs b/debian/libdb5.1-stl-dev.dirs
deleted file mode 100644
index da07fdd..0000000
--- a/debian/libdb5.1-stl-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include
-usr/lib
diff --git a/debian/libdb5.1-stl-dev.install b/debian/libdb5.1-stl-dev.install
deleted file mode 100644
index 3677f86..0000000
--- a/debian/libdb5.1-stl-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/dbstl*.h
-usr/lib/*/libdb_stl-*.a
-usr/lib/*/libdb_stl.*
diff --git a/debian/libdb5.1-stl.dirs b/debian/libdb5.1-stl.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libdb5.1-stl.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libdb5.1-stl.install b/debian/libdb5.1-stl.install
deleted file mode 100644
index 6ad6d55..0000000
--- a/debian/libdb5.1-stl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdb_stl-*.so
diff --git a/debian/libdb5.1-stl.lintian-overrides b/debian/libdb5.1-stl.lintian-overrides
deleted file mode 100644
index bc9ba1f..0000000
--- a/debian/libdb5.1-stl.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# historical reasons
-libdb5.1-stl: package-name-doesnt-match-sonames libdb-stl-5.1
\ No newline at end of file
diff --git a/debian/libdb5.1-tcl.dirs b/debian/libdb5.1-tcl.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libdb5.1-tcl.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libdb5.1-tcl.install b/debian/libdb5.1-tcl.install
deleted file mode 100644
index 904aabb..0000000
--- a/debian/libdb5.1-tcl.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdb_tcl*
diff --git a/debian/libdb5.1-tcl.lintian-overrides b/debian/libdb5.1-tcl.lintian-overrides
deleted file mode 100644
index 81ed531..0000000
--- a/debian/libdb5.1-tcl.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# historical reasons
-libdb5.1-tcl: package-name-doesnt-match-sonames libdb-tcl-5.1
diff --git a/debian/libdb5.1.dirs b/debian/libdb5.1.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libdb5.1.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libdb5.1.docs b/debian/libdb5.1.docs
deleted file mode 100644
index 178fc03..0000000
--- a/debian/libdb5.1.docs
+++ /dev/null
@@ -1 +0,0 @@
-debian/build_signature*.txt
diff --git a/debian/libdb5.1.install b/debian/libdb5.1.install
deleted file mode 100644
index 9634660..0000000
--- a/debian/libdb5.1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libdb-*.so
diff --git a/debian/libdb5.1.lintian-overrides b/debian/libdb5.1.lintian-overrides
deleted file mode 100644
index 97fead0..0000000
--- a/debian/libdb5.1.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# historical reasons
-libdb5.1: package-name-doesnt-match-sonames libdb-5.1
diff --git a/debian/rules b/debian/rules
index 6d187e4..8177644 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,83 +11,27 @@ export DH_VERBOSE=1
export DH_ALWAYS_EXCLUDE=.arch-ids
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)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-# Don't try to build this file if missing
-/usr/share/gcj/debian_defaults /usr/share/javahelper/java-vars.mk:
- :
-
--include /usr/share/gcj/debian_defaults
--include /usr/share/javahelper/java-vars.mk
-
-JAVA_BROKEN_ARCHS =
-GCJ_BROKEN_ARCHS = ia64 sparc mips sh4
-GCJ_NATIVE_ARCHS = $(filter-out $(GCJ_BROKEN_ARCHS), $(gcj_native_archs))
-
-ENABLE_JAVA=no
-ENABLE_GCJ=no
-
-ifeq (,$(filter $(DEB_HOST_ARCH), $(JAVA_BROKEN_ARCHS)))
- ENABLE_JAVA=yes
-ifneq (,$(filter $(DEB_HOST_ARCH), $(GCJ_NATIVE_ARCHS)))
- 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 \
--sysconfdir=/etc \
--libexecdir=/usr/lib \
- --enable-cxx \
+ --disable-cxx \
--enable-compat185 \
- --enable-sql \
- --enable-stl \
--enable-dbm \
+ --enable-tcl \
+ --enable-test \
--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
@@ -96,27 +40,6 @@ ifeq (zavr32-linux-gnuz,z$(DEB_HOST_GNU_TYPE)z)
CONFIGURE_SWITCHES += --enable-posixmutexes
endif
-ifeq (yes,$(ENABLE_JAVA))
-JAVACFLAGS=-source 1.5 -target 1.5
-JAVA_HOME ?= /usr/lib/jvm/default-java
-CFLAGS += -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-CONFIGURE_SWITCHES += --enable-java
-DH_PLUGINS += --with=javahelper
-else
-CONFIGURE_SWITCHES += --disable-java
-DH_OPTIONS += -Nlibdb5.1-java -Nlibdb5.1-java-dev -Nlibdb5.1-java-gcj -Nlibdb5.1-java-jni
-endif
-
-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
BROKEN_SYSTEMS = zgnuz
@@ -144,23 +67,7 @@ override_dh_auto_clean:
rm -f $(CURDIR)/debian/build_signature.txt
override_dh_auto_test:
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(VERY_BROKEN_CPUS))$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(VERY_BROKEN_SYSTEMS)))
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
- chmod +x ./debian/runtests.tclsh
- cd build && ../debian/runtests.tclsh || true
-
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(BROKEN_CPUS))$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(BROKEN_SYSTEMS)))
- ! grep ^FAIL build/ALL.OUT
-else
-# Testsuite failures are marked as non-fatal on $(DEB_BUILD_GNU_SYSTEM)-$(DEB_BUILD_GNU_CPU)
- grep ^FAIL build/ALL.OUT || true
-endif
-else
-# Testsuite has been disabled by DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS)
-endif
-else
-# Testsuite has been disabled on $(DEB_BUILD_GNU_SYSTEM)-$(DEB_BUILD_GNU_CPU)
-endif
+ :
override_dh_auto_install:
dh_auto_install -Ddist -Bbuild
@@ -186,16 +93,14 @@ ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
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 $(CURDIR)/debian/tmp/usr/bin/dbsql
rm -f $(CURDIR)/debian/tmp/usr/bin/sqlite3
for i in $(CURDIR)/debian/tmp/usr/bin/db_*; do \
@@ -204,29 +109,9 @@ endif
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
- dh_installdocs --remaining-packages --link-doc=libdb5.1
-
-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:
- jh_build --javacopts='-target 1.5' --javacopts='-source 1.5'
-
-override_jh_installlibs:
-ifeq (yes,$(ENABLE_JAVA))
- jh_installlibs
-endif
-ifeq (yes,$(ENABLE_GCJ))
- dh_nativejava
-endif
diff --git a/debian/runtests.tclsh b/debian/runtests.tclsh
deleted file mode 100644
index 592e892..0000000
--- a/debian/runtests.tclsh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/tclsh
-
-source ../test/test.tcl
-#run_std
-
-global one_test
-source ../test/include.tcl
-
-set one_test "ALL"
-set display 1
-set run 1
-
-fileremove -f ALL.OUT
-
-set o [open ALL.OUT a]
-puts -nonewline "Modified test suite run started at: "
-puts [clock format [clock seconds] -format "%H:%M %D"]
-puts [berkdb version -string]
-
-puts -nonewline $o "Modified test suite run started at: "
-puts $o [clock format [clock seconds] -format "%H:%M %D"]
-puts $o [berkdb version -string]
-
-close $o
-
- set test_list {
- {"environment" "env"}
- {"archive" "archive"}
- {"backup" "backup"}
- {"locking" "lock"}
- {"logging" "log"}
- {"memory pool" "memp"}
- {"transaction" "txn"}
- {"byte-order" "byte"}
- {"recno backing file" "rsrc"}
- {"DBM interface" "dbm"}
- {"NDBM interface" "ndbm"}
- {"Hsearch interface" "hsearch"}
- }
-#{"file operations" "fop"}
-#{"deadlock detection" "dead"}
-#{"subdatabase" "sdb"}
-#{"secondary index" "sindex"}
-
-foreach pair $test_list {
- set msg [lindex $pair 0]
-set cmd [lindex $pair 1]
-puts "Running $msg tests ([clock format [clock seconds] -format "%H:%M:%S"])"
-if [catch {exec /usr/bin/tclsh << \
- "source ../test/test.tcl; r $cmd" \
- >>& ALL.OUT } res] {
- set o [open ALL.OUT a]
- puts $o "FAIL: $cmd test: $res"
- close $o
-}
-}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-db/db.git
More information about the pkg-db-commits
mailing list