[Pkg-shadow-commits] r950 - trunk/debian

[Christian Perrier]

Author: bubulle
Date: 2006-04-06 06:04:50 +0000 (Thu, 06 Apr 2006)
New Revision: 950

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
Version Conflict with python-4suite


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-04-05 17:35:02 UTC (rev 949)
+++ trunk/debian/changelog	2006-04-06 06:04:50 UTC (rev 950)
@@ -1,3 +1,11 @@
+shadow (1:4.0.15-4) UNRELEASED; urgency=high
+
+  * The "Fourme d'Ambert" release
+  * Debian packaging fixes:
+    - set a versioned Conflict with python-4suite.
+
+ -- Christian Perrier <bubulle at debian.org>  Thu,  6 Apr 2006 07:15:18 +0200
+
 shadow (1:4.0.15-3) unstable; urgency=high
 
   * The "Neufchâtel" release

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-04-05 17:35:02 UTC (rev 949)
+++ trunk/debian/control	2006-04-06 06:04:50 UTC (rev 950)
@@ -23,7 +23,7 @@
 Architecture: any
 Pre-Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Depends: libpam-modules (>= 0.72-5)
-Conflicts: shadow-login, pam-apps, secure-su, suidregister (<< 0.50), gnunet, amavisd-new (<<2.3.3-8), python-4suite, backupninja (<= 0.9.3-4), echolot (<< 2.1.8-4)
+Conflicts: shadow-login, pam-apps, secure-su, suidregister (<< 0.50), gnunet, amavisd-new (<<2.3.3-8), python-4suite (<< 0.99cvs20060405-1), backupninja (<= 0.9.3-4), echolot (<< 2.1.8-4)
 Replaces: shadow-login, shadow-passwd, shellutils (<< 2.0-2), manpages-fi (<< 0.2-4), manpages-fr (<<1.64.0-1), manpages-hu (<< 20010119-5), manpages-it (<< 0.3.4-2), manpages-ko (<< 20050219-2), manpages-ja (<< 0.5.0.0.20050915-1), manpages-pl (<= 20020406-1), manpages-de (<< 0.4-10), manpages-es-extra (<<0.8a-15), manpages-tr, manpages-zh
 Essential: yes
 Section: admin