diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-18 12:59:58 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-18 12:59:58 -0300 |
| commit | f04f84ee9902c5aa8a88107bf0461aeef0030b9e (patch) | |
| tree | 18f02f6ddf8d00d97af855dba055f89f615e3939 /extra/slim | |
| parent | f8dc0992fd9d1751e8de891cf74a655c32b8e922 (diff) | |
| parent | 63d179775e063452db6358e15b9847e7fc6c84b6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gummi/PKGBUILD
community-staging/mtpaint/PKGBUILD
community-staging/mtpaint/mtpaint.install
extra/php-xcache/PKGBUILD
kde-unstable/akonadi/PKGBUILD
kde-unstable/kdeedu-kig/PKGBUILD
kde-unstable/kdeedu-rocs/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/slim')
| -rw-r--r-- | extra/slim/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/slim/pam.d | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 70b1ef56a..94d81cc56 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163488 2012-07-13 10:14:32Z tpowa $ +# $Id: PKGBUILD 163599 2012-07-16 15:36:12Z tpowa $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,7 +6,7 @@ pkgname=slim pkgver=1.3.4 -pkgrel=1 +pkgrel=2 pkgdesc='Desktop-independent graphical login manager for X11' arch=('i686' 'x86_64' 'mips64el') url='http://slim.berlios.de/' @@ -55,7 +55,7 @@ package() { } md5sums=('51543533e492b41007811f7d880720fa' 'd8ea9c4dee2811524b67f4f666311a1f' - 'd33edc74724c6ca00445767ce38fc732' + '37ef35079139544d04b8316c7f66f754' '43da096480bf72c3ccec8ad8400f34f0' 'a5d6bde9e63899df7d2081e1585bbe54' 'ebcb6829028615686de7b64ceeaaf8ed' diff --git a/extra/slim/pam.d b/extra/slim/pam.d index 2a875d9e3..59db5a8c5 100644 --- a/extra/slim/pam.d +++ b/extra/slim/pam.d @@ -7,4 +7,4 @@ password required pam_unix.so session required pam_limits.so session required pam_unix.so session optional pam_loginuid.so -session optional pam_systemd.so +-session optional pam_systemd.so |