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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-01-13 11:53:50 +0000 (Sun, 13 Jan 2008)
New Revision: 1723

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/control
Log:
Unversion the conflict with manpages-de, hopefully temporarily

Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-01-12 22:49:34 UTC (rev 1722)
+++ debian/trunk/debian/changelog	2008-01-13 11:53:50 UTC (rev 1723)
@@ -1,3 +1,10 @@
+shadow (1:4.1.0-2) UNRELEASED; urgency=low
+
+  * Unversion the conflict with manpages-de for login, as it also provides
+    a German manpage for su(1). Closes: #460508
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 13 Jan 2008 12:50:06 +0100
+
 shadow (1:4.1.0-1) unstable; urgency=low
 
   [ Nicolas FRANCOIS (Nekral) ]

Modified: debian/trunk/debian/control
===================================================================
--- debian/trunk/debian/control	2008-01-12 22:49:34 UTC (rev 1722)
+++ debian/trunk/debian/control	2008-01-13 11:53:50 UTC (rev 1723)
@@ -24,7 +24,7 @@
 Pre-Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
 Depends: libpam-modules (>= 0.72-5)
 Conflicts: 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: 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-de (<< 0.4-10), manpages-es-extra (<<0.8a-15), manpages-tr, manpages-zh
+Replaces: 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-de, manpages-es-extra (<<0.8a-15), manpages-tr, manpages-zh
 Essential: yes
 Section: admin
 Priority: required