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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-04-17 13:30:45 +0000 (Mon, 17 Apr 2006)
New Revision: 958

Modified:
   trunk/debian/changelog
   trunk/debian/control
Log:
Set a versioned Conflicts on gnunet.
Also indicate the backupninja in 0.9.3-5.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-04-15 10:43:35 UTC (rev 957)
+++ trunk/debian/changelog	2006-04-17 13:30:45 UTC (rev 958)
@@ -1,3 +1,12 @@
+shadow (1:4.0.15-6) unstable; urgency=low
+
+  * The "Beaufort" release
+  * Debian packaging fixes:
+    - Change the Conflicts on backupninja from (<= 0.9.3-4) to (<< 0.9.3-5).
+    - Set a version Conflicts with gnunet.
+
+ -- Christian Perrier <bubulle at debian.org>  Mon, 17 Apr 2006 15:18:05 +0200
+
 shadow (1:4.0.15-5) unstable; urgency=high
 
   * The "Ossau-Iraty" release

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-04-15 10:43:35 UTC (rev 957)
+++ trunk/debian/control	2006-04-17 13:30:45 UTC (rev 958)
@@ -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 (<< 0.99cvs20060405-1), backupninja (<= 0.9.3-4), echolot (<< 2.1.8-4)
+Conflicts: shadow-login, pam-apps, secure-su, suidregister (<< 0.50), gnunet (<< 0.7.0c-2), amavisd-new (<<2.3.3-8), python-4suite (<< 0.99cvs20060405-1), backupninja (<< 0.9.3-5), 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