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

[Christian Perrier]

Author: bubulle
Date: 2005-08-17 09:33:28 +0000 (Wed, 17 Aug 2005)
New Revision: 461

Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/443_man_it_Makefile.am
   branches/experimental/debian/patches/series
Log:
Disable patch which was applied upstream

Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog	2005-08-17 09:31:02 UTC (rev 460)
+++ branches/experimental/debian/changelog	2005-08-17 09:33:28 UTC (rev 461)
@@ -11,7 +11,7 @@
       have been fixed upstream and we assume that the man pages are
       generated from the XML files)
     - Disable patches now applied upstream:
-      002, 336, 363
+      002, 336, 363, 443_man_it_Makefile.am
   * Debconf translation updates:
     - German updated. Closes: #321761
 

Modified: branches/experimental/debian/patches/443_man_it_Makefile.am
===================================================================
--- branches/experimental/debian/patches/443_man_it_Makefile.am	2005-08-17 09:31:02 UTC (rev 460)
+++ branches/experimental/debian/patches/443_man_it_Makefile.am	2005-08-17 09:33:28 UTC (rev 461)
@@ -1,7 +1,7 @@
 Goal: fix Italian man pages distribution
       (man_MANS was commented out, due to a trailing \)
 
-Status wrt upstream: must be forwarded
+Status wrt upstream: has been applied
 
 Index: shadow-4.0.11.1/man/it/Makefile.am
 ===================================================================

Modified: branches/experimental/debian/patches/series
===================================================================
--- branches/experimental/debian/patches/series	2005-08-17 09:31:02 UTC (rev 460)
+++ branches/experimental/debian/patches/series	2005-08-17 09:33:28 UTC (rev 461)
@@ -134,7 +134,8 @@
 426_grpck_group-gshadow_members_consistency
 427_chage_expiry_0
 442_useradd-O_option
-443_man_it_Makefile.am
+# 443 has been applied in 4.0.12
+# 443_man_it_Makefile.am
 444_missing_Italian_manpages
 362_warning_messages
 443_chage_exit_values