[Pkg-samba-maint] r3476 - in branches/tdb/experimental: . debian debian/patches debian/source

jelmer at alioth.debian.org jelmer at alioth.debian.org
Thu May 13 16:45:31 UTC 2010


tags 557819 pending
tags 511011 pending
thanks

Author: jelmer
Date: 2010-05-13 16:45:29 +0000 (Thu, 13 May 2010)
New Revision: 3476

Added:
   branches/tdb/experimental/debian/libtdb-dev.dirs
   branches/tdb/experimental/debian/libtdb-dev.docs
   branches/tdb/experimental/debian/libtdb-dev.install
   branches/tdb/experimental/debian/libtdb-dev.manpages
   branches/tdb/experimental/debian/libtdb1.symbols
   branches/tdb/experimental/debian/patches/30_tdb_logging_func.diff
   branches/tdb/experimental/debian/source/
Removed:
   branches/tdb/experimental/debian/tdb-dev.dirs
   branches/tdb/experimental/debian/tdb-dev.docs
   branches/tdb/experimental/debian/tdb-dev.install
   branches/tdb/experimental/debian/tdb-dev.manpages
Modified:
   branches/tdb/experimental/
   branches/tdb/experimental/debian/changelog
   branches/tdb/experimental/debian/control
   branches/tdb/experimental/debian/copyright
   branches/tdb/experimental/debian/patches/series
   branches/tdb/experimental/debian/rules
   branches/tdb/experimental/debian/source/format
   branches/tdb/experimental/debian/tdb-tools.install
   branches/tdb/experimental/debian/tdb-tools.postinst
Log:
Merge unstable.


Property changes on: branches/tdb/experimental
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/tdb:2848,2954-2957,3131-3132,3145,3153-3154,3313-3314,3320

Added: svk:merge
   + fc4039ab-9d04-0410-8cac-899223bdd6b0:/trunk/tdb:3320


Modified: branches/tdb/experimental/debian/changelog
===================================================================
--- branches/tdb/experimental/debian/changelog	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/changelog	2010-05-13 16:45:29 UTC (rev 3476)
@@ -1,3 +1,43 @@
+tdb (1.2.1-2) unstable; urgency=low
+
+  * Add missing build dependency on xsltproc, docbook-xsl. Closes:
+    #570950
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Mon, 22 Feb 2010 14:28:59 +0100
+
+tdb (1.2.1-1) unstable; urgency=low
+
+  * New upstream release.
+   + Adds manual pages for tdb-tools. Closes: #557819
+  * Use source format 3.
+  * Bump standards version to 3.8.4.
+
+ -- 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.
+  * Rename tdb-dev -> libtdb-dev.
+  * Bump standards version to 3.8.3.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Mon, 07 Dec 2009 22:18:51 +0100
+
+tdb (1.1.5-2) unstable; urgency=low
+
+  * Provide a symbols file.
+  * Provide deprecated replacement of public tdb_logging_function symbol 
+    removed upstream without soname bump. Closes: #511011
+  * Fix use of --as-needed.
+  * Bump standards version to 3.8.2.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Sat, 18 Jul 2009 12:15:43 +0200
+
+tdb (1.1.5-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Wed, 17 Jun 2009 16:57:30 +0200
+
 tdb (1.1.4~git20090604-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: branches/tdb/experimental/debian/control
===================================================================
--- branches/tdb/experimental/debian/control	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/control	2010-05-13 16:45:29 UTC (rev 3476)
@@ -2,16 +2,17 @@
 Section: devel
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer at debian.org>
-Build-Depends: debhelper (>> 5.0.0), quilt (>= 0.40), python-central (>= 0.5.6), python-dev
+Build-Depends: debhelper (>> 5.0.0), quilt (>= 0.40), python-central (>= 0.5.6), python-dev, xsltproc, docbook-xsl
 Homepage: http://tdb.samba.org/
-Standards-Version: 3.8.1
+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
  of GDBM. TDB features, unlike GDBM, multiple writers support with
@@ -22,7 +23,8 @@
 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
  of GDBM. TDB features, unlike GDBM, multiple writers support with
@@ -30,10 +32,14 @@
  .
  This package contains bundled test and utility binaries
 
-Package: tdb-dev
+Package: libtdb-dev
+Provides: tdb-dev
+Replaces: tdb-dev (<< 1.2.0-1)
+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
  of GDBM. TDB features, unlike GDBM, multiple writers support with
@@ -44,10 +50,19 @@
 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
  TDB is a simple database API. 
  .
  This package contains the Python bindings.
+
+Package: tdb-dev
+Depends: libtdb-dev, ${misc:Depends}
+Architecture: all
+XB-Python-Version: ${python:Versions}
+Description: transitional dummy package
+ This is a dummy package to ease transition to new package name.
+ .
+ You can safely remove it after the upgrade.

Modified: branches/tdb/experimental/debian/copyright
===================================================================
--- branches/tdb/experimental/debian/copyright	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/copyright	2010-05-13 16:45:29 UTC (rev 3476)
@@ -1,24 +1,104 @@
 This package was debianized by Marek Habersack <grendel at debian.org> on
-Mon,  7 May 2001 18:03:17 +0200.
+Mon,  7 May 2001 18:03:17 +0200 and subsequently updated heavily
+by Jelmer Vernooij <jelmer at debian.org>.
 
-The tarball was extracted from Subversion by running:
-svn export svn://svn.samba.org/samba/tags/TDB_1_1_0 tdb-1.1.0
-cd tdb-1.1.0 && ./autogen.sh && cd ..
-tar cvz tdb-1.1.0 > tdb-1.1.0.tar.gz
+The tarball was extracted from Git using the script in 
+./debian/build-orig.sh
 
 Upstream Author: Andrew Tridgell <tridge at samba.org>
 
+Files: libreplace/inet_ntop.c libreplace/inet_pton.c
+Copyright: Internet Software Consortium. 1996-2001
+License: ISC
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
+ DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
+ INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
+ INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
+ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Files: libreplace/*.c
 Copyright:
-  Copyright (c) Andrew Tridgell        1999-2004
-  Copyright (c) Paul `Rusty' Russell   2000
-  Copyright (c) Jeremy Allison	       2000-2003
-  
+  Copyright (c) Andrew Tridgell                1999-2006
+  Copyright (c) Jeremy Allison	               2000-2003,2007
+  Copyright (c) PostgreSQL Global Development Group 1996-2007
+  Copyright (c) The Regents of the University of California 1994
+  Copyright (c) Michael Adam <obnox at samba.org> 2008
+  Copyright (c) Patrick Powell                 1995
+  Copyright (c) Free Software Foundation, Inc. 1991-2001
+  Copyright (c) Jelmer Vernooij                2006-2009
+License: LGPL-3+
+ Libreplace is licensed under the GNU Lesser General Public License, 
+ version 3 or later. The text of the license is available on Debian 
+ systems in the /usr/share/common-licenses/LGPL-3 file.
+
+Files: common/*.c
+Copyright:
+  Copyright (c) Andrew Tridgell                1999-2006
+  Copyright (c) Paul `Rusty' Russell           2000
+  Copyright (c) Jeremy Allison	               2000-2003,2007
 License:
+  The shared library in this package is distributed under the terms
+  of the GNU Lesser General Public License, version 3 or later. The text 
+  of the license is available on Debian systems in the 
+  /usr/share/common-licenses/LGPL-3 file.
 
-The binary utilities in this package are distributed under the terms 
-of the GNU General Public License. The text of the license is available
-on Debian systems in the /usr/share/common-licenses/GPL file.
+Files: tools/*.c
+Copyright:
+  Copyright (c) Andrew Tridgell                1999-2006
+  Copyright (c) Paul `Rusty' Russell           2000
+  Copyright (c) Jeremy Allison	               2000-2003,2007
+  Copyright (c) Andrew Esh                     2001
+License:
+  The binary utilities in this package are distributed under the terms 
+  of the GNU General Public License, version 3 or later. The text of the 
+  license is available on Debian systems in the 
+  /usr/share/common-licenses/GPL-3 file.
 
-The shared library in this package is distributed under the terms
-of the GNU Lesser General Public License. The text of the license is
-available on Debian systems in the /usr/share/common-licenses/LGPL file.
+Files: pytdb.c
+Copyright:
+  Copyright (c) Tim Potter <tpot at samba.org>    2004-2006
+  Copyright (c) Jelmer Vernooij                2006-2008
+License:
+  The python module in this package is distributed under the terms
+  of the GNU Lesser General Public License, version 3 or later. The text 
+  of the license is available on Debian systems in the 
+  /usr/share/common-licenses/LGPL-3 file.
+ 
+Files: libreplace/timegm.c
+Copyright: 
+  Copyright (c) Kungliga Tekniska Högskolan    1997
+License: 
+ Redistribution and use in source and binary forms, with or without 
+ modification, are permitted provided that the following conditions 
+ are met: 
+
+ 1. Redistributions of source code must retain the above copyright 
+    notice, this list of conditions and the following disclaimer. 
+
+ 2. Redistributions in binary form must reproduce the above copyright 
+    notice, this list of conditions and the following disclaimer in the 
+    documentation and/or other materials provided with the distribution. 
+
+ 3. Neither the name of the Institute nor the names of its contributors 
+    may be used to endorse or promote products derived from this software 
+    without specific prior written permission. 
+
+ THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND 
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE 
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ SUCH DAMAGE. 
+

Copied: branches/tdb/experimental/debian/libtdb-dev.dirs (from rev 2812, branches/tdb/experimental/debian/tdb-dev.dirs)
===================================================================
--- branches/tdb/experimental/debian/libtdb-dev.dirs	                        (rev 0)
+++ branches/tdb/experimental/debian/libtdb-dev.dirs	2010-05-13 16:45:29 UTC (rev 3476)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include

Copied: branches/tdb/experimental/debian/libtdb-dev.docs (from rev 2812, branches/tdb/experimental/debian/tdb-dev.docs)
===================================================================
--- branches/tdb/experimental/debian/libtdb-dev.docs	                        (rev 0)
+++ branches/tdb/experimental/debian/libtdb-dev.docs	2010-05-13 16:45:29 UTC (rev 3476)
@@ -0,0 +1 @@
+docs/README

Copied: branches/tdb/experimental/debian/libtdb-dev.install (from rev 2812, branches/tdb/experimental/debian/tdb-dev.install)
===================================================================
--- branches/tdb/experimental/debian/libtdb-dev.install	                        (rev 0)
+++ branches/tdb/experimental/debian/libtdb-dev.install	2010-05-13 16:45:29 UTC (rev 3476)
@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/pkgconfig/tdb.pc
+usr/lib/lib*.a
+usr/lib/lib*.so

Copied: branches/tdb/experimental/debian/libtdb-dev.manpages (from rev 2812, branches/tdb/experimental/debian/tdb-dev.manpages)
===================================================================
--- branches/tdb/experimental/debian/libtdb-dev.manpages	                        (rev 0)
+++ branches/tdb/experimental/debian/libtdb-dev.manpages	2010-05-13 16:45:29 UTC (rev 3476)
@@ -0,0 +1 @@
+debian/manpages/*

Copied: branches/tdb/experimental/debian/libtdb1.symbols (from rev 3320, trunk/tdb/debian/libtdb1.symbols)
===================================================================
--- branches/tdb/experimental/debian/libtdb1.symbols	                        (rev 0)
+++ branches/tdb/experimental/debian/libtdb1.symbols	2010-05-13 16:45:29 UTC (rev 3476)
@@ -0,0 +1,62 @@
+libtdb.so.1 libtdb1 #MINVER#
+ tdb_add_flags at Base 1.1.2~git20080520
+ tdb_append at Base 1.0.6
+ tdb_chainlock at Base 1.0.6
+ tdb_chainlock_mark at Base 1.1.1~svn26294
+ tdb_chainlock_nonblock at Base 1.1.0
+ tdb_chainlock_read at Base 1.0.6
+ tdb_chainlock_unmark at Base 1.1.1~svn26294
+ tdb_chainunlock at Base 1.0.6
+ tdb_chainunlock_read at Base 1.0.6
+ tdb_check at Base 1.2.0
+ tdb_close at Base 1.0.6
+ tdb_delete at Base 1.0.6
+ tdb_dump_all at Base 1.0.6
+ tdb_enable_seqnum at Base 1.1.1~svn26294
+ tdb_error at Base 1.0.6
+ tdb_errorstr at Base 1.0.6
+ tdb_exists at Base 1.0.6
+ tdb_fd at Base 1.1.0
+ tdb_fetch at Base 1.0.6
+ tdb_firstkey at Base 1.0.6
+ tdb_freelist_size at Base 1.1.2~git20080520
+ tdb_get_flags at Base 1.1.0
+ tdb_get_logging_private at Base 1.1.0
+ tdb_get_seqnum at Base 1.1.0
+ tdb_hash_size at Base 1.1.0
+ tdb_increment_seqnum_nonblock at Base 1.1.1~svn26294
+ tdb_lockall at Base 1.0.6
+ tdb_lockall_mark at Base 1.1.1~svn26294
+ tdb_lockall_nonblock at Base 1.1.1~svn26294
+ tdb_lockall_read at Base 1.1.0
+ tdb_lockall_read_nonblock at Base 1.1.1~svn26294
+ tdb_lockall_unmark at Base 1.1.1~svn26294
+ tdb_log_fn at Base 1.1.0
+ tdb_logging_function at Base 1.0.6
+ tdb_map_size at Base 1.1.0
+ tdb_name at Base 1.1.0
+ tdb_nextkey at Base 1.0.6
+ tdb_null at Base 1.0.6
+ tdb_open at Base 1.0.6
+ tdb_open_ex at Base 1.0.6
+ tdb_parse_record at Base 1.1.0
+ tdb_printfreelist at Base 1.0.6
+ tdb_remove_flags at Base 1.1.2~git20080520
+ tdb_reopen at Base 1.0.6
+ tdb_reopen_all at Base 1.0.6
+ tdb_repack at Base 1.1.2~git20081222
+ tdb_set_logging_function at Base 1.1.0
+ tdb_set_max_dead at Base 1.1.0
+ tdb_setalarm_sigptr at Base 1.1.1~svn26294
+ tdb_store at Base 1.0.6
+ tdb_transaction_cancel at Base 1.1.0
+ tdb_transaction_commit at Base 1.1.0
+ tdb_transaction_prepare_commit at Base 1.1.5
+ tdb_transaction_recover at Base 1.1.0
+ tdb_transaction_start at Base 1.1.0
+ tdb_traverse at Base 1.0.6
+ tdb_traverse_read at Base 1.1.0
+ tdb_unlockall at Base 1.0.6
+ tdb_unlockall_read at Base 1.1.0
+ tdb_validate_freelist at Base 1.1.0
+ tdb_wipe_all at Base 1.1.2~git20080520

Copied: branches/tdb/experimental/debian/patches/30_tdb_logging_func.diff (from rev 3320, trunk/tdb/debian/patches/30_tdb_logging_func.diff)
===================================================================
--- branches/tdb/experimental/debian/patches/30_tdb_logging_func.diff	                        (rev 0)
+++ branches/tdb/experimental/debian/patches/30_tdb_logging_func.diff	2010-05-13 16:45:29 UTC (rev 3476)
@@ -0,0 +1,40 @@
+Provide public symbol tdb_logging_function removed upstream without major 
+version change. (bug #511011)
+
+diff -ur tdb-1.1.5/common/open.c tdb-1.1.5-fixed/common/open.c
+--- tdb-1.1.5/common/open.c	2009-05-23 16:37:50.000000000 +0200
++++ tdb-1.1.5-fixed/common/open.c	2009-07-18 12:46:08.000000000 +0200
+@@ -400,6 +400,11 @@
+         tdb->log = *log_ctx;
+ }
+ 
++void tdb_logging_function(struct tdb_context *tdb, tdb_log_func fn)
++{
++	tdb->log.log_fn = fn;
++}
++
+ void *tdb_get_logging_private(struct tdb_context *tdb)
+ {
+ 	return tdb->log.log_private;
+diff -ur tdb-1.1.5/include/tdb.h tdb-1.1.5-fixed/include/tdb.h
+--- tdb-1.1.5/include/tdb.h	2009-05-23 16:37:50.000000000 +0200
++++ tdb-1.1.5-fixed/include/tdb.h	2009-07-18 12:45:57.000000000 +0200
+@@ -99,6 +99,7 @@
+ 
+ int tdb_reopen(struct tdb_context *tdb);
+ int tdb_reopen_all(int parent_longlived);
++__attribute__((deprecated)) void tdb_logging_function(struct tdb_context *tdb, tdb_log_func);
+ void tdb_set_logging_function(struct tdb_context *tdb, const struct tdb_logging_context *log_ctx);
+ enum TDB_ERROR tdb_error(struct tdb_context *tdb);
+ const char *tdb_errorstr(struct tdb_context *tdb);
+diff -ur tdb-1.1.5/tdb.exports tdb-1.1.5-fixed/tdb.exports
+--- tdb-1.1.5/tdb.exports	2009-06-15 23:06:56.000000000 +0200
++++ tdb-1.1.5-fixed/tdb.exports	2009-07-18 13:03:14.000000000 +0200
+@@ -22,6 +22,7 @@
+            tdb_freelist_size;
+            tdb_get_flags;
+            tdb_get_logging_private;
++           tdb_logging_function;
+            tdb_get_seqnum;
+            tdb_hash_size;
+            tdb_increment_seqnum_nonblock;

Modified: branches/tdb/experimental/debian/patches/series
===================================================================
--- branches/tdb/experimental/debian/patches/series	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/patches/series	2010-05-13 16:45:29 UTC (rev 3476)
@@ -0,0 +1 @@
+30_tdb_logging_func.diff

Modified: branches/tdb/experimental/debian/rules
===================================================================
--- branches/tdb/experimental/debian/rules	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/rules	2010-05-13 16:45:29 UTC (rev 3476)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-CFLAGS = -g -Wall -Wl,--as-needed
+CFLAGS = -g -Wall
+SHLD_FLAGS = -shared -Wl,--as-needed
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -O0
@@ -21,7 +22,7 @@
 build: configure build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE) all 
+	$(MAKE) all SHLD_FLAGS="$(SHLD_FLAGS)"
 	touch build-stamp
 
 clean: clean-patched unpatch
@@ -33,9 +34,6 @@
 	rm -rf build
 	dh_clean
 
-get-orig-source:
-	./debian/build-orig.sh
-
 install: build
 	dh_testdir
 	dh_testroot
@@ -44,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: 
@@ -59,7 +57,7 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-	dh_makeshlibs -V 'libtdb1 (>= 1.1.3~git2008122-1)'
+	dh_makeshlibs -V 'libtdb1 (>= 1.1.3~git2008122-1)' -- -c4
 	dh_pycentral
 	dh_installdeb
 	dh_shlibdeps

Deleted: branches/tdb/experimental/debian/tdb-dev.dirs
===================================================================
--- branches/tdb/experimental/debian/tdb-dev.dirs	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/tdb-dev.dirs	2010-05-13 16:45:29 UTC (rev 3476)
@@ -1,2 +0,0 @@
-usr/lib
-usr/include

Deleted: branches/tdb/experimental/debian/tdb-dev.docs
===================================================================
--- branches/tdb/experimental/debian/tdb-dev.docs	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/tdb-dev.docs	2010-05-13 16:45:29 UTC (rev 3476)
@@ -1 +0,0 @@
-docs/README

Deleted: branches/tdb/experimental/debian/tdb-dev.install
===================================================================
--- branches/tdb/experimental/debian/tdb-dev.install	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/tdb-dev.install	2010-05-13 16:45:29 UTC (rev 3476)
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/pkgconfig/tdb.pc
-usr/lib/lib*.a
-usr/lib/lib*.so

Deleted: branches/tdb/experimental/debian/tdb-dev.manpages
===================================================================
--- branches/tdb/experimental/debian/tdb-dev.manpages	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/tdb-dev.manpages	2010-05-13 16:45:29 UTC (rev 3476)
@@ -1 +0,0 @@
-debian/manpages/*

Modified: branches/tdb/experimental/debian/tdb-tools.install
===================================================================
--- branches/tdb/experimental/debian/tdb-tools.install	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/tdb-tools.install	2010-05-13 16:45:29 UTC (rev 3476)
@@ -1 +1,2 @@
 usr/bin/tdb*
+usr/share/man/man8/*.8

Modified: branches/tdb/experimental/debian/tdb-tools.postinst
===================================================================
--- branches/tdb/experimental/debian/tdb-tools.postinst	2010-05-12 18:36:39 UTC (rev 3475)
+++ branches/tdb/experimental/debian/tdb-tools.postinst	2010-05-13 16:45:29 UTC (rev 3476)
@@ -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)





More information about the Pkg-samba-maint mailing list