[Pkg-shadow-commits] r1143 - trunk/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2006-10-30 22:57:25 +0100 (Mon, 30 Oct 2006)
New Revision: 1143

Removed:
   trunk/debian/patches/498_man_nonpam_undefined
Modified:
   trunk/debian/patches/series
Log:
This patch has bene included upstream


Deleted: trunk/debian/patches/498_man_nonpam_undefined
===================================================================
--- trunk/debian/patches/498_man_nonpam_undefined	2006-10-28 16:17:59 UTC (rev 1142)
+++ trunk/debian/patches/498_man_nonpam_undefined	2006-10-30 21:57:25 UTC (rev 1143)
@@ -1,42 +0,0 @@
-Goal: man_nonpam was renamed to man_nopam, but is still used in
-      man/sv/Makefile.am and man/it/Makefile.am
-
-Note: this patch patches the .in (otherwise the clean rule fails). Thus
-      building twice from the same source will fail.
-
-Status wrt upstream: not reported yet
-
-Index: shadow-4.0.18.1/man/sv/Makefile.am
-===================================================================
---- shadow-4.0.18.1.orig/man/sv/Makefile.am	2006-08-03 12:13:27.000000000 +0200
-+++ shadow-4.0.18.1/man/sv/Makefile.am	2006-09-17 12:18:15.972180340 +0200
-@@ -54,4 +54,4 @@
- 
- EXTRA_DIST = \
- 	$(man_MANS) \
--	$(man_nonpam)
-+	$(man_nopam)
-Index: shadow-4.0.18.1/man/it/Makefile.am
-===================================================================
---- shadow-4.0.18.1.orig/man/it/Makefile.am	2006-08-03 12:11:59.000000000 +0200
-+++ shadow-4.0.18.1/man/it/Makefile.am	2006-09-17 12:18:15.972180340 +0200
-@@ -46,5 +46,5 @@
-                         
- EXTRA_DIST = \
- 	$(man_MANS) \
--	$(man_nonpam) \
-+	$(man_nopam) \
- 	id.1
-Index: shadow-4.0.18.1/man/it/Makefile.in
-===================================================================
---- shadow-4.0.18.1.orig/man/it/Makefile.in	2006-08-03 12:25:12.000000000 +0200
-+++ shadow-4.0.18.1/man/it/Makefile.in	2006-09-17 12:18:15.976180372 +0200
-@@ -205,7 +205,7 @@
- 
- EXTRA_DIST = \
- 	$(man_MANS) \
--	$(man_nonpam) \
-+	$(man_nopam) \
- 	id.1
- 
- all: all-am

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-10-28 16:17:59 UTC (rev 1142)
+++ trunk/debian/patches/series	2006-10-30 21:57:25 UTC (rev 1143)
@@ -38,7 +38,6 @@
 495_salt_stack_smash
 496_login_init_session
 497_non_numerical_identifier
-498_man_nonpam_undefined
 101_ja
 499_gettext-0.15
 102_de-fix-sorry