[Pkg-shadow-commits] r442 - in branches/experimental/debian: . patches

[Christian Perrier]

Author: bubulle
Date: 2005-08-17 08:01:56 +0000 (Wed, 17 Aug 2005)
New Revision: 442

Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/series
Log:
Disable 336 which was applied upstream


Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog	2005-08-17 07:59:56 UTC (rev 441)
+++ branches/experimental/debian/changelog	2005-08-17 08:01:56 UTC (rev 442)
@@ -8,6 +8,8 @@
     - Reduce 005 patch to only patch useradd.8.xml (other changes
       have been fixed upstream and we assume that the man pages are
       generated from the XML files)
+    - Disable patches now applied upstream:
+      002, 336
   * Debconf translation updates:
     - German updated. Closes: #321761
 

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2005-08-17 07:59:56 UTC (rev 441)
+++ branches/experimental/debian/patches/series	2005-08-17 08:01:56 UTC (rev 442)
@@ -2,7 +2,8 @@
 # 002_more-i18n.dpatch
 004_configure.in.dpatch
 005_manpages.dpatch
-336_chfn.1
+# 336 has been applied upstream
+# 336_chfn.1
 # 338_lastlog.8  # applied -- the authors should be separated. Submitted
 441_manpages-shadow.5
 440_manpages-login.1