X Strike Force X.Org X11 SVN commit: r110 - in trunk/debian: . scripts
Author: dnusinow
Date: 2005-05-16 22:25:40 -0500 (Mon, 16 May 2005)
New Revision: 110
Modified:
trunk/debian/changelog
trunk/debian/scripts/manifest-install-reconcile
Log:
Merge changes from xfree tree to scripts/manifest-install-reconcile
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-05-17 03:22:47 UTC (rev 109)
+++ trunk/debian/changelog 2005-05-17 03:25:40 UTC (rev 110)
@@ -18,6 +18,7 @@
Replace logging with echo's like in xfree script.
- Re-add Branden's copyright to xfs.init
- Merge changes from xfree tree in to xserver-common.config.in
+ - Merge changes from xfree tree to scripts/manifest-install-reconcile
- 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/scripts/manifest-install-reconcile
===================================================================
--- trunk/debian/scripts/manifest-install-reconcile 2005-05-17 03:22:47 UTC (rev 109)
+++ trunk/debian/scripts/manifest-install-reconcile 2005-05-17 03:25:40 UTC (rev 110)
@@ -52,7 +52,10 @@
dump_dh_file () {
# Syntax: dump_dh_file PACKAGE FILETYPE ARCH
- local arch filetype match package
+ # 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 arch filetype match package
package="$1"
filetype="$2"
Reply to: