Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xorg
Commits:
05e681b6 by Timo Aaltonen at 2019-09-11T08:15:08Z
x11-common.dirs: Add etc/X11/xorg.conf.d for config snippets.
- - - - -
4e760f21 by Iain Lane at 2019-09-11T08:34:01Z
20x11-common_process-args: Find the first word of our startup program for
$STARTUP
It's valid for this to be a full invocation, with arguments, but for our
purposes we only care what the executable was.
- - - - -
3 changed files:
- debian/changelog
- debian/local/Xsession.d/20x11-common_process-args
- debian/x11-common.dirs
Changes:
=====================================
debian/changelog
=====================================
@@ -7,6 +7,14 @@ xorg (1:7.7+20) UNRELEASED; urgency=medium
* Let xorg-dev depend on x11proto-dev rather than on the transional
x11-proto-*-dev packages (Closes: #906537).
+ [ Timo Aaltonen ]
+ * x11-common.dirs: Add etc/X11/xorg.conf.d for config snippets.
+
+ [ Iain Lane ]
+ * 20x11-common_process-args: Find the first word of our startup program for
+ $STARTUP. It's valid for this to be a full invocation, with arguments, but
+ for our purposes we only care what the executable was.
+
-- Julien Cristau <jcris...@debian.org> Sat, 13 Jan 2018 15:34:33 +0100
xorg (1:7.7+19) unstable; urgency=high
=====================================
debian/local/Xsession.d/20x11-common_process-args
=====================================
@@ -45,7 +45,7 @@ case $# in
;;
*)
# Specific program was requested.
- STARTUP_FULL_PATH=$(/usr/bin/which "$1" || true)
+ STARTUP_FULL_PATH=$(/usr/bin/which "${1%% *}" || true)
if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
if [ -x "$STARTUP_FULL_PATH" ]; then
STARTUP="$1"
=====================================
debian/x11-common.dirs
=====================================
@@ -1,3 +1,4 @@
+etc/X11/xorg.conf.d
etc/X11/Xresources
etc/X11/Xreset.d
etc/X11/Xsession.d
View it on GitLab:
https://salsa.debian.org/xorg-team/xorg/compare/cc98185234a65786caf93530823f8106141a988c...4e760f217643d8419d4d24a3ebb2b61ac74cf990
--
View it on GitLab:
https://salsa.debian.org/xorg-team/xorg/compare/cc98185234a65786caf93530823f8106141a988c...4e760f217643d8419d4d24a3ebb2b61ac74cf990
You're receiving this email because of your account on salsa.debian.org.
