[Pkg-utopia-commits] r1860 - in /packages/unstable/dbus/debian: changelog dbus.postinst rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Nov 14 16:54:18 2007
New Revision: 1860

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1860
Log:
Revert r1855
Check with dpkg-statoverride if admin has changed permissions locally.

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/dbus.postinst
    packages/unstable/dbus/debian/rules

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=1860&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Wed Nov 14 16:54:18 2007
@@ -1,6 +1,5 @@
 dbus (1.1.2-1) unstable; urgency=low
 
-  [ Michael Biebl ]
   * New upstream release.
   * debian/control
     - Use the new "Homepage:" field to specify the upstream URL.
@@ -13,11 +12,7 @@
     - Install the dbus-daemon-launch-helper binary SUID root and make it
       executable for the messagebus group.
 
-  [ Sjoerd Simons ]
-  * Let dh_fixperms ignore dbus-daemon-launch-helper instead of chowning and
-    chmodding it in postinst
-
- -- Sjoerd Simons <sjoerd at debian.org>  Mon, 05 Nov 2007 19:31:03 +0100
+ -- Michael Biebl <biebl at debian.org>  Mon, 05 Nov 2007 11:59:46 +0100
 
 dbus (1.1.1-3) unstable; urgency=low
 

Modified: packages/unstable/dbus/debian/dbus.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.postinst?rev=1860&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.postinst (original)
+++ packages/unstable/dbus/debian/dbus.postinst Wed Nov 14 16:54:18 2007
@@ -19,4 +19,11 @@
             --ingroup "$MESSAGEUSER" \
             "$MESSAGEUSER"
 
+launcher=/usr/lib/dbus-1.0/dbus-daemon-launch-helper
+
+if ! dpkg-statoverride --list $launcher > /dev/null 2>&1; then
+	chown root:messagebus $launcher
+	chmod 4750 $launcher
+fi
+
 #DEBHELPER#

Modified: packages/unstable/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/rules?rev=1860&op=diff
==============================================================================
--- packages/unstable/dbus/debian/rules (original)
+++ packages/unstable/dbus/debian/rules Wed Nov 14 16:54:18 2007
@@ -11,7 +11,6 @@
 # List any files which are not installed
 common-binary-post-install-arch:: list-missing
 
-DEB_FIXPERMS_EXCLUDE = usr/lib/dbus-1.0/dbus-daemon-launch-helper
 DEB_CONFIGURE_LIBEXECDIR ="\$${prefix}/lib/dbus-1.0"
 
 DEB_CONFIGURE_EXTRA_FLAGS += \