[Pkg-cups-devel] r16 - in cupsys/trunk/debian: . patches

Kenshi Muto kmuto at costa.debian.org
Tue Aug 16 12:36:14 UTC 2005


Author: kmuto
Date: Tue Aug 16 12:36:13 2005
New Revision: 16

Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/control
   cupsys/trunk/debian/cupsys.init.d
   cupsys/trunk/debian/patches/00list
Log:
use pid patch instead of making by start-stop-daemon. add ijsgimpprint to Suggests:.

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Tue Aug 16 12:36:13 2005
@@ -8,8 +8,10 @@
     transitional package. (closes: #322018)
   * Add procps to Depends: of cupsys. ps command is used by
     cupsys.postinst.
-  * 47_pid.dpatch: Added a patch to make forked PID file. Needs more
-    review.
+  * 47_pid.dpatch: Added a patch to make forked PID file.
+    Now init script use this file instead of one created by
+    start-stop-daemon.
+    I hope this solves Samba starting bug. (closes: #315017)
 
  -- Kenshi Muto <kmuto at debian.org>  Thu, 28 Jul 2005 11:35:27 +0900
 

Modified: cupsys/trunk/debian/control
==============================================================================
--- cupsys/trunk/debian/control	(original)
+++ cupsys/trunk/debian/control	Tue Aug 16 12:36:13 2005
@@ -14,7 +14,7 @@
 Replaces: cupsys-pstoraster
 Conflicts: cupsys-pstoraster (<< 2)
 Recommends: gs-esp, cupsys-client, smbclient (>= 3.0.9), foomatic-filters
-Suggests: cupsys-bsd, cupsys-driver-gutenprint | cupsys-driver-gimpprint, foomatic-filters-ppds, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified, cups-pdf, hplip
+Suggests: cupsys-bsd, cupsys-driver-gutenprint | cupsys-driver-gimpprint, foomatic-filters-ppds, xpdf-korean | xpdf-japanese | xpdf-chinese-traditional | xpdf-chinese-simplified, cups-pdf, hplip, ijsgutenprint
 Description: Common UNIX Printing System(tm) - server
  The Common UNIX Printing System (or CUPS(tm)) is a printing system and 
  general replacement for lpd and the like.  It supports the Internet 

Modified: cupsys/trunk/debian/cupsys.init.d
==============================================================================
--- cupsys/trunk/debian/cupsys.init.d	(original)
+++ cupsys/trunk/debian/cupsys.init.d	Tue Aug 16 12:36:13 2005
@@ -32,26 +32,23 @@
 	echo -n "Starting $DESC: $NAME"
 	chown root:lpadmin /usr/share/cups/model 2>/dev/null || true
 	chmod 3775 /usr/share/cups/model 2>/dev/null || true
-	start-stop-daemon --start --quiet --background -m --pidfile "$PIDFILE" --exec $DAEMON -- -F
-	sleep 2
+	start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec $DAEMON
 	echo "."
 	;;
   stop)
 	echo -n "Stopping $DESC: $NAME"
-	start-stop-daemon --stop --quiet --user root --retry TERM/10 --oknodo --exec $DAEMON
-	rm -f "$PIDFILE"
+	start-stop-daemon --stop --quiet --user root --retry TERM/10 --oknodo --pidfile $PIDFILE --name $NAME
 	echo "."
 	;;
   reload)
 	echo -n "Reloading $DESC: $NAME"
-	start-stop-daemon --stop --quiet --oknodo --signal 1 --exec $DAEMON
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE --name $NAME --signal 1
 	echo "."
 	;;
   restart|force-reload)
 	echo -n "Restarting $DESC: $NAME"
-	if start-stop-daemon --stop --quiet --user root --retry TERM/10 --oknodo --exec $DAEMON; then
-		start-stop-daemon --start --quiet --background -m --pidfile "$PIDFILE" --exec $DAEMON -- -F
-		sleep 2
+	if start-stop-daemon --stop --quiet --user root --retry TERM/10 --oknodo --pidfile $PIDFILE --name $NAME; then
+		start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec $DAEMON
 	fi
 	echo "."
 	;;

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Tue Aug 16 12:36:13 2005
@@ -24,3 +24,4 @@
 44_fixconfdirperms.dpatch
 45_slashprinternames.dpatch
 46_ppdsdat.dpatch
+47_pid.dpatch



More information about the Pkg-cups-devel mailing list