[Python-apps-commits] r2142 - in packages/wicd/trunk/debian (changelog default init rules)

[hanska-guest at users.alioth.debian.org]

    Date: Friday, January 2, 2009 @ 14:02:05
  Author: hanska-guest
Revision: 2142

* debian/rules:
  - binary-arch target emptied, not using it
* debian/default added:
* debian/init updated:
  - don't start wicd during post-installation (Closes: #510457)

Added:
  packages/wicd/trunk/debian/default
Modified:
  packages/wicd/trunk/debian/changelog
  packages/wicd/trunk/debian/init
  packages/wicd/trunk/debian/rules

Modified: packages/wicd/trunk/debian/changelog
===================================================================
--- packages/wicd/trunk/debian/changelog	2009-01-02 12:06:28 UTC (rev 2141)
+++ packages/wicd/trunk/debian/changelog	2009-01-02 14:02:05 UTC (rev 2142)
@@ -7,14 +7,18 @@
       (Closes: #510462)
     - also removing other/55wicd in clean target
     - chmod -x files in /usr/share/wicd/
+    - binary-arch target emptied, not using it
   * debian/{pre,post}rm removed:
     - fix double-{starting,stopping} of wicd, which stopped the daemon 
       from really starting
   * debian/patches/:
     - 00-fix_installation.patch added, some files were not being
       installed (Closes: #510308)
+  * debian/default added:
+  * debian/init updated:
+    - don't start wicd during post-installation (Closes: #510457)
 
- -- David Paleino <d.paleino at gmail.com>  Fri, 02 Jan 2009 12:54:53 +0100
+ -- David Paleino <d.paleino at gmail.com>  Fri, 02 Jan 2009 15:01:28 +0100
 
 wicd (1.5.7-1) unstable; urgency=low
 

Added: packages/wicd/trunk/debian/default
===================================================================
--- packages/wicd/trunk/debian/default	                        (rev 0)
+++ packages/wicd/trunk/debian/default	2009-01-02 14:02:05 UTC (rev 2142)
@@ -0,0 +1,3 @@
+# Don't start the daemon by default, let the user set it.
+# Use "yes" (without quotes) to make /etc/init.d/wicd start the WICD daemon.
+START_DAEMON=no

Modified: packages/wicd/trunk/debian/init
===================================================================
--- packages/wicd/trunk/debian/init	2009-01-02 12:06:28 UTC (rev 2141)
+++ packages/wicd/trunk/debian/init	2009-01-02 14:02:05 UTC (rev 2142)
@@ -103,12 +103,16 @@
 
 case "$1" in
   start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
+	if [ "$START_DAEMON" != no ]; then
+	    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	    do_start
+        case "$?" in
+            0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+            2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+        esac
+	else
+	    log_warning_msg "Not starting wicd daemon. Please edit /etc/default/wicd first."
+	fi
 	;;
   stop)
 	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
@@ -136,12 +140,16 @@
 	do_stop
 	case "$?" in
 	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
+	    if [ "$START_DAEMON" != no ]; then
+	        do_start
+            case "$?" in
+                0) log_end_msg 0 ;;
+                1) log_end_msg 1 ;; # Old process is still running
+                *) log_end_msg 1 ;; # Failed to start
+            esac
+        else
+            log_warning_msg "Not starting wicd daemon. Please edit /etc/default/wicd first."
+        fi
 		;;
 	  *)
 	  	# Failed to stop

Modified: packages/wicd/trunk/debian/rules
===================================================================
--- packages/wicd/trunk/debian/rules	2009-01-02 12:06:28 UTC (rev 2141)
+++ packages/wicd/trunk/debian/rules	2009-01-02 14:02:05 UTC (rev 2142)
@@ -40,9 +40,7 @@
 	rm -rf $(CURDIR)/debian/wicd/usr/lib/python*/
 	dh install --after dh_auto_install
 
-binary-arch: build install
-	dh binary-arch
-
+binary-arch:
 binary-indep: build install
 	dh binary-indep