Merge lp:~wb-munzinger/ubuntu/precise/havp/fix-init-script into lp:ubuntu/precise/havp

[David Weber]

Fixes the restart and reload problem.

[Dimitri John Ledkov (xnox)]

* please finalise changelog entry with target distribution (e.g. precise-proposed)
* please use the version number suitable for Stable Release Updates, e.g. best practice version numbering scheme is https://wiki.ubuntu.com/SecurityTeam/UpdatePreparation#Update_the_packaging
* please update the maintainer line as the source package fails to build when above is done (e.g. update-maintainer command may help)

Above basically means that you really want two branches/debdiffs if you want this fix in quantal & precise.

review: Needs Fixing

[lp:~wb-munzinger/ubuntu/precise/havp/fix-init-script]

24. By David Weber on 2012-10-02

Fix init script restart and force-reload

25. By David Weber on 2012-10-02

update init-script

[Oliver Grawert (ogra)]

looks fine, is there an SRU bug for it ? if so you should mention it in the changelog.

review: Needs Information

[David Weber (wb-munzinger)]

> looks fine, is there an SRU bug for it ? if so you should mention it in the
> changelog.
There is no SRU bug so far. Should I create one or can this be uploaded without?

[Jamie Strandboge (jdstrand)]

David, you need to create the SRU bug. Please follow the guidelines in https://wiki.ubuntu.com/StableReleaseUpdates.

[David Weber (wb-munzinger)]

I created a SRU Bug report at https://bugs.launchpad.net/ubuntu/+source/havp/+bug/1073574

[James Hunt (jamesodhunt)]

Unclear why this MP hasn't auto-closed since it relates to a released branch. Maybe it needs an approval :)

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-19 12:25:29 +0000
+++ debian/changelog	2012-10-02 13:05:34 +0000
@@ -1,3 +1,9 @@
+havp (0.92a-2ubuntu0.1) precise-proposed; urgency=low
+
+  * Fix init script restart and force-reload
+
+ -- David Weber <[e-mail]>  Mon, 24 Sep 2012 10:43:19 +0200
+
 havp (0.92a-2) unstable; urgency=low
 
   * Include debconf language updates from previous NMU and new updates.

=== modified file 'debian/control'
--- debian/control	2011-04-06 17:42:05 +0000
+++ debian/control	2012-10-02 13:05:34 +0000
@@ -1,7 +1,8 @@
 Source: havp
 Section: net
 Priority: optional
-Maintainer: Rene Mayrhofer <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Rene Mayrhofer <[e-mail]>
 Build-Depends: debhelper (>= 4.0.0), autotools-dev, libssl-dev, libclamav-dev, dpatch, docbook-to-man, po-debconf
 Standards-Version: 3.8.1
 

=== modified file 'debian/havp.init'
--- debian/havp.init	2011-05-19 12:25:29 +0000
+++ debian/havp.init	2012-10-02 13:05:34 +0000
@@ -87,7 +87,7 @@
 	#
 	echo "Reloading $DESC configuration files."
 	start-stop-daemon --stop --signal 1 --quiet --pidfile \
-	      /var/run/$NAME.pid --exec $DAEMON || true
+	      $PIDFILE --exec $DAEMON || true
   ;;
   restart|force-reload)
 	#
@@ -95,9 +95,9 @@
 	#	option to the "reload" entry above. If not, "force-reload" is
 	#	just the same as "restart".
 	#
-+	$0 stop
+	$0 stop
 	sleep 1
-+	$0 start
+	$0 start
 	;;
   status)
         if [ ! -r $PIDFILE ]; then

=== modified file 'debian/patches/03_havp.config.dpatch' (properties changed: -x to +x)
=== modified file 'debian/patches/04_params.cpp.dpatch' (properties changed: -x to +x)
=== modified file 'debian/patches/05_add_ssltimeout_option.dpatch' (properties changed: -x to +x)