[arch-commits] Commit in xfce4-session/trunk (3 files)

[Evangelos Foutras]

    Date: Wednesday, November 2, 2011 @ 11:10:28
  Author: foutrelis
Revision: 141721

upgpkg: xfce4-session 4.8.2-2

Remove .pkla files; shutdown/suspend/etc should continue to work for people with correct ConsoleKit sessions.

Modified:
  xfce4-session/trunk/PKGBUILD
Deleted:
  xfce4-session/trunk/org.freedesktop.consolekit.pkla
  xfce4-session/trunk/org.freedesktop.upower.pkla

---------------------------------+
 PKGBUILD                        |   21 +++------------------
 org.freedesktop.consolekit.pkla |   31 -------------------------------
 org.freedesktop.upower.pkla     |   15 ---------------
 3 files changed, 3 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-02 15:09:38 UTC (rev 141720)
+++ PKGBUILD	2011-11-02 15:10:28 UTC (rev 141721)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-session
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -17,16 +17,10 @@
 makedepends=('intltool')
 optdepends=('fortune-mod: for xfce4-tips')
 replaces=('xfce4-toys')
-backup=(etc/polkit-1/localauthority/50-local.d/org.freedesktop.consolekit.pkla
-        etc/polkit-1/localauthority/50-local.d/org.freedesktop.upower.pkla)
 options=('!libtool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2
-        org.freedesktop.consolekit.pkla
-        org.freedesktop.upower.pkla)
-sha1sums=('636c2983552861a959225e554898675152a4d812'
-          '378eb741d4cf31a721dd37d15196cff7dc7cd064'
-          '2f2f70824ebaf61554754b8ec2e995646e4a97c2')
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -50,16 +44,7 @@
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make DESTDIR="$pkgdir" install
-
-  # install polkit/consolekit permission file needed for usage without a
-  # display manager
-  install -dm700 "$pkgdir/etc/polkit-1/localauthority"
-  install -d "$pkgdir/etc/polkit-1/localauthority/50-local.d"
-  install -m644 -t "$pkgdir/etc/polkit-1/localauthority/50-local.d/" \
-    "$srcdir"/org.freedesktop.{consolekit,upower}.pkla
 }
 
-
 # vim:set ts=2 sw=2 et:

Deleted: org.freedesktop.consolekit.pkla
===================================================================
--- org.freedesktop.consolekit.pkla	2011-11-02 15:09:38 UTC (rev 141720)
+++ org.freedesktop.consolekit.pkla	2011-11-02 15:10:28 UTC (rev 141721)
@@ -1,31 +0,0 @@
-[Local restart]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.restart
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local shutdown]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.stop
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local restart - multiple]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.restart-multiple-users
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local shutdown - multiple]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.consolekit.system.stop-multiple-users
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes

Deleted: org.freedesktop.upower.pkla
===================================================================
--- org.freedesktop.upower.pkla	2011-11-02 15:09:38 UTC (rev 141720)
+++ org.freedesktop.upower.pkla	2011-11-02 15:10:28 UTC (rev 141721)
@@ -1,15 +0,0 @@
-[Local hibernate]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.upower.hibernate
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes
-
-[Local suspend]
-#Identity=unix-user: your_username
-Identity=unix-group:power
-Action=org.freedesktop.upower.suspend
-ResultAny=yes
-ResultInactive=no
-ResultActive=yes