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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-09-09 01:18:06 +0000 (Wed, 09 Sep 2009)
New Revision: 3027

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/control
Log:
revert previous change - this needs to live in samba-common for samba4

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-09-09 00:47:49 UTC (rev 3026)
+++ trunk/samba/debian/changelog	2009-09-09 01:18:06 UTC (rev 3027)
@@ -1,10 +1,3 @@
-samba (2:3.4.0-5) UNRELEASED; urgency=low
-
-  * Make samba Replace: samba-common, since /etc/pam.d/samba accidentally
-    moved into the right package in the last upload.
-
- -- Steve Langasek <vorlon at debian.org>  Tue, 08 Sep 2009 17:35:12 -0700
-
 samba (2:3.4.0-4) unstable; urgency=low
 
   [ Steve Langasek ]

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2009-09-09 00:47:49 UTC (rev 3026)
+++ trunk/samba/debian/control	2009-09-09 01:18:06 UTC (rev 3027)
@@ -23,7 +23,7 @@
 Depends: samba-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-11), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
 Recommends: logrotate
 Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools, ctdb
-Replaces: samba-common (<< 2:3.4.0-4)
+Replaces: samba-common (<= 2.0.5a-2)
 Conflicts: samba4 (<< 4.0.0~alpha6-2)
 Description: SMB/CIFS file, print, and login server for Unix
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,