[Pkg-cups-devel] r535 - cupsys/branches/cups-1.2-ubuntu/debian

[Martin Pitt]

Author: mpitt
Date: Thu Aug  9 19:00:46 2007
New Revision: 535

Log:
merge to trunk

Added:
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.install
      - copied unchanged from r527, /cupsys/trunk/debian/cupsys.install
   cupsys/branches/cups-1.2-ubuntu/debian/presubj
      - copied unchanged from r527, /cupsys/trunk/debian/presubj
Modified:
   cupsys/branches/cups-1.2-ubuntu/debian/changelog
   cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d

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	Thu Aug  9 19:00:46 2007
@@ -1,3 +1,25 @@
+cupsys (1.2.12-3ubuntu1) UNRELEASED; urgency=low
+
+  * Merge latest fixes from Debian unstable. (LP: #29050)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Thu, 09 Aug 2007 20:59:48 +0200
+
+cupsys (1.2.12-3) unstable; urgency=low
+
+  [ Martin-Éric Racine ]
+  * Added presubj script to warn bug reporters to avoid filing Poppler
+    or XPDF security issues, since we don't use that codebase; we call
+    external programs who do and that's where the bug should be filed.
+
+  [ Martin Pitt ]
+  * cupsys.init.d: Remove stray chown'ing to 'cupsys' which does not exist any
+    more. (closes: #436662)
+  * cupsys.init.d: Fix detection of parallel printers when 'lp' is already
+    loaded. (https://launchpad.net/bugs/29050)
+  * debian/cupsys.init.d: Put back 'reload'.
+
+ -- Martin Pitt <mpitt at debian.org>  Thu, 09 Aug 2007 20:47:42 +0200
+
 cupsys (1.2.12-2ubuntu2) gutsy; urgency=low
 
   * cupsys.init.d: Remove stray chown'ing to 'cupsys' which does not exist any

Modified: cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d	(original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/cupsys.init.d	Thu Aug  9 19:00:46 2007
@@ -32,8 +32,7 @@
 
 	mkdir -p `dirname "$PIDFILE"`
 	if [ "$LOAD_LP_MODULE" = "yes" -a -f /usr/lib/cups/backend/parallel \
-             -a -f /proc/devices -a -f /proc/modules -a -x /sbin/modprobe \
-             -a -z "$(grep -e ' lp$' /proc/devices 2>/dev/null)" ]; then
+             -a -f /proc/devices -a -f /proc/modules -a -x /sbin/modprobe ]; then
 	  modprobe -q lp || true
 	  modprobe -q ppdev || true
 	fi
@@ -47,7 +46,12 @@
 	start-stop-daemon --stop --quiet --retry 5 --oknodo --pidfile $PIDFILE --name $NAME
 	log_end_msg $?
 	;;
-  restart|force-reload)
+  reload|force-reload)
+       log_begin_msg "Reloading $DESC: $NAME"
+       start-stop-daemon --stop --quiet --pidfile $PIDFILE --name $NAME --signal 1
+       log_end_msg $?
+       ;;
+  restart)
 	log_begin_msg "Restarting $DESC: $NAME"
 	if start-stop-daemon --stop --quiet --retry 5 --oknodo --pidfile $PIDFILE --name $NAME; then
 		start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec $DAEMON