[Pkg-samba-maint] r2955 - in trunk/tdb/debian: . patches

[jelmer at alioth.debian.org]

tags 511011 pending
thanks

Author: jelmer
Date: 2009-07-18 11:01:49 +0000 (Sat, 18 Jul 2009)
New Revision: 2955

Added:
   trunk/tdb/debian/patches/30_tdb_logging_func.diff
Modified:
   trunk/tdb/debian/changelog
   trunk/tdb/debian/control
   trunk/tdb/debian/patches/series
Log:
Provide deprecated replacement of public tdb_logging_function symbol 
removed upstream without soname bump. Closes: #511011

Modified: trunk/tdb/debian/changelog
===================================================================
--- trunk/tdb/debian/changelog	2009-07-18 11:01:44 UTC (rev 2954)
+++ trunk/tdb/debian/changelog	2009-07-18 11:01:49 UTC (rev 2955)
@@ -1,6 +1,8 @@
 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
   * Bump standards version to 3.8.2.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sat, 18 Jul 2009 12:15:43 +0200

Modified: trunk/tdb/debian/control
===================================================================
--- trunk/tdb/debian/control	2009-07-18 11:01:44 UTC (rev 2954)
+++ trunk/tdb/debian/control	2009-07-18 11:01:49 UTC (rev 2955)
@@ -12,6 +12,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs: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
@@ -23,6 +24,7 @@
 Section: utils
 Architecture: any
 Depends: ${shlibs: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
@@ -34,6 +36,7 @@
 Section: libdevel
 Architecture: any
 Depends: libc6-dev, libtdb1 (= ${binary:Version})
+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

Added: trunk/tdb/debian/patches/30_tdb_logging_func.diff
===================================================================
--- trunk/tdb/debian/patches/30_tdb_logging_func.diff	                        (rev 0)
+++ trunk/tdb/debian/patches/30_tdb_logging_func.diff	2009-07-18 11:01:49 UTC (rev 2955)
@@ -0,0 +1,29 @@
+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);

Modified: trunk/tdb/debian/patches/series
===================================================================
--- trunk/tdb/debian/patches/series	2009-07-18 11:01:44 UTC (rev 2954)
+++ trunk/tdb/debian/patches/series	2009-07-18 11:01:49 UTC (rev 2955)
@@ -0,0 +1 @@
+30_tdb_logging_func.diff