debian/changelog | 4 +++- debian/local/Xsession | 20 +------------------- 2 files changed, 4 insertions(+), 20 deletions(-)
New commits: commit 01a7eb250bfcf9d4535959bfd186316fa3207cc6 Author: David Nusinow <[EMAIL PROTECTED]> Date: Sun Dec 30 22:57:38 2007 -0500 * Use run-parts --list instead of a custom run_parts function. Thanks Vagrant Cascadi for the patch. Closes: #458345, #457606 diff --git a/debian/changelog b/debian/changelog index c2cd2b5..410a309 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,8 +27,10 @@ xorg (1:7.3+9) UNRELEASED; urgency=low + Adds 40x11-common_xsessionrc to /etc/X11/Xsession.d + Document this in Xsession.5 manpage + Add a NEWS.Debian entry about it + * Use run-parts --list instead of a custom run_parts function. + Thanks Vagrant Cascadi for the patch. Closes: #458345, #457606 - -- David Nusinow <[EMAIL PROTECTED]> Sun, 30 Dec 2007 22:23:39 -0500 + -- David Nusinow <[EMAIL PROTECTED]> Sun, 30 Dec 2007 22:52:58 -0500 xorg (1:7.3+8) unstable; urgency=low diff --git a/debian/local/Xsession b/debian/local/Xsession index 246ee90..6ad7d6e 100644 --- a/debian/local/Xsession +++ b/debian/local/Xsession @@ -47,24 +47,6 @@ internal_errormsg () { "<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 $(/bin/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 @@ -117,7 +99,7 @@ rm -f "$WRITE_TEST" # 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) +SESSIONFILES=$(run-parts --list $SYSSESSIONDIR) if [ -n "$SESSIONFILES" ]; then set +e for SESSIONFILE in $SESSIONFILES; do -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]