[Pkg-samba-maint] r1064 - in trunk: . patches

[Christian Perrier]

Author: bubulle
Date: 2006-05-25 20:18:16 +0000 (Thu, 25 May 2006)
New Revision: 1064

Removed:
   trunk/patches/py_tdb-3.0.23pre1_fix.patch
Modified:
   trunk/changelog
   trunk/control
Log:
The patch to py_tdb.c is no longer needed in 3.0.23rc1


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-05-25 17:38:32 UTC (rev 1063)
+++ trunk/changelog	2006-05-25 20:18:16 UTC (rev 1064)
@@ -1,4 +1,4 @@
-samba (3.0.23pre1-1) UNRELEASED; urgency=low
+samba (3.0.23rc1-1) UNRELEASED; urgency=low
 
   [ Adam Conrad ]
   * Fix typo in smb.conf that causes all samba apps to whine.
@@ -17,8 +17,6 @@
       Closes: #367472
   * Add dependency on procps for samba, as ps is used in init scripts.
     Thanks to Bastian Blank for reporting. Closes: #365618
-  * py_tdb-3.0.23pre1_fix.patch added to allow compiling 3.0.23pre1
-    (unneeded for 3.0.23final)
   * Add (U)MOUNT_CIFS_VENDOR_SUFFIX to VERSION.patch
 
   [ Peter Eisentraut ]

Modified: trunk/control
===================================================================
--- trunk/control	2006-05-25 17:38:32 UTC (rev 1063)
+++ trunk/control	2006-05-25 20:18:16 UTC (rev 1064)
@@ -8,7 +8,7 @@
 
 Package: samba
 Architecture: any
-Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6)
+Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.0-6), procps
 Recommends: smbldap-tools
 Replaces: samba-common (<= 2.0.5a-2)
 Description: a LanManager-like file and printer server for Unix

Deleted: trunk/patches/py_tdb-3.0.23pre1_fix.patch
===================================================================
--- trunk/patches/py_tdb-3.0.23pre1_fix.patch	2006-05-25 17:38:32 UTC (rev 1063)
+++ trunk/patches/py_tdb-3.0.23pre1_fix.patch	2006-05-25 20:18:16 UTC (rev 1064)
@@ -1,13 +0,0 @@
-Index: samba-3.0.23pre1/source/python/py_tdb.c
-===================================================================
---- samba-3.0.23pre1.orig/source/python/py_tdb.c	2005-07-28 15:19:41.000000000 +0200
-+++ samba-3.0.23pre1/source/python/py_tdb.c	2006-05-25 09:07:34.719135744 +0200
-@@ -494,7 +494,7 @@
- 	if (!PyArg_ParseTuple(args, "s|i", &s, &timeout))
- 		return NULL;
- 
--	result = tdb_lock_bystring(obj->tdb, s, timeout);
-+	result = tdb_lock_bystring_with_timeout(obj->tdb, s, timeout);
- 
- 	return PyInt_FromLong(result != -1);
- }