diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-05 15:22:16 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-05 15:22:16 +0100 |
| commit | a6e4eeba56ffd555f912ac1063ed08245e3f43c1 (patch) | |
| tree | 226490e881d29d63e6c81417acd2cf982f5bf132 /community/lxdm | |
| parent | 8147480b059d53d82687090fc1e08b7eaee19917 (diff) | |
| parent | 392d2d86b3657d90c3954a44dd6e3e5a4d12d455 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/virtualbox/PKGBUILD
Diffstat (limited to 'community/lxdm')
| -rw-r--r-- | community/lxdm/PKGBUILD | 8 | ||||
| -rw-r--r-- | community/lxdm/Xsession.patch | 11 | ||||
| -rw-r--r-- | community/lxdm/lxdm.install | 1 |
3 files changed, 17 insertions, 3 deletions
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 786686d64..373ca457b 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58107 2011-11-06 17:20:02Z bpiotrowski $ +# $Id: PKGBUILD 60015 2011-12-03 08:31:47Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=6 +pkgrel=7 pkgdesc="Lightweight Display Manager (part of LXDE)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" @@ -18,11 +18,12 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz" - lxdm.patch lxdm-conf.patch lxdm-pam.patch lxdm-daemon) + lxdm.patch lxdm-conf.patch lxdm-pam.patch Xsession.patch lxdm-daemon) md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' 'baed9055e8825a5511712bc095197519' 'c50dd01b715b0a236407d48066191601' 'b20fe3c8487a039050986d60e45233a9' + 'd2e4a4a22ee2aa1a986be154c647b6c6' '705f394052fdd0dec22e95321d170de0') build() { @@ -32,6 +33,7 @@ build() { patch -Np0 < ../lxdm.patch patch -Np0 < ../lxdm-conf.patch + patch -Np0 < ../Xsession.patch } diff --git a/community/lxdm/Xsession.patch b/community/lxdm/Xsession.patch new file mode 100644 index 000000000..035ff0383 --- /dev/null +++ b/community/lxdm/Xsession.patch @@ -0,0 +1,11 @@ +--- data/Xsession.orig 2011-07-29 15:42:33.000000000 +0200 ++++ data/Xsession 2011-12-03 09:09:14.592876087 +0100 +@@ -9,6 +9,8 @@ + LXSESSION=/usr/bin/startlxde + fi + ++[ -f /etc/profile ] && . /etc/profile ++[ -f ~/.profile ] && . ~/.profile + [ -f /etc/xprofile ] && . /etc/xprofile + [ -f ~/.xprofile ] && . ~/.xprofile + diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install index 522f9e3b1..24edd91a4 100644 --- a/community/lxdm/lxdm.install +++ b/community/lxdm/lxdm.install @@ -5,6 +5,7 @@ post_install() { getent passwd lxdm > /dev/null 2>&1 || useradd -c 'LXDE Display Manager' -u 121 -g lxdm -d /var/lib/lxdm -s /sbin/nologin lxdm passwd -l lxdm > /dev/null chown -R lxdm:lxdm /var/lib/lxdm > /dev/null + chmod +r /etc/lxdm/lxdm.conf } post_upgrade() { |