* Add python-tdb-dbg and libtdb1-dbg packages.

* Bump standards version to 3.9.2.

diff --git a/debian/changelog b/debian/changelog
index f007cc0362e9f4f3e2b28fafe936d90cd7925ced..007622cdd7e9e954e5863c52c88eb0c01d19da9d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 tdb (1.2.9-2) UNRELEASED; urgency=low
 
+  * Add python-tdb-dbg and libtdb1-dbg packages.
+  * Bump standards version to 3.9.2.
   * Use --disable-rpath-install only, simplifies testsuite running.
   * Switch to dh_python2. Closes: #617120
 

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..45a4fb75db864000d01701c0f7a51864bd4daabf 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8

diff --git a/debian/control b/debian/control
index 5f3a59ad94415ffa87bf5ffa3f2d9027cc8e0486..114fc6ab617e47fe2f9e4b863e40008c4861d825 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,22 @@ Source: tdb
 Section: devel
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer@debian.org>
-Build-Depends: debhelper (>> 5.0.0), python-all-dev (>= 2.6.6-3), xsltproc, docbook-xsl, docbook-xml
+Build-Depends: debhelper (>= 8.1.3),
+               docbook-xml,
+               docbook-xsl,
+               python-all-dbg (>= 2.6.6-3),
+               python-all-dev (>= 2.6.6-3),
+               xsltproc
 Homepage: http://tdb.samba.org/
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Bzr: http://bzr.debian.org/pkg-samba/tdb/unstable
-X-Python-Version: >= 2.4
+X-Python-Version: 2.6
 
 Package: libtdb1
+Multi-Arch: same
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Trivial Database - shared library
  This is a simple database API. It is modelled after the structure
  of GDBM. TDB features, unlike GDBM, multiple writers support with
@@ -22,7 +28,7 @@ Description: Trivial Database - shared library
 Package: tdb-tools
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Trivial Database - bundled binaries
  This is a simple database API. It is modelled after the structure
  of GDBM. TDB features, unlike GDBM, multiple writers support with
@@ -31,6 +37,7 @@ Description: Trivial Database - bundled binaries
  This package contains bundled test and utility binaries
 
 Package: libtdb-dev
+Pre-Depends: ${misc:Pre-Depends}
 Provides: tdb-dev
 Replaces: tdb-dev (<< 1.2.0-1)
 Conflicts: tdb-dev (<< 1.2.0-1)
@@ -44,16 +51,47 @@ Description: Trivial Database - development files
  .
  This package contains the development files.
 
+Package: libtdb1-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: libtdb1 (= ${binary:Version}), ${misc:Depends}
+Recommends: libc6-dbg
+Description: Trivial Database - debug symbols
+ This is a simple database API. It is modelled after the structure
+ of GDBM. TDB features, unlike GDBM, multiple writers support with
+ appropriate locking and transactions.
+ .
+ This package contains the debug symbols.
+
 Package: python-tdb
 Section: python
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, libtdb1 (= ${binary:Version}), ${misc:Depends}
+Depends: libtdb1 (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
 Provides: ${python:Provides}
 Description: Python bindings for TDB
- TDB is a simple database API. 
+ TDB is a simple database API.
  .
  This package contains the Python bindings.
 
+Package: python-tdb-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: python-tdb (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
+Recommends: python-dbg
+Provides: ${python:Provides}
+Description: Python bindings for TDB - debug extension
+ TDB is a simple database API.
+ .
+ This package contains the Python debug extension.
+
 Package: tdb-dev
 Depends: libtdb-dev, ${misc:Depends}
 Architecture: all

diff --git a/debian/rules b/debian/rules
index 137693ef21784c6f37cf727d30167e3f44cf7de7..49f04f29297c1b43b726f2bb4f926ae6b2a1d0c3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -55,15 +55,18 @@ install: build
                $(CURDIR)/debian/tmp/usr/share/man/man8/tdbbackup.tdbtools.8
        dh_install --fail-missing --list-missing --sourcedir=$(DESTDIR)
 
-binary-indep: 
+binary-indep:
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_installdocs 
+       dh_installdocs -p libtdb1 --link-doc=libtdb1-dbg
+       dh_installdocs -p python-tdb --link-doc=python-tdb-dbg
+       dh_installdocs -p libtdb-dev -p tdb-dev
        dh_installman
        dh_installchangelogs 
        dh_link
-       dh_strip
+       dh_strip -p libtdb1 --dbg-package=libtdb1-dbg
+       dh_strip -p python-tdb --dbg-package=python-tdb-dbg
        dh_compress
        dh_fixperms
        dh_makeshlibs -- -c4