[Pkg-samba-maint] r2070 - trunk/samba4/debian

[ctrlsoft-guest at alioth.debian.org]

tags 492088 pending
thanks

Author: ctrlsoft-guest
Date: 2008-07-23 19:10:38 +0000 (Wed, 23 Jul 2008)
New Revision: 2070

Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/control
Log:
Make samba4-common conflict with samba-common.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2008-07-22 20:10:18 UTC (rev 2069)
+++ trunk/samba4/debian/changelog	2008-07-23 19:10:38 UTC (rev 2070)
@@ -1,9 +1,13 @@
 samba4 (4.0.0~alpha4~20080617-2) UNRELEASED; urgency=low
 
+  [ Steve Langasek ]
   * Add missing dependency on libparse-yapp-perl to libparse-pidl-perl.
 
- -- Steve Langasek <vorlon at debian.org>  Thu, 17 Jul 2008 22:41:15 +0100
+  [ Jelmer Vernooij ]
+  * Make samba4-common conflict with samba-common. (Closes: #492088)
 
+ -- Jelmer Vernooij <jelmer at samba.org>  Wed, 23 Jul 2008 21:09:49 +0200
+
 samba4 (4.0.0~alpha4~20080617-1) experimental; urgency=low
 
   * Fixed maintainer email address.

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2008-07-22 20:10:18 UTC (rev 2069)
+++ trunk/samba4/debian/control	2008-07-23 19:10:38 UTC (rev 2070)
@@ -32,7 +32,7 @@
 
 Package: samba4-common
 Architecture: any
-Conflicts: samba
+Conflicts: samba, samba-common
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Samba 4 common files used by both the server and the client
  The Samba software suite is a collection of programs that