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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-05-17 13:16:05 +0000 (Thu, 17 May 2007)
New Revision: 1190

Modified:
   trunk/debian/changelog
   trunk/debian/patches/498_man_nonpam_undefined
Log:
Do not patch the generated man/it/Makefile.in.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-05-15 21:42:45 UTC (rev 1189)
+++ trunk/debian/changelog	2007-05-17 13:16:05 UTC (rev 1190)
@@ -6,6 +6,8 @@
     Add the various copyrights from Marek, Andrzej and Tomasz
     (deduced from the ChangeLog entries as upstream doesn't have an
      explicit copyright file)
+  * Debian packaging fixes:
+    - 498_man_nonpam_undefined: Do not patch the generated man/it/Makefile.in.
     
 
  -- Christian Perrier <bubulle at debian.org>  Tue, 15 May 2007 23:40:13 +0200

Modified: trunk/debian/patches/498_man_nonpam_undefined
===================================================================
--- trunk/debian/patches/498_man_nonpam_undefined	2007-05-15 21:42:45 UTC (rev 1189)
+++ trunk/debian/patches/498_man_nonpam_undefined	2007-05-17 13:16:05 UTC (rev 1190)
@@ -1,9 +1,6 @@
 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
@@ -27,16 +24,3 @@
 -	$(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:25:29.035623079 +0200
-@@ -205,7 +205,7 @@
- 
- EXTRA_DIST = \
- 	$(man_MANS) \
--	$(man_nonpam) \
-+	$(man_nopam) \
- 	id.1
- 
- all: all-am