Timo Aaltonen pushed to branch debian-unstable at X Strike Force / xorg
Commits:
3 changed files:
Changes:
| ... | ... | @@ -7,6 +7,14 @@ xorg (1:7.7+20) UNRELEASED; urgency=medium |
| 7 | 7 |
* Let xorg-dev depend on x11proto-dev rather than on the transional
|
| 8 | 8 |
x11-proto-*-dev packages (Closes: #906537).
|
| 9 | 9 |
|
| 10 |
+ [ Timo Aaltonen ]
|
|
| 11 |
+ * x11-common.dirs: Add etc/X11/xorg.conf.d for config snippets.
|
|
| 12 |
+ |
|
| 13 |
+ [ Iain Lane ]
|
|
| 14 |
+ * 20x11-common_process-args: Find the first word of our startup program for
|
|
| 15 |
+ $STARTUP. It's valid for this to be a full invocation, with arguments, but
|
|
| 16 |
+ for our purposes we only care what the executable was.
|
|
| 17 |
+ |
|
| 10 | 18 |
-- Julien Cristau <jcristau@debian.org> Sat, 13 Jan 2018 15:34:33 +0100
|
| 11 | 19 |
|
| 12 | 20 |
xorg (1:7.7+19) unstable; urgency=high
|
| ... | ... | @@ -45,7 +45,7 @@ case $# in |
| 45 | 45 |
;;
|
| 46 | 46 |
*)
|
| 47 | 47 |
# Specific program was requested.
|
| 48 |
- STARTUP_FULL_PATH=$(/usr/bin/which "$1" || true)
|
|
| 48 |
+ STARTUP_FULL_PATH=$(/usr/bin/which "${1%% *}" || true)
|
|
| 49 | 49 |
if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
|
| 50 | 50 |
if [ -x "$STARTUP_FULL_PATH" ]; then
|
| 51 | 51 |
STARTUP="$1"
|
| 1 |
+etc/X11/xorg.conf.d
|
|
| 1 | 2 |
etc/X11/Xresources
|
| 2 | 3 |
etc/X11/Xreset.d
|
| 3 | 4 |
etc/X11/Xsession.d
|