[Pkg-cups-devel] r49 - cupsys/trunk/debian
Kenshi Muto
kmuto at costa.debian.org
Mon Dec 12 15:06:24 UTC 2005
Author: kmuto
Date: Mon Dec 12 15:06:22 2005
New Revision: 49
Modified:
cupsys/trunk/debian/changelog
cupsys/trunk/debian/cupsys.postinst
cupsys/trunk/debian/cupsys.templates
Log:
copied around configuration routine from cupsys-1.2
Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog (original)
+++ cupsys/trunk/debian/changelog Mon Dec 12 15:06:22 2005
@@ -12,7 +12,6 @@
/etc/cups/cups.d/ports.conf: Port/Listen configuration.
/etc/cups/cups.d/browse.conf: Browsing configuration
- Migration will be done automatically.
You can configure these values by using "dpkg-reconfigure cupsys".
(closes: #235906, #297695, #178838, #288838)
Modified: cupsys/trunk/debian/cupsys.postinst
==============================================================================
--- cupsys/trunk/debian/cupsys.postinst (original)
+++ cupsys/trunk/debian/cupsys.postinst Mon Dec 12 15:06:22 2005
@@ -43,6 +43,7 @@
if [ -n "`pidof /usr/sbin/cupsd`" ]; then
echo "Killing cupsys..."
kill -9 `pidof /usr/sbin/cupsd` || true
+ sleep 1
fi
fi
if [ -n "`ps aux | grep /usr/sbin/cupsd | grep -v grep`" ]; then
@@ -214,15 +215,6 @@
else
echo "Browsing off" > /etc/cups/cups.d/browse.conf
fi
-
- grep -v "^\(Browsing\|Port\|Listen\)[[:space:]]" /etc/cups/cupsd.conf > /etc/cups/cupsd.conf.$$
- if [ -z "$(grep -e "^Include[[:space:]]\+/etc/cups/cups.d/ports.conf" /etc/cups/cupsd.conf.$$)" ]; then
- echo "Include /etc/cups/cups.d/ports.conf" >> /etc/cups/cupsd.conf.$$
- fi
- if [ -z "$(grep -e "^Include[[:space:]]\+/etc/cups/cups.d/browse.conf" /etc/cups/cupsd.conf.$$)" ]; then
- echo "Include /etc/cups/cups.d/browse.conf" >> /etc/cups/cupsd.conf.$$
- fi
- mv /etc/cups/cupsd.conf.$$ /etc/cups/cupsd.conf
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: cupsys/trunk/debian/cupsys.templates
==============================================================================
--- cupsys/trunk/debian/cupsys.templates (original)
+++ cupsys/trunk/debian/cupsys.templates Mon Dec 12 15:06:22 2005
@@ -51,7 +51,7 @@
Template: cupsys/browse
Type: boolean
-Default: yes
+Default: true
_Description: Do you want to broadcast and/or listen for CUPS printer information on the network?
CUPS daemon can broadcast printer information for clients on the network,
and detect printers on the network automatically.
More information about the Pkg-cups-devel
mailing list