[Pkg-samba-maint] r4120 - trunk/samba/debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2012-06-11 11:20:00 +0000 (Mon, 11 Jun 2012)
New Revision: 4120

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
Log:
Allow installing smbclient package together with newer versions of
samba4-clients, which no longer ship the smbclient and nmblookup
binaries.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-06-06 20:29:38 UTC (rev 4119)
+++ trunk/samba/debian/changelog	2012-06-11 11:20:00 UTC (rev 4120)
@@ -1,3 +1,11 @@
+samba (2:3.6.5-7) UNRELEASED; urgency=low
+
+  * Allow installing smbclient package together with newer versions of
+    samba4-clients, which no longer ship the smbclient and nmblookup
+    binaries.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Mon, 11 Jun 2012 13:19:24 +0200
+
 samba (2:3.6.5-6) unstable; urgency=high
 
   [ Ivo De Decker ]

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2012-06-06 20:29:38 UTC (rev 4119)
+++ trunk/samba/debian/control	2012-06-11 11:20:00 UTC (rev 4120)
@@ -86,7 +86,7 @@
 Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
 Provides: samba-client
 Suggests: cifs-utils
-Conflicts: samba4-clients
+Conflicts: samba4-clients (<< 4.0.0~beta1+dfsg1-1)
 Description: command-line SMB/CIFS clients for Unix
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with