[Pkg-shadow-commits] r1066 - in trunk/debian: . patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-08-04 20:59:21 +0000 (Fri, 04 Aug 2006)
New Revision: 1066

Added:
   trunk/debian/patches/498_man_nonpam_undefined
Modified:
   trunk/debian/changelog
   trunk/debian/patches/series
Log:
Add patch 498_man_nonpam_undefined t ofix a build failure.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-08-04 20:58:15 UTC (rev 1065)
+++ trunk/debian/changelog	2006-08-04 20:59:21 UTC (rev 1066)
@@ -6,6 +6,7 @@
     - 497_non_numerical_identifier: In useradd and usermod, only numerical
       group identifiers were supported.
       Closes: #381394, #381399, #381404, #381408, #381448
+    - 498_man_nonpam_undefined: Fix a build failure.
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Fri,  4 Aug 2006 18:50:53 +0200
 

Added: trunk/debian/patches/498_man_nonpam_undefined
===================================================================
--- trunk/debian/patches/498_man_nonpam_undefined	2006-08-04 20:58:15 UTC (rev 1065)
+++ trunk/debian/patches/498_man_nonpam_undefined	2006-08-04 20:59:21 UTC (rev 1066)
@@ -0,0 +1,42 @@
+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-08-04 19:22:37.000000000 +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-04 19:26:20.000000000 +0200
++++ shadow-4.0.18.1/man/it/Makefile.am	2006-08-04 19:26:26.000000000 +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-04 19:24:40.000000000 +0200
++++ shadow-4.0.18.1/man/it/Makefile.in	2006-08-04 19:24:53.000000000 +0200
+@@ -215,7 +215,7 @@
+ 
+ EXTRA_DIST = \
+ 	$(man_MANS) \
+-	$(man_nonpam) \
++	$(man_nopam) \
+ 	id.1
+ 
+ subdir = man/it

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-08-04 20:58:15 UTC (rev 1065)
+++ trunk/debian/patches/series	2006-08-04 20:59:21 UTC (rev 1066)
@@ -38,3 +38,4 @@
 495_salt_stack_smash
 496_login_init_session
 497_non_numerical_identifier
+498_man_nonpam_undefined