[Pkg-samba-maint] r3313 - in trunk/tdb/debian: . source

[jelmer at alioth.debian.org]

tags 557819 pending
thanks

Author: jelmer
Date: 2010-02-22 02:42:11 +0000 (Mon, 22 Feb 2010)
New Revision: 3313

Added:
   trunk/tdb/debian/source/
   trunk/tdb/debian/source/format
Modified:
   trunk/tdb/debian/changelog
   trunk/tdb/debian/control
   trunk/tdb/debian/rules
   trunk/tdb/debian/tdb-tools.install
   trunk/tdb/debian/tdb-tools.postinst
Log:
* New upstream release.
* Use source format 3.
* Bump standards version to 3.8.4.
* Adds manual pages for tdb-tools. Closes: #557819

Modified: trunk/tdb/debian/changelog
===================================================================
--- trunk/tdb/debian/changelog	2010-02-20 14:34:12 UTC (rev 3312)
+++ trunk/tdb/debian/changelog	2010-02-22 02:42:11 UTC (rev 3313)
@@ -1,3 +1,12 @@
+tdb (1.2.1-1) lucid; urgency=low
+
+  * New upstream release.
+  * Use source format 3.
+  * Bump standards version to 3.8.4.
+  * Adds manual pages for tdb-tools. Closes: #557819
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Mon, 22 Feb 2010 03:24:06 +0100
+
 tdb (1.2.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/tdb/debian/control
===================================================================
--- trunk/tdb/debian/control	2010-02-20 14:34:12 UTC (rev 3312)
+++ trunk/tdb/debian/control	2010-02-22 02:42:11 UTC (rev 3313)
@@ -4,14 +4,14 @@
 Maintainer: Jelmer Vernooij <jelmer at debian.org>
 Build-Depends: debhelper (>> 5.0.0), quilt (>= 0.40), python-central (>= 0.5.6), python-dev
 Homepage: http://tdb.samba.org/
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/tdb
 XS-Python-Version: all
 
 Package: libtdb1
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Trivial Database - shared library
  This is a simple database API. It is modelled after the structure
@@ -23,7 +23,7 @@
 Package: tdb-tools
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Trivial Database - bundled binaries
  This is a simple database API. It is modelled after the structure
@@ -38,7 +38,7 @@
 Conflicts: tdb-dev (<< 1.2.0-1)
 Section: libdevel
 Architecture: any
-Depends: libc6-dev, libtdb1 (= ${binary:Version})
+Depends: libc6-dev, libtdb1 (= ${binary:Version}), ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Trivial Database - development files
  This is a simple database API. It is modelled after the structure
@@ -50,7 +50,7 @@
 Package: python-tdb
 Section: python
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, libtdb1 (= ${binary:Version})
+Depends: ${python:Depends}, ${shlibs:Depends}, libtdb1 (= ${binary:Version}), ${misc:Depends}
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings for TDB
@@ -59,7 +59,7 @@
  This package contains the Python bindings.
 
 Package: tdb-dev
-Depends: libtdb-dev
+Depends: libtdb-dev, ${misc:Depends}
 Architecture: all
 XB-Python-Version: ${python:Versions}
 Description: transitional dummy package

Modified: trunk/tdb/debian/rules
===================================================================
--- trunk/tdb/debian/rules	2010-02-20 14:34:12 UTC (rev 3312)
+++ trunk/tdb/debian/rules	2010-02-22 02:42:11 UTC (rev 3313)
@@ -42,8 +42,8 @@
 	$(MAKE) install DESTDIR=$(DESTDIR)
 	mv $(CURDIR)/debian/tmp/usr/bin/tdbbackup \
 		$(CURDIR)/debian/tmp/usr/bin/tdbbackup.tdbtools
-	ln -s libtdb.so.1.* $(DESTDIR)/usr/lib/libtdb.so.1
-	ln -s libtdb.so.1 $(DESTDIR)/usr/lib/libtdb.so
+	mv $(CURDIR)/debian/tmp/usr/share/man/man8/tdbbackup.8 \
+		$(CURDIR)/debian/tmp/usr/share/man/man8/tdbbackup.tdbtools.8
 	dh_install --fail-missing --list-missing --sourcedir=$(DESTDIR)
 
 binary-indep: 

Added: trunk/tdb/debian/source/format
===================================================================
--- trunk/tdb/debian/source/format	                        (rev 0)
+++ trunk/tdb/debian/source/format	2010-02-22 02:42:11 UTC (rev 3313)
@@ -0,0 +1 @@
+3.0 (quilt)

Modified: trunk/tdb/debian/tdb-tools.install
===================================================================
--- trunk/tdb/debian/tdb-tools.install	2010-02-20 14:34:12 UTC (rev 3312)
+++ trunk/tdb/debian/tdb-tools.install	2010-02-22 02:42:11 UTC (rev 3313)
@@ -1 +1,2 @@
 usr/bin/tdb*
+usr/share/man/man8/*.8

Modified: trunk/tdb/debian/tdb-tools.postinst
===================================================================
--- trunk/tdb/debian/tdb-tools.postinst	2010-02-20 14:34:12 UTC (rev 3312)
+++ trunk/tdb/debian/tdb-tools.postinst	2010-02-22 02:42:11 UTC (rev 3313)
@@ -7,7 +7,7 @@
 
 case "$1" in
     configure)
-    update-alternatives --install /usr/bin/tdbbackup tdbbackup /usr/bin/tdbbackup.tdbtools 10
+    update-alternatives --install /usr/bin/tdbbackup tdbbackup /usr/bin/tdbbackup.tdbtools 10 --slave /usr/share/man/man8/tdbbackup.8.gz tdbbackup.8.gz /usr/share/man/man8/tdbbackup.tdbtools.8.gz
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)