X Strike Force XFree86 SVN commit: r2083 - in trunk/debian: . local local/Xsession.d
Author: branden
Date: 2004-12-18 20:53:31 -0500 (Sat, 18 Dec 2004)
New Revision: 2083
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/control
trunk/debian/local/Xsession
trunk/debian/local/Xsession.5
trunk/debian/local/Xsession.d/30xfree86-common_xresources
Log:
Drop run_parts() function in Xsession scripts in favor of "run-parts
--list". Update Xsession(5) manual page accordingly. Increment
xfree86-common's versioned dependency on debianutils from (>= 1.13) to
(>= 1.16.9). (Closes: #283764)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-12-19 01:12:33 UTC (rev 2082)
+++ trunk/debian/CHANGESETS 2004-12-19 01:53:31 UTC (rev 2083)
@@ -18,4 +18,10 @@
(Closes: #282760)
2080
+Drop run_parts() function in Xsession scripts in favor of "run-parts
+--list". Update Xsession(5) manual page accordingly. Increment
+xfree86-common's versioned dependency on debianutils from (>= 1.13) to
+(>= 1.16.9). (Closes: #283764)
+ 2083
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-12-19 01:12:33 UTC (rev 2082)
+++ trunk/debian/changelog 2004-12-19 01:53:31 UTC (rev 2083)
@@ -12,8 +12,13 @@
+ Fix documented syntax of the "-geometry" option's argument.
(Closes: #282760)
- -- Branden Robinson <branden@debian.org> Sat, 18 Dec 2004 19:06:19 -0500
+ * Drop run_parts() function in Xsession scripts in favor of "run-parts
+ --list". Update Xsession(5) manual page accordingly. Increment
+ xfree86-common's versioned dependency on debianutils from (>= 1.13) to
+ (>= 1.16.9). (Closes: #283764)
+ -- Branden Robinson <branden@debian.org> Sat, 18 Dec 2004 20:48:55 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2004-12-19 01:12:33 UTC (rev 2082)
+++ trunk/debian/control 2004-12-19 01:53:31 UTC (rev 2083)
@@ -1191,7 +1191,7 @@
Package: xfree86-common
Architecture: all
-Depends: debconf (>= 1.2.9), debianutils (>= 1.13)
+Depends: debconf (>= 1.2.9), debianutils (>= 1.16.9)
Suggests: x-window-system-core | x-window-system
Conflicts: xbase (<< 3.3.2.3a-2), task-x-window-system-core, task-x-window-system
Replaces: xbase (<< 3.3.2.3a-9), xlib6g-dev (<< 4.0), xmanpages (<< 3.3.4), xstd, xserver-common (<< 4.0)
Modified: trunk/debian/local/Xsession
===================================================================
--- trunk/debian/local/Xsession 2004-12-19 01:12:33 UTC (rev 2082)
+++ trunk/debian/local/Xsession 2004-12-19 01:53:31 UTC (rev 2083)
@@ -47,24 +47,6 @@
"<debian-x@lists.debian.org>."
}
-run_parts () {
- # until run-parts --noexec is implemented
- if [ -z "$1" ]; then
- internal_errormsg "run_parts() called without an argument."
- fi
- if [ ! -d "$1" ]; then
- internal_errormsg "run_parts() called, but \"$1\" does not exist or is" \
- "not a directory."
- fi
- for F in $(ls $1); do
- if expr "$F" : '[[:alnum:]_-]\+$' > /dev/null 2>&1; then
- if [ -f "$1/$F" ]; then
- echo "$1/$F"
- fi
- fi
- done
-}
-
# initialize variables for use by all session scripts
OPTIONFILE=/etc/X11/Xsession.options
@@ -112,11 +94,11 @@
fi
rm -f "$WRITE_TEST"
-# use run-parts to source every file in the session directory; we source
+# Use run-parts to source every file in the session directory; we source
# instead of executing so that the variables and functions defined above
# are available to the scripts, and so that they can pass variables to each
-# other
-SESSIONFILES=$(run_parts $SYSSESSIONDIR)
+# other.
+SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
if [ -n "$SESSIONFILES" ]; then
for SESSIONFILE in $SESSIONFILES; do
. $SESSIONFILE
Modified: trunk/debian/local/Xsession.5
===================================================================
--- trunk/debian/local/Xsession.5 2004-12-19 01:12:33 UTC (rev 2082)
+++ trunk/debian/local/Xsession.5 2004-12-19 01:53:31 UTC (rev 2083)
@@ -146,10 +146,10 @@
If it does not, the script aborts.
After the script directory is confirmed to be present,
.I Xsession
-uses an internal implementation of
+uses
.BR run\-parts (1)
-to identify files in that directory that should be sourced (executed) in
-the shell's environment.
+to identify files in that directory that should be sourced (executed) in the
+shell's environment.
Only files named in a certain way are sourced; see the
.B run\-parts
manual page for a description of valid characters in the filename.
@@ -168,7 +168,6 @@
.TP
.I /etc/X11/Xsession.d/30xfree86\-common_xresources
X resources are merged.
-The internal
.B run\-parts
is again used, this time to identify files in the
.I /etc/X11/Xresources
Modified: trunk/debian/local/Xsession.d/30xfree86-common_xresources
===================================================================
--- trunk/debian/local/Xsession.d/30xfree86-common_xresources 2004-12-19 01:12:33 UTC (rev 2082)
+++ trunk/debian/local/Xsession.d/30xfree86-common_xresources 2004-12-19 01:53:31 UTC (rev 2083)
@@ -6,7 +6,7 @@
# Then merge the user's X resources, if the options file is so configured.
if which xrdb >/dev/null 2>&1; then
if [ -d "$SYSRESOURCES" ]; then
- RESOURCEFILES=$(run_parts $SYSRESOURCES)
+ RESOURCEFILES=$(run-parts --list $SYSRESOURCES)
if [ -n "$RESOURCEFILES" ]; then
for RESOURCEFILE in $RESOURCEFILES; do
xrdb -merge $RESOURCEFILE
Reply to: