Merge lp:~clint-fewbar/ubuntu/precise/zookeeper/drop-daemon-dep into lp:ubuntu/precise/zookeeper

[Clint Byrum]

Uses start-stop-daemon to chuser so daemon is not needed

[James Page (james-page)]

Hi Clint

I made a few amends to this MP and uploaded (post testing)

1) I added the --name zookeeper flag to the use of start-stop-daemon in the upstart configuration; as it stood any java process running would block the startup of zookeeper - as a process called zookeeper is never likely to exist start-stop-daemon will always try to start the process!

2) I dropped the control variables generation piece completely as its no longer required.

Thanks for showing the way on using start-stop-daemon with Java and upstart

Cheers

James

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-01 15:03:53 +0000
+++ debian/changelog	2012-01-19 16:21:15 +0000
@@ -1,3 +1,12 @@
+zookeeper (3.3.4+dfsg1-1ubuntu1) UNRELEASED; urgency=low
+
+  * - d/zookeeperd.upstart.in: Change to use start-stop-daemon instead 
+      of daemon.
+    - d/ubuntu_control_vars: remove daemon dependency
+
+
+ -- Clint Byrum <[e-mail]>  Mon, 09 Jan 2012 16:48:15 +0100
+
 zookeeper (3.3.4+dfsg1-1) unstable; urgency=low
 
   [ James Page ]

=== modified file 'debian/control'
--- debian/control	2011-12-01 15:03:53 +0000
+++ debian/control	2012-01-19 16:21:15 +0000
@@ -1,7 +1,8 @@
 Source: zookeeper
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: James Page <[e-mail]>
 Homepage: http://hadoop.apache.org/zookeeper
 Vcs-Browser: http://git.debian.org/?p=pkg-java/zookeeper.git

=== modified file 'debian/ubuntu_control_vars'
--- debian/ubuntu_control_vars	2011-12-01 15:03:53 +0000
+++ debian/ubuntu_control_vars	2012-01-19 16:21:15 +0000
@@ -1,1 +1,1 @@
-zookeeperd-deps= daemon
+zookeeperd-deps= 

=== modified file 'debian/zookeeperd.upstart.in'
--- debian/zookeeperd.upstart.in	2011-12-01 15:03:53 +0000
+++ debian/zookeeperd.upstart.in	2012-01-19 16:21:15 +0000
@@ -21,7 +21,7 @@
     if [ -z "$JMXDISABLE" ]; then
         JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.local.only=$JMXLOCALONLY"
     fi
-    exec daemon --name=zookeeper --inherit --user=$USER \
-    	-- $JAVA -cp $CLASSPATH $JAVA_OPTS -Dzookeeper.log.dir=${ZOO_LOG_DIR} \
+    exec start-stop-daemon --start -c $USER --exec $JAVA \
+    	-- -cp $CLASSPATH $JAVA_OPTS -Dzookeeper.log.dir=${ZOO_LOG_DIR} \
       	-Dzookeeper.root.logger=${ZOO_LOG4J_PROP} $ZOOMAIN $ZOOCFG
 end script