Commits

Michele Bini  committed f3a5c0f Merge with conflicts

Merge branch 'debian' into dev

Conflicts:
debian/changelog

  • Participants
  • Parent commits 9205c78, eb1e383

Comments (0)

Files changed (2)

File debian/changelog

+timekoin (1.9-deb44) unstable; urgency=low
+
+  * Merged 'dev' branch.
+
+ -- Michele Bini <michele.bini@gmail.com>  Fri, 21 Sep 2012 14:45:58 +0200
+
+timekoin (1.9-deb43-dev11) unstable; urgency=low
+
+  * Improve init.d start-stop messages.
+
+ -- Michele Bini <michele.bini@gmail.com>  Fri, 21 Sep 2012 14:34:20 +0200
+
 timekoin (1.9-deb42-dev10) unstable; urgency=low
 
    * Correctly register and unregister init.d script.

File debian/init.d/timekoin

 NAME="timekoin"
 
 stop_timekoin() {
-    log_daemon_msg "Stopping TimeKoin"
+    log_daemon_msg "Stopping TimeKoin" "timekoin"
     start-stop-daemon --stop --pidfile "$PIDFILE" --quiet --oknodo
     status=$?
     if [ x"$status" = x"0" ]; then
 }
 
 start_timekoin() {
-    log_daemon_msg "Starting TimeKoin"
+    log_daemon_msg "Starting TimeKoin" "timekoin"
 
     cd /usr/share/timekoin/public/
     echo "<?PHP