[Pkg-cups-devel] r206 - cupsys/branches/cups-1.2-ubuntu/debian
Martin Pitt
mpitt at costa.debian.org
Tue Apr 25 13:48:57 UTC 2006
Author: mpitt
Date: Tue Apr 25 13:48:47 2006
New Revision: 206
Modified:
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
Log:
* debian/cupsys.postinst: If upgrading from Breezy, adapt the inclusion of
external browsing configuration in cupsd.conf to retain the correct
setting for modified cupsd.conf files.
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Tue Apr 25 13:48:47 2006
@@ -13,8 +13,11 @@
moved to /etc/cups/cups.d/.
* debian/cupsys.postrm: Clean up passwd.md5 on purge.
* debian/cupsys.init.d: Pre-create error_log, too, and clean up code a bit.
+ * debian/cupsys.postinst: If upgrading from Breezy, adapt the inclusion of
+ external browsing configuration in cupsd.conf to retain the correct
+ setting for modified cupsd.conf files.
- -- Martin Pitt <martin.pitt at ubuntu.com> Tue, 25 Apr 2006 13:00:31 +0200
+ -- Martin Pitt <martin.pitt at ubuntu.com> Tue, 25 Apr 2006 15:20:06 +0200
cupsys (1.1.99.rc2-0ubuntu2) dapper; urgency=low
Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.postinst Tue Apr 25 13:48:47 2006
@@ -190,6 +190,13 @@
else
/bin/echo "Browsing off" > /etc/cups/cups.d/browse.conf
fi
+
+ # fix browse.conf Include directive for upgrades
+ if dpkg --compare-versions "$2" le-nl "1.1.23-10ubuntu4" &&
+ test -e /etc/cups/cupsd.conf &&
+ grep -q '^Include cupsd-browsing.conf\>' /etc/cups/cupsd.conf; then
+ sed -i 's_^Include cupsd-browsing.conf_Include /etc/cups/cups.d/browse.conf_' /etc/cups/cupsd.conf
+ fi
;;
abort-upgrade|abort-remove|abort-deconfigure)
More information about the Pkg-cups-devel
mailing list