[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r2005 - in trunk/debian: . scripts



Author: fabbione
Date: 2004-11-03 00:33:19 -0500 (Wed, 03 Nov 2004)
New Revision: 2005

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
   trunk/debian/rules
   trunk/debian/scripts/validate-posix-sh
Log:
Use validate-posix-sh instead of sh.
Increase verbosity of validate-posix-sh warnings.

(Branden: usual $boilerplate. Revert if you don't like)

PS the call to validate-posix-sh via sh avoids horror stories if the script is
   not 755 yet. (as it happens if you call directly ./debian/rules genscripts)



Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2004-11-02 11:21:14 UTC (rev 2004)
+++ trunk/debian/CHANGESETS	2004-11-03 05:33:19 UTC (rev 2005)
@@ -221,7 +221,8 @@
 Tidy up and make consistent all Debian-specific manpages.
     1964, 2002
 
-Add simple sanity check on generated maintainer scripts.
-    2004
+Add simple sanity check on generated maintainer scripts at buildtime and
+slightly increase verbosity of validate-posix-sh warnings.
+    2004, 2005
 
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-11-02 11:21:14 UTC (rev 2004)
+++ trunk/debian/changelog	2004-11-03 05:33:19 UTC (rev 2005)
@@ -186,7 +186,8 @@
 
   * Fix nl_BE locale alias information.
 
-  * Add simple sanity check on generated maintainer scripts.
+  * Add simple sanity check on generated maintainer scripts at buildtime and
+    slightly increase verbosity of validate-posix-sh warnings.
 
  -- Branden Robinson <branden@debian.org>  Sun, 31 Oct 2004 02:22:48 -0500
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2004-11-02 11:21:14 UTC (rev 2004)
+++ trunk/debian/rules	2004-11-03 05:33:19 UTC (rev 2005)
@@ -186,9 +186,7 @@
 	   debian/xserver-xfree86-dbg.templates
 	
 	# perform simple sanity check on generated maintainer scripts.
-	for FILE in debian/*.config debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm; do \
-	    sh -n "$$FILE"; \
-	done
+	sh debian/scripts/validate-posix-sh debian/*.config debian/*.postinst debian/*.postrm debian/*.preinst debian/*.prerm
 
 	touch $@
 

Modified: trunk/debian/scripts/validate-posix-sh
===================================================================
--- trunk/debian/scripts/validate-posix-sh	2004-11-02 11:21:14 UTC (rev 2004)
+++ trunk/debian/scripts/validate-posix-sh	2004-11-03 05:33:19 UTC (rev 2005)
@@ -46,7 +46,7 @@
                 echo "$PROGNAME: \"$1\" failed syntax check with $CMD"
             fi
         else
-            warn "cannot verify correctness with $CMD; shell not available"
+            warn "cannot verify correctness of \"$1\" with $CMD; shell not available"
         fi
     done
     shift



Reply to: