Merge lp:~noskcaj/ubuntu/trusty/xfce4-session/4.10.1-3 into lp:ubuntu/trusty/xfce4-session
- Trusty (14.04)
- 4.10.1-3
- Merge into trusty
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merged at revision: | 75 |
Proposed branch: | lp:~noskcaj/ubuntu/trusty/xfce4-session/4.10.1-3 |
Merge into: | lp:ubuntu/trusty/xfce4-session |
Diff against target: |
413 lines (+291/-9) 14 files modified
.pc/01_fix-xrdb-call.patch/scripts/xinitrc.in.in (+192/-0) .pc/applied-patches (+1/-0) .pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in.in (+1/-1) debian/55xfce4-session (+18/-0) debian/changelog (+53/-0) debian/control (+3/-3) debian/defaults.list (+1/-0) debian/patches/01_fix-xrdb-call.patch (+11/-0) debian/patches/series (+1/-0) debian/rules (+4/-4) debian/xfce4-session.dirs (+2/-0) debian/xfce4-session.install (+2/-0) debian/xfce4-session.links (+1/-0) scripts/xinitrc.in.in (+1/-1) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/trusty/xfce4-session/4.10.1-3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu branches | Pending | ||
Review via email: mp+192405@code.launchpad.net |
Commit message
Description of the change
Merge from debian
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added directory '.pc/01_fix-xrdb-call.patch' |
2 | === added directory '.pc/01_fix-xrdb-call.patch/scripts' |
3 | === added file '.pc/01_fix-xrdb-call.patch/scripts/xinitrc.in.in' |
4 | --- .pc/01_fix-xrdb-call.patch/scripts/xinitrc.in.in 1970-01-01 00:00:00 +0000 |
5 | +++ .pc/01_fix-xrdb-call.patch/scripts/xinitrc.in.in 2013-10-23 21:22:20 +0000 |
6 | @@ -0,0 +1,192 @@ |
7 | +#!/bin/sh |
8 | + |
9 | +# fix broken $UID on some system... |
10 | +if test "x$UID" = "x"; then |
11 | + if test -x /usr/xpg4/bin/id; then |
12 | + UID=`/usr/xpg4/bin/id -u`; |
13 | + else |
14 | + UID=`id -u`; |
15 | + fi |
16 | +fi |
17 | + |
18 | +# set $XDG_MENU_PREFIX to "xfce-" so that "xfce-applications.menu" is picked |
19 | +# over "applications.menu" in all Xfce applications. |
20 | +if test "x$XDG_MENU_PREFIX" = "x"; then |
21 | + XDG_MENU_PREFIX="xfce-" |
22 | + export XDG_MENU_PREFIX |
23 | +fi |
24 | + |
25 | +# set DESKTOP_SESSION so that one can detect easily if an Xfce session is running |
26 | +if test "x$DESKTOP_SESSION" = "x"; then |
27 | + DESKTOP_SESSION="xfce" |
28 | + export DESKTOP_SESSION |
29 | +fi |
30 | + |
31 | +# $XDG_CONFIG_HOME defines the base directory relative to which user specific |
32 | +# configuration files should be stored. If $XDG_CONFIG_HOME is either not set |
33 | +# or empty, a default equal to $HOME/.config should be used. |
34 | +if test "x$XDG_CONFIG_HOME" = "x" ; then |
35 | + XDG_CONFIG_HOME=$HOME/.config |
36 | +fi |
37 | +[ -d "$XDG_CONFIG_HOME" ] || mkdir "$XDG_CONFIG_HOME" |
38 | + |
39 | +# $XDG_CACHE_HOME defines the base directory relative to which user specific |
40 | +# non-essential data files should be stored. If $XDG_CACHE_HOME is either not |
41 | +# set or empty, a default equal to $HOME/.cache should be used. |
42 | +if test "x$XDG_CACHE_HOME" = "x" ; then |
43 | + XDG_CACHE_HOME=$HOME/.cache |
44 | +fi |
45 | +[ -d "$XDG_CACHE_HOME" ] || mkdir "$XDG_CACHE_HOME" |
46 | + |
47 | +# set up XDG user directores. see |
48 | +# http://freedesktop.org/wiki/Software/xdg-user-dirs |
49 | +if which xdg-user-dirs-update >/dev/null 2>&1; then |
50 | + xdg-user-dirs-update |
51 | +fi |
52 | + |
53 | +# Modify libglade and glade environment variables so that |
54 | +# it will find the files installed by Xfce |
55 | +GLADE_CATALOG_PATH="$GLADE_CATALOG_PATH:@XFCE_GLADE_CATALOG_PATH@" |
56 | +GLADE_PIXMAP_PATH="$GLADE_PIXMAP_PATH:@XFCE_GLADE_PIXMAP_PATH@" |
57 | +GLADE_MODULE_PATH="$GLADE_MODULE_PATH:@XFCE_GLADE_MODULE_PATH@" |
58 | +export GLADE_CATALOG_PATH |
59 | +export GLADE_PIXMAP_PATH |
60 | +export GLADE_MODULE_PATH |
61 | + |
62 | +# For now, start with an empty list |
63 | +XRESOURCES="" |
64 | + |
65 | +# Has to go prior to merging Xft.xrdb, as its the "Defaults" file |
66 | +test -r "@_sysconfdir_@/xdg/xfce4/Xft.xrdb" && XRESOURCES="$XRESOURCES @_sysconfdir_@/xdg/xfce4/Xft.xrdb" |
67 | +test -r $HOME/.Xdefaults && XRESOURCES="$XRESOURCES $HOME/.Xdefaults" |
68 | + |
69 | +BASEDIR=$XDG_CONFIG_HOME/xfce4 |
70 | +if test -r "$BASEDIR/Xft.xrdb"; then |
71 | + XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb" |
72 | +elif test -r "$XFCE4HOME/Xft.xrdb"; then |
73 | + mkdir -p "$BASEDIR" |
74 | + cp "$XFCE4HOME/Xft.xrdb" "$BASEDIR"/ |
75 | + XRESOURCES="$XRESOURCES $BASEDIR/Xft.xrdb" |
76 | +fi |
77 | + |
78 | +# merge in X cursor settings |
79 | +test -r "$BASEDIR/Xcursor.xrdb" && XRESOURCES="$XRESOURCES $BASEDIR/Xcursor.xrdb" |
80 | + |
81 | +# ~/.Xresources contains overrides to the above |
82 | +test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources" |
83 | + |
84 | +# load all X resources (adds /dev/null to avoid an empty list that would hang the process) |
85 | +cat /dev/null $XRESOURCES | xrdb -nocpp -merge - |
86 | + |
87 | +# load local modmap |
88 | +test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap |
89 | + |
90 | +# run xfce4-session if installed |
91 | +if which xfce4-session >/dev/null 2>&1; then |
92 | + |
93 | + # check if we start xfce4-session with ck-launch-session. this is only |
94 | + # required for starting from a console, not a login manager |
95 | + if test "x$XFCE4_SESSION_WITH_CK" = "x1"; then |
96 | + if which ck-launch-session >/dev/null 2>&1; then |
97 | + ck-launch-session xfce4-session |
98 | + else |
99 | + echo |
100 | + echo "You have tried to start Xfce with consolekit support, but" |
101 | + echo "ck-launch-session is not installed." |
102 | + echo "Aborted startup..." |
103 | + echo |
104 | + |
105 | + exit 1 |
106 | + fi |
107 | + else |
108 | + # start xfce4-session normally |
109 | + xfce4-session |
110 | + fi |
111 | + |
112 | + exit 0 |
113 | +fi |
114 | + |
115 | +################## |
116 | +# IMPORTANT NOTE # |
117 | +################## |
118 | + |
119 | +# Everything below here ONLY gets executed if you are NOT using xfce4-session |
120 | +# (Xfce's session manager). If you are using the session manager, everything |
121 | +# below is handled by it, and the code below is not executed at all. If you're |
122 | +# not sure if you're using the session manager, type 'ps -e|grep xfce4-session' |
123 | +# in a terminal while Xfce is running. |
124 | + |
125 | +################## |
126 | + |
127 | +# Use dbus-launch if installed. |
128 | +if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then |
129 | + if which dbus-launch >/dev/null 2>&1; then |
130 | + eval `dbus-launch --sh-syntax --exit-with-session` |
131 | + # some older versions of dbus don't export the var properly |
132 | + export DBUS_SESSION_BUS_ADDRESS |
133 | + else |
134 | + echo "Could not find dbus-launch; Xfce will not work properly" >&2 |
135 | + fi |
136 | +fi |
137 | + |
138 | +# this is only necessary when running w/o xfce4-session |
139 | +xsetroot -solid black -cursor_name watch |
140 | + |
141 | +# or use old-fashioned startup script otherwise |
142 | + |
143 | +xfsettingsd & |
144 | +xfwm4 --daemon |
145 | + |
146 | +# start up stuff in $XDG_CONFIG_HOME/autostart/ |
147 | +if test -d "$XDG_CONFIG_HOME/autostart"; then |
148 | + for i in ${XDG_CONFIG_HOME}/autostart/*.desktop; do |
149 | + grep -q -E "^Hidden=true" "$i" && continue |
150 | + if grep -q -E "^OnlyShowIn=" "$i"; then |
151 | + # need to test twice, as lack of the line entirely means we still run it |
152 | + grep -E "^OnlyShowIn=" "$i" | grep -q 'XFCE;' || continue |
153 | + fi |
154 | + grep -E "^NotShowIn=" "$i" | grep -q 'XFCE;' && continue |
155 | + |
156 | + # check for TryExec |
157 | + trycmd=`grep -E "^TryExec=" "$i" | cut -d'=' -f2` |
158 | + if test "$trycmd"; then |
159 | + which "$trycmd" >/dev/null 2>&1 || continue |
160 | + fi |
161 | + |
162 | + cmd=`grep -E "^Exec=" "$i" | cut -d'=' -f2` |
163 | + if test "$cmd" && which "$cmd" >/dev/null 2>&1; then |
164 | + $cmd & |
165 | + fi |
166 | + done |
167 | +fi |
168 | + |
169 | +xfdesktop& |
170 | +orage & |
171 | + |
172 | +panel=`which xfce4-panel` |
173 | +case "x$panel" in |
174 | + x|xno*) |
175 | + ;; |
176 | + *) |
177 | + $panel |
178 | + ret=$? |
179 | + while test $ret -ne 0; do |
180 | + xmessage -center -file - -timeout 20 -title Error <<EOF |
181 | +A crash occured in the panel |
182 | +Please report this to the xfce4-dev@xfce.org list |
183 | +or on http://bugs.xfce.org |
184 | +Meanwhile the panel will be restarted |
185 | +EOF |
186 | + cat >&2 <<EOF |
187 | +A crash occured in the panel |
188 | +Please report this to the xfce4-dev@xfce.org list |
189 | +or on http://bugs.xfce.org |
190 | +Meanwhile the panel will be restarted |
191 | +EOF |
192 | + $panel |
193 | + ret=$? |
194 | + done |
195 | + ;; |
196 | +esac |
197 | + |
198 | +xsetroot -bg white -fg red -solid black -cursor_name watch |
199 | |
200 | === modified file '.pc/applied-patches' |
201 | --- .pc/applied-patches 2013-07-01 19:35:39 +0000 |
202 | +++ .pc/applied-patches 2013-10-23 21:22:20 +0000 |
203 | @@ -1,3 +1,4 @@ |
204 | +01_fix-xrdb-call.patch |
205 | xubuntu_ignore-gdm-lang.patch |
206 | xubuntu_set-xdg-current-desktop.patch |
207 | xubuntu_runtime-logind-support.patch |
208 | |
209 | === modified file '.pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in.in' |
210 | --- .pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in.in 2012-05-18 20:21:52 +0000 |
211 | +++ .pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in.in 2013-10-23 21:22:20 +0000 |
212 | @@ -76,7 +76,7 @@ |
213 | test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources" |
214 | |
215 | # load all X resources (adds /dev/null to avoid an empty list that would hang the process) |
216 | -cat /dev/null $XRESOURCES | xrdb -nocpp -merge - |
217 | +cat /dev/null $XRESOURCES | xrdb -merge - |
218 | |
219 | # load local modmap |
220 | test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap |
221 | |
222 | === added file 'debian/55xfce4-session' |
223 | --- debian/55xfce4-session 1970-01-01 00:00:00 +0000 |
224 | +++ debian/55xfce4-session 2013-10-23 21:22:20 +0000 |
225 | @@ -0,0 +1,18 @@ |
226 | +# For Xfce, we add a directory to XDG_DATA_DIRS |
227 | +# to allow the admin to set, for example, defaults.list properly |
228 | +BASESTARTUP=$(basename "$STARTUP" | cut -d\ -f1) |
229 | +if [ "$BASESTARTUP" = x-session-manager ]; then |
230 | + BASESTARTUP=$(basename $(readlink /etc/alternatives/x-session-manager)) |
231 | +fi |
232 | +case "$BASESTARTUP" in |
233 | + xfce4-session|startxfce4) |
234 | + # We prepend /usr/share/xfce4 since its defaults.list actually points |
235 | + # to /etc so it is configurable. |
236 | + if [ -z "$XDG_DATA_DIRS" ]; then |
237 | + XDG_DATA_DIRS=/usr/share/xfce4:/usr/local/share/:/usr/share/ |
238 | + else |
239 | + XDG_DATA_DIRS=/usr/share/xfce4:"$XDG_DATA_DIRS" |
240 | + fi |
241 | + export XDG_DATA_DIRS |
242 | + ;; |
243 | +esac |
244 | |
245 | === modified file 'debian/changelog' |
246 | --- debian/changelog 2013-07-01 19:35:39 +0000 |
247 | +++ debian/changelog 2013-10-23 21:22:20 +0000 |
248 | @@ -1,3 +1,56 @@ |
249 | +xfce4-session (4.10.1-3ubuntu1) UNRELEASED; urgency=low |
250 | + |
251 | + * Merge from Debian unstable, remaining Ubuntu changes: |
252 | + - debian/patches: |
253 | + + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's |
254 | + already an xsession script to do that, and $GDM_LANG might not contain |
255 | + a valid locale code. |
256 | + + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils, |
257 | + export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and |
258 | + gnome-menus. |
259 | + + debian/patches/xubuntu_runtime-logind-support.patch: |
260 | + Check for logind support at runtime |
261 | + - debian/rules: |
262 | + + call xdt-autogen after patching |
263 | + + clean up autogenerated files modified by xdt-autogen. |
264 | + - debian/control: |
265 | + + add build-dep on libpolkit-gobject-1-dev (>= 0.100). |
266 | + + add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen |
267 | + after patching. |
268 | + + don't recommend consolekit anymore. |
269 | + |
270 | + -- Jackson Doak <noskcaj@ubuntu.com> Thu, 24 Oct 2013 08:09:19 +1100 |
271 | + |
272 | +xfce4-session (4.10.1-3) unstable; urgency=low |
273 | + |
274 | + [ Jackson Doak ] |
275 | + * debian/rules: Use disable-silent-build |
276 | + |
277 | + [ Yves-Alexis Perez ] |
278 | + * debian/patches: |
279 | + - fix file patched in 01_fix-xrdb-call. (really) closes: #648553 |
280 | + * debian/55xfce4-session: |
281 | + - handle case where session is started as startxfce4. closes: #725399 |
282 | + |
283 | + -- Yves-Alexis Perez <corsac@debian.org> Wed, 09 Oct 2013 21:17:35 +0200 |
284 | + |
285 | +xfce4-session (4.10.1-2) unstable; urgency=low |
286 | + |
287 | + [ Evgeni Golov ] |
288 | + * Correct Vcs-* URLs to point to anonscm.debian.org |
289 | + |
290 | + [ Mark Hymers ] |
291 | + * Add /usr/share/xfce4 to XDG_DATA_DIRS and add defaults.list symlink |
292 | + closes: #717875 |
293 | + |
294 | + [ Yves-Alexis Perez ] |
295 | + * debian/control: |
296 | + - update standards version to 3.9.4. |
297 | + * debian/patches: |
298 | + - 01_fix-xrdb-call added, don't call xrdb with -nocpp. closes: #648553 |
299 | + |
300 | + -- Yves-Alexis Perez <corsac@debian.org> Tue, 17 Sep 2013 21:56:28 +0200 |
301 | + |
302 | xfce4-session (4.10.1-1ubuntu1) saucy; urgency=low |
303 | |
304 | * Merge from Debian unstable, remaining Ubuntu changes: |
305 | |
306 | === modified file 'debian/control' |
307 | --- debian/control 2013-07-01 19:35:39 +0000 |
308 | +++ debian/control 2013-10-23 21:22:20 +0000 |
309 | @@ -10,10 +10,10 @@ |
310 | libxfconf-0-dev (>= 4.10.0), libglade2-dev, intltool (>= 0.31), |
311 | libpolkit-gobject-1-dev (>= 0.100), xfce4-dev-tools, libtool, |
312 | dpkg-dev (>= 1.16.1) |
313 | -Standards-Version: 3.9.3 |
314 | +Standards-Version: 3.9.4 |
315 | Homepage: http://www.xfce.org/ |
316 | -Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/ |
317 | -Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/ |
318 | +Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-session/ |
319 | +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/xfce4-session/ |
320 | |
321 | Package: xfce4-session |
322 | Section: xfce |
323 | |
324 | === added file 'debian/defaults.list' |
325 | --- debian/defaults.list 1970-01-01 00:00:00 +0000 |
326 | +++ debian/defaults.list 2013-10-23 21:22:20 +0000 |
327 | @@ -0,0 +1,1 @@ |
328 | +[Default Applications] |
329 | |
330 | === added file 'debian/patches/01_fix-xrdb-call.patch' |
331 | --- debian/patches/01_fix-xrdb-call.patch 1970-01-01 00:00:00 +0000 |
332 | +++ debian/patches/01_fix-xrdb-call.patch 2013-10-23 21:22:20 +0000 |
333 | @@ -0,0 +1,11 @@ |
334 | +--- a/scripts/xinitrc.in.in |
335 | ++++ b/scripts/xinitrc.in.in |
336 | +@@ -76,7 +76,7 @@ test -r "$BASEDIR/Xcursor.xrdb" && XRESO |
337 | + test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources" |
338 | + |
339 | + # load all X resources (adds /dev/null to avoid an empty list that would hang the process) |
340 | +-cat /dev/null $XRESOURCES | xrdb -nocpp -merge - |
341 | ++cat /dev/null $XRESOURCES | xrdb -merge - |
342 | + |
343 | + # load local modmap |
344 | + test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap |
345 | |
346 | === modified file 'debian/patches/series' |
347 | --- debian/patches/series 2013-07-01 19:35:39 +0000 |
348 | +++ debian/patches/series 2013-10-23 21:22:20 +0000 |
349 | @@ -1,3 +1,4 @@ |
350 | +01_fix-xrdb-call.patch |
351 | xubuntu_ignore-gdm-lang.patch |
352 | xubuntu_set-xdg-current-desktop.patch |
353 | xubuntu_runtime-logind-support.patch |
354 | |
355 | === modified file 'debian/rules' |
356 | --- debian/rules 2013-07-01 19:35:39 +0000 |
357 | +++ debian/rules 2013-10-23 21:22:20 +0000 |
358 | @@ -3,10 +3,6 @@ |
359 | export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 |
360 | export DEB_BUILD_MAINT_OPTIONS=hardening=+all |
361 | |
362 | -override_dh_auto_configure: |
363 | - NOCONFIGURE=1 xdt-autogen |
364 | - dh_auto_configure |
365 | - |
366 | override_dh_auto_clean: |
367 | dh_auto_clean |
368 | rm -f $$(find -name 'Makefile.in*') INSTALL ltmain.sh |
369 | @@ -20,5 +16,9 @@ |
370 | override_dh_strip: |
371 | dh_strip --dbg-package=xfce4-session-dbg |
372 | |
373 | +override_dh_auto_configure: |
374 | + NOCONFIGURE=1 xdt-autogen |
375 | + dh_auto_configure -- --disable-silent-rules |
376 | + |
377 | %: |
378 | dh $@ --parallel |
379 | |
380 | === added file 'debian/xfce4-session.dirs' |
381 | --- debian/xfce4-session.dirs 1970-01-01 00:00:00 +0000 |
382 | +++ debian/xfce4-session.dirs 2013-10-23 21:22:20 +0000 |
383 | @@ -0,0 +1,2 @@ |
384 | +etc/xfce4 |
385 | +etc/X11/Xsession.d |
386 | |
387 | === modified file 'debian/xfce4-session.install' |
388 | --- debian/xfce4-session.install 2011-02-15 00:18:12 +0000 |
389 | +++ debian/xfce4-session.install 2013-10-23 21:22:20 +0000 |
390 | @@ -1,2 +1,4 @@ |
391 | usr |
392 | etc |
393 | +debian/defaults.list etc/xfce4/ |
394 | +debian/55xfce4-session etc/X11/Xsession.d/ |
395 | |
396 | === added file 'debian/xfce4-session.links' |
397 | --- debian/xfce4-session.links 1970-01-01 00:00:00 +0000 |
398 | +++ debian/xfce4-session.links 2013-10-23 21:22:20 +0000 |
399 | @@ -0,0 +1,1 @@ |
400 | +etc/xfce4/defaults.list usr/share/xfce4/applications/defaults.list |
401 | |
402 | === modified file 'scripts/xinitrc.in.in' |
403 | --- scripts/xinitrc.in.in 2012-05-18 20:21:52 +0000 |
404 | +++ scripts/xinitrc.in.in 2013-10-23 21:22:20 +0000 |
405 | @@ -82,7 +82,7 @@ |
406 | test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources" |
407 | |
408 | # load all X resources (adds /dev/null to avoid an empty list that would hang the process) |
409 | -cat /dev/null $XRESOURCES | xrdb -nocpp -merge - |
410 | +cat /dev/null $XRESOURCES | xrdb -merge - |
411 | |
412 | # load local modmap |
413 | test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap |