← Back to branch summary

~swt-techie/ubuntu/utopic/ddclient/bug-1068884

« back to all changes in this revision

Viewing changes to debian/ddclient.init

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2006-09-06 13:59:29 UTC
  • Revision ID: james.westby@ubuntu.com-20060906135929-o7svqeyvlygt2jch
Tags: 3.6.7-2ubuntu2
* debian/ddclient.init: Fix incomplete merge
  (Closes Ubuntu: #59219).
* debian/control: Fix lintian error regarding B-D-I.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/ddclient.init
76
76
        log_begin_msg "Restarting $DESC..."
77
77
        #start-stop-daemon --stop --quiet --pidfile \
78
78
        #       /var/run/$NAME.pid --exec $DAEMON -- $OPTIONS
79
 
<<<<<<< ddclient-3.6.2-6ubuntu1 (ubuntu)
80
79
        $0 stop
81
 
        sleep 1
82
80
        $0 start || log_end_msg 1
83
 
=======
84
 
        $0 stop >/dev/null
85
 
        $0 start >/dev/null
86
 
>>>>>>> ddclient-3.6.7-2 (debian)
87
81
        #start-stop-daemon --start --quiet --pidfile \
88
82
        #/var/run/$NAME.pid --exec $DAEMON -- $OPTIONS
89
83
        log_end_msg 0