From 0a21c2438e1a964c80e5b5416a82b100703d6b59 Mon Sep 17 00:00:00 2001 From: bubulle Date: Sun, 13 Jan 2008 11:53:50 +0000 Subject: [PATCH] Unversion the conflict with manpages-de, hopefully temporarily --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5f0cc9dd..77afc174 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 13 Jan 2008 12:50:06 +0100 + shadow (1:4.1.0-1) unstable; urgency=low [ Nicolas FRANCOIS (Nekral) ] diff --git a/debian/control b/debian/control index 05dad0a8..15b25814 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Architecture: any 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