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

X Strike Force X.Org X11 SVN commit: r118 - in trunk/debian: . local



Author: dnusinow
Date: 2005-05-16 22:47:00 -0500 (Mon, 16 May 2005)
New Revision: 118

Modified:
   trunk/debian/changelog
   trunk/debian/local/xvfb-run
Log:
Merge changes from xfree tree to local/xvfb-run

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-05-17 03:46:11 UTC (rev 117)
+++ trunk/debian/changelog	2005-05-17 03:47:00 UTC (rev 118)
@@ -26,6 +26,7 @@
         - dexconf.1
         - FAQ.xhtml
         - xterm.faq.html
+        - xvfb-run
 
     - Re-add jisx0208.1983-0.enc.gz to MANIFEST.all's list of font encodings
       until I know more about why it was removed.

Modified: trunk/debian/local/xvfb-run
===================================================================
--- trunk/debian/local/xvfb-run	2005-05-17 03:46:11 UTC (rev 117)
+++ trunk/debian/local/xvfb-run	2005-05-17 03:47:00 UTC (rev 118)
@@ -69,7 +69,10 @@
 
 # Find a free server number by looking at .X*-lock files in /tmp.
 find_free_servernum() {
-    local i
+    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
+    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
+    # anyway.
+    #local i
 
     i=$SERVERNUM
     while [ -f /tmp/.X$i-lock ]; do



Reply to: