[arch-commits] Commit in lightdm/trunk (4 files)
Maxime Gauduin
alucryd at nymeria.archlinux.org
Wed Mar 13 18:50:57 UTC 2013
Date: Wednesday, March 13, 2013 @ 19:50:57
Author: alucryd
Revision: 86228
upgpkg: lightdm 1.5.1-6
Added:
lightdm/trunk/xsession
Modified:
lightdm/trunk/PKGBUILD
lightdm/trunk/lightdm-default-config.patch
Deleted:
lightdm/trunk/Xsession
------------------------------+
PKGBUILD | 10 ++---
Xsession | 73 -----------------------------------------
lightdm-default-config.patch | 2 -
xsession | 73 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 79 insertions(+), 79 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-13 18:31:03 UTC (rev 86227)
+++ PKGBUILD 2013-03-13 18:50:57 UTC (rev 86228)
@@ -5,7 +5,7 @@
pkgbase=lightdm
pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
pkgver=1.5.1
-pkgrel=5
+pkgrel=6
pkgdesc="A lightweight display manager"
arch=('i686' 'x86_64')
url="https://launchpad.net/lightdm"
@@ -21,17 +21,17 @@
'lightdm-default-config.patch'
'lightdm-1.5.1-systemd_login1_power.patch'
'lightdm-lock-screen-before-switch.patch'
- 'Xsession')
+ 'xsession')
sha256sums=('645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86'
'2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125'
'ec10378992907f06a6960c4644aba2f81744fbcaf38f6bdc7c364979be3207e4'
'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
'cd0a9591b61118c6de1b07e1cd9a1b74cd74e9e95288f8b41eba32e26fd22023'
'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
- '4bb044fc1d0524535e108627197facf95687dc21acde5ad77799d97ad16bb3eb'
+ '51ec7eb1c50c0ba0b96b846662707533ebc1d6558cea75cb7424afddf0d064f0'
'8c8432294d361475293852f45673bc042eb252dbc58a17445fd10e5e874dc608'
'4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
- '66e12ef7ed34df78f8c17fb211b9e25f33446a2a702c34141f4917d6413ce883')
+ '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
build() {
cd "${srcdir}"/${pkgbase}-${pkgver}
@@ -61,7 +61,7 @@
# Install
make DESTDIR="${pkgdir}" install
make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
- install -m 755 ../Xsession "${pkgdir}"/etc/lightdm/Xsession
+ install -m 755 ../xsession "${pkgdir}"/etc/lightdm/xsession
rm -rf "${pkgdir}"/etc/init
# PAM
Deleted: Xsession
===================================================================
--- Xsession 2013-03-13 18:31:03 UTC (rev 86227)
+++ Xsession 2013-03-13 18:50:57 UTC (rev 86228)
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# LightDM wrapper to run around X sessions.
-
-echo "Running X session wrapper"
-
-# Load profile
-for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
- if [ -f "$file" ]; then
- echo "Loading profile from $file";
- . "$file"
- fi
-done
-
-# Load resources
-for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
- if [ -f "$file" ]; then
- echo "Loading resource: $file"
- xrdb -nocpp -merge "$file"
- fi
-done
-
-# Load keymaps
-for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
- if [ -f "$file" ]; then
- echo "Loading keymap: $file"
- setxkbmap `cat "$file"`
- XKB_IN_USE=yes
- fi
-done
-
-# Load xmodmap if not using XKB
-if [ -z "$XKB_IN_USE" ]; then
- for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
- if [ -f "$file" ]; then
- echo "Loading modmap: $file"
- xmodmap "$file"
- fi
- done
-fi
-
-unset XKB_IN_USE
-
-# Run all system xinitrc shell scripts.
-xinitdir="/etc/X11/xinit/xinitrc.d"
-if [ -d "$xinitdir" ]; then
- for script in $xinitdir/*; do
- echo "Loading xinit script $script"
- if [ -x "$script" -a ! -d "$script" ]; then
- . "$script"
- fi
- done
-fi
-
-# Load Xsession scripts
-xsessionddir="/etc/X11/Xsession.d"
-if [ -d "$xsessionddir" ]; then
- for i in `ls $xsessionddir`; do
- script="$xsessionddir/$i"
- echo "Loading X session script $script"
- if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
- . "$script"
- fi
- done
-fi
-if [ -x "$HOME/.Xsession" -a -f "$HOME/.Xsession" ]; then
- echo "Loading user X session script"
- . "$HOME/.Xsession"
-fi
-
-echo "X session wrapper complete, running session $@"
-
-exec $@
Modified: lightdm-default-config.patch
===================================================================
--- lightdm-default-config.patch 2013-03-13 18:31:03 UTC (rev 86227)
+++ lightdm-default-config.patch 2013-03-13 18:50:57 UTC (rev 86228)
@@ -15,7 +15,7 @@
#allow-guest=true
#guest-session=UNIMPLEMENTED
-#session-wrapper=lightdm-session
-+session-wrapper=/etc/lightdm/Xsession
++session-wrapper=/etc/lightdm/xsession
#display-setup-script=
#greeter-setup-script=
#session-setup-script=
Added: xsession
===================================================================
--- xsession (rev 0)
+++ xsession 2013-03-13 18:50:57 UTC (rev 86228)
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# LightDM wrapper to run around X sessions.
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+ if [ -f "$file" ]; then
+ echo "Loading profile from $file";
+ . "$file"
+ fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+ if [ -f "$file" ]; then
+ echo "Loading resource: $file"
+ xrdb -nocpp -merge "$file"
+ fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+ if [ -f "$file" ]; then
+ echo "Loading keymap: $file"
+ setxkbmap `cat "$file"`
+ XKB_IN_USE=yes
+ fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+ for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+ if [ -f "$file" ]; then
+ echo "Loading modmap: $file"
+ xmodmap "$file"
+ fi
+ done
+fi
+
+unset XKB_IN_USE
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+ for script in $xinitdir/*; do
+ echo "Loading xinit script $script"
+ if [ -x "$script" -a ! -d "$script" ]; then
+ . "$script"
+ fi
+ done
+fi
+
+# Load xsession scripts
+xsessionddir="/etc/X11/xsession.d"
+if [ -d "$xsessionddir" ]; then
+ for i in `ls $xsessionddir`; do
+ script="$xsessionddir/$i"
+ echo "Loading X session script $script"
+ if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+ . "$script"
+ fi
+ done
+fi
+if [ -x "$HOME/.xsession" -a -f "$HOME/.xsession" ]; then
+ echo "Loading user X session script"
+ . "$HOME/.xsession"
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $@
Property changes on: lightdm/trunk/xsession
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
More information about the arch-commits
mailing list