Bug#604068: unblock: policykit-1/0.96-4

[Michael Biebl <biebl@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception

Please unblock package policykit-1

It contains an important change to make policykit work properly when
installed in root-less/sudo mode.

policykit-1 (0.96-4) unstable; urgency=low

  * debian/rules
    - When building for Debian, install a localauthority.conf.d configuration
      file which considers "sudo" group users as administrators.
      (Closes: #532499)

 -- Michael Biebl <biebl@debian.org>  Tue, 16 Nov 2010 23:21:50 +0100

debdiff is attached

Michael

unblock policykit-1/0.96-4

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff --git a/debian/changelog b/debian/changelog
index 6b679df..64719b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+policykit-1 (0.96-4) unstable; urgency=low
+
+  * debian/rules
+    - When building for Debian, install a localauthority.conf.d configuration
+      file which considers "sudo" group users as administrators.
+      (Closes: #532499)
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 16 Nov 2010 23:21:50 +0100
+
 policykit-1 (0.96-3) unstable; urgency=low
 
   * debian/control
diff --git a/debian/rules b/debian/rules
index 4f8abb7..b60d289 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,12 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc \
                              --enable-man-pages \
                              --enable-introspection=no
 
+DISTRO := $(shell lsb_release -is 2>/dev/null)
+
 binary-install/policykit-1::
-	# when building for Ubuntu, allow the admin group
-	if [ "`lsb_release -is 2>/dev/null`" = "Ubuntu" ]; then \
+	# when building for Ubuntu, allow the admin group, on Debian use sudo group
+	if [ "$(DISTRO)" = "Ubuntu" ]; then \
 	    /bin/echo -e "[Configuration]\nAdminIdentities=unix-group:admin" > debian/policykit-1/etc/polkit-1/localauthority.conf.d/51-ubuntu-admin.conf; \
+	elif [ "$(DISTRO)" = "Debian" ]; then \
+	    /bin/echo -e "[Configuration]\nAdminIdentities=unix-group:sudo" > debian/policykit-1/etc/polkit-1/localauthority.conf.d/51-debian-sudo.conf; \
 	fi