[arch-commits] Commit in policykit/repos (3 files)

[Jan de Groot]

    Date: Sunday, November 30, 2008 @ 09:51:52
  Author: jgc
Revision: 20117

Merged revisions 19090,19093,20113,20116 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/policykit/trunk

........
  r19090 | jgc | 2008-11-14 21:42:35 +0000 (Fri, 14 Nov 2008) | 2 lines
  
  upgpkg: policykit 0.9-6
      Remove hal config file, this belongs to hal, not policykit
........
  r19093 | jgc | 2008-11-14 21:43:07 +0000 (Fri, 14 Nov 2008) | 2 lines
  
  Remove file
........
  r20113 | jgc | 2008-11-30 14:49:13 +0000 (Sun, 30 Nov 2008) | 2 lines
  
  upgpkg: policykit 0.9-7
      Fix parts of FS#11827
........
  r20116 | jgc | 2008-11-30 14:51:35 +0000 (Sun, 30 Nov 2008) | 1 line
  
  upgpkg: policykit 0.9-7
........

Modified:
  policykit/repos/extra-i686/	(properties)
  policykit/repos/extra-i686/PKGBUILD
Deleted:
  policykit/repos/extra-i686/org.freedesktop.hal.power-management.policy

---------------------------------------------+
 PKGBUILD                                    |   15 ++++++--------
 org.freedesktop.hal.power-management.policy |   27 --------------------------
 2 files changed, 7 insertions(+), 35 deletions(-)


Property changes on: policykit/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /policykit/trunk:1-14739
   + /policykit/trunk:1-20116

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-30 14:51:35 UTC (rev 20116)
+++ extra-i686/PKGBUILD	2008-11-30 14:51:52 UTC (rev 20117)
@@ -3,23 +3,23 @@
 
 pkgname=policykit
 pkgver=0.9
-pkgrel=5
-pkgdesc="Hardware Abstraction Layer"
+pkgrel=7
+pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64)
 license=('custom')
 url="http://hal.freedesktop.org/docs/PolicyKit/"
 depends=('dbus-glib>=0.76' 'expat>=2.0.1' 'pam')
-makedepends=('intltool')
+makedepends=('intltool' 'docbook-xsl')
 options=('!libtool')
+backup=('etc/PolicyKit/PolicyKit.conf')
 install=policykit.install
 source=(http://hal.freedesktop.org/releases/PolicyKit-${pkgver}.tar.gz
-	    polkit.pam pk-ck-api-change.patch
-        org.freedesktop.hal.power-management.policy)
+	polkit.pam
+	pk-ck-api-change.patch)
 
 md5sums=('802fd13ae41f73d79359e5ecb0a98716'
          '6564f95878297b954f0572bc1610dd15'
-         '15b42b41e98410d8d7ec4f91d0cff190'
-         'd84122a5fbaab0d7c1a6eaa36b9c0838')
+         '15b42b41e98410d8d7ec4f91d0cff190')
 
 build() {
   cd ${srcdir}/PolicyKit-${pkgver}
@@ -35,5 +35,4 @@
 
   rm -rf ${pkgdir}/etc/profile.d
   install -m644 ${srcdir}/polkit.pam ${pkgdir}/etc/pam.d/polkit || return 1
-  install -m644 ${srcdir}/org.freedesktop.hal.power-management.policy ${pkgdir}/usr/share/PolicyKit/policy/
 }

Deleted: extra-i686/org.freedesktop.hal.power-management.policy
===================================================================
--- extra-i686/org.freedesktop.hal.power-management.policy	2008-11-30 14:51:35 UTC (rev 20116)
+++ extra-i686/org.freedesktop.hal.power-management.policy	2008-11-30 14:51:52 UTC (rev 20117)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE policyconfig PUBLIC
- "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
-
-<policyconfig>
-
-  <action id="org.freedesktop.hal.power-management.suspend">
-    <description>Suspend the system</description>
-    <message>System policy prevents suspending the system</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-  <action id="org.freedesktop.hal.power-management.hibernate">
-    <description>Hibernate the system</description>
-    <message>System policy prevents hibernating the system</message>
-    <defaults>
-      <allow_inactive>no</allow_inactive>
-      <allow_active>yes</allow_active>
-    </defaults>
-  </action>
-
-
-</policyconfig>