[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. upstream/4.0.6+dfsg-823-gba916aa

[Steve Langasek]

The following commit has been merged in the samba_4.0 branch:
commit ba916aa98e6d79748fefe3da38101df8015fad99
Author: Steve Langasek <vorlon at debian.org>
Date:   Fri May 31 18:39:53 2013 -0700

    Make samba-common Conflicts: swat, which is now obsolete and no longer built from samba 4.0; the old versions of swat in the archive are incompatible with smb.conf from samba 4.0, so force them off the system to avoid configuration corruption.

diff --git a/debian/changelog b/debian/changelog
index 4f70297..5bca17a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,12 @@ samba (2:4.0.6+dfsg-1) UNRELEASED; urgency=low
   * Specify all paths using configure options, so that we can finally get rid
     of the fhs patch. Closes: #705449
 
+  [ Steve Langasek ]
+  * Make samba-common Conflicts: swat, which is now obsolete and no longer
+    built from samba 4.0; the old versions of swat in the archive are
+    incompatible with smb.conf from samba 4.0, so force them off the system
+    to avoid configuration corruption.
+
  -- Ivo De Decker <ivo.dedecker at ugent.be>  Sat, 25 May 2013 23:30:36 +0200
 
 samba (2:3.6.14-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index edf685f..787af54 100644
--- a/debian/control
+++ b/debian/control
@@ -174,7 +174,7 @@ Multi-Arch: foreign
 Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.6~)
 Depends: ucf, ${misc:Depends}
 Replaces: samba (<< 3.0.20b-1), samba4-common (<< 4.0.0~alpha7-1), samba-doc (<< 2:4.0.5~)
-Conflicts: samba4-common (<< 4.0.0~alpha7-1), samba-doc (<< 2:4.0.5~)
+Conflicts: samba4-common (<< 4.0.0~alpha7-1), samba-doc (<< 2:4.0.5~), swat
 Recommends: samba-common-bin
 Description: common files used by both the Samba server and client
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,

-- 
Debian packaging for Samba