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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-04-16 21:23:26 +0000 (Wed, 16 Apr 2008)
New Revision: 1818

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
Log:
Remove Conflicts with non-existing packages


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-04-16 21:22:15 UTC (rev 1817)
+++ trunk/samba/debian/changelog	2008-04-16 21:23:26 UTC (rev 1818)
@@ -7,6 +7,7 @@
     default
   * Remove versoned Build-Depends when satisfied in etch (actually all
     versioning in Build-Depends)
+  * Remove Conflicts with non-existing packages
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 16 Apr 2008 23:14:46 +0200
 

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2008-04-16 21:22:15 UTC (rev 1817)
+++ trunk/samba/debian/control	2008-04-16 21:23:26 UTC (rev 1818)
@@ -62,7 +62,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
@@ -125,7 +124,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