[Pkg-samba-maint] r1992 - branches/samba/experimental/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-07-06 07:26:17 +0000 (Sun, 06 Jul 2008)
New Revision: 1992

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
Log:
Merge r1818

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2008-07-06 07:24:41 UTC (rev 1991)
+++ branches/samba/experimental/debian/changelog	2008-07-06 07:26:17 UTC (rev 1992)
@@ -12,6 +12,7 @@
     default
   * Remove versioned Build-Depends when satisfied in etch (actually all
     versioning in Build-Depends)
+  * Remove Conflicts with non-existing packages
 
   [ Steve Langasek ]
   * New upstream release

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2008-07-06 07:24:41 UTC (rev 1991)
+++ branches/samba/experimental/debian/control	2008-07-06 07:26:17 UTC (rev 1992)
@@ -74,7 +74,6 @@
 Architecture: any
 Depends: samba-common (= ${binary:Version}), ${shlibs:Depends}
 Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
-Conflicts: smbget
 Provides: samba-client
 Suggests: smbfs
 Description: a LanManager-like simple client for Unix
@@ -137,7 +136,6 @@
 Depends: netbase (>= 2.02), samba-common (= ${binary:Version}), ${shlibs:Depends}
 Suggests: smbclient
 Replaces: smbfsx
-Conflicts: smbfsx, suidmanager (<< 0.50)
 Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x)
  Smbfs is a filesystem which understands the SMB/CIFS protocol.
  This is the protocol Windows for Workgroups, Windows NT or