debian/cups.install: Do not install the unnecessary (and broken) D-BUS

configuration file any more. All cupsd does is to send signals, which are
allowed by default. It does not provide any D-BUS service right now. Also
remove the obsolete file on upgrades in debian/cups.preinst.
(Closes: #510634, LP: #318742)

3 files changed, 10 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 64d61e79..ad64bd29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ cups (1.3.9-16) UNRELEASED; urgency=low
     friends, which was a workaround for a kernel apparmor bug on i386. This is
     fixed in current kernels. Thanks to Kees Cook for pointing this out!
     (LP: #270663)
+  * debian/cups.install: Do not install the unnecessary (and broken) D-BUS
+    configuration file any more. All cupsd does is to send signals, which are
+    allowed by default. It does not provide any D-BUS service right now. Also
+    remove the obsolete file on upgrades in debian/cups.preinst.
+    (Closes: #510634, LP: #318742)
 
  -- Martin Pitt <mpitt@debian.org>  Thu, 19 Mar 2009 11:20:14 +0100
 
diff --git a/debian/cups.install b/debian/cups.install
index 30d0507c..df7cbaab 100644
--- a/debian/cups.install
+++ b/debian/cups.install
@@ -5,7 +5,6 @@ etc/cups/snmp.conf
 etc/cups/ppd
 etc/cups/*.convs
 etc/cups/*.types
-etc/dbus-1/
 usr/lib/cups/backend/* usr/lib/cups/backend-available
 usr/lib/cups/cgi-bin
 usr/lib/cups/monitor
diff --git a/debian/cups.preinst b/debian/cups.preinst
index 0ebf05e9..81025831 100644
--- a/debian/cups.preinst
+++ b/debian/cups.preinst
@@ -65,6 +65,11 @@ case "$1" in
             mv_conffile /etc/pam.d/cupsys /etc/pam.d/cups
             mv_conffile /etc/logrotate.d/cupsys /etc/logrotate.d/cups
         fi
+
+	# does not need d-bus configuration, only sends signals
+	if dpkg --compare-versions "$2" lt-nl '1.3.9-16'; then
+            rm -f /etc/dbus-1/system.d/cups.conf
+	fi
     ;;
 
     abort-upgrade)