The following commit has been merged in the master branch: commit 4221a23f5146c288301d2dcddabaa01f53d2034e Author: James Page <james.p...@ubuntu.com> Date: Mon Feb 25 11:59:20 2013 +0000
d/rules,zookeeperd.upstart: Rejig now that debhelper in Debian and Ubuntu does the right things with init and upstart configs. diff --git a/debian/changelog b/debian/changelog index ed7e4b7..ad90bc0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -zookeeper (3.4.5+dfsg-1~exp1) UNRELEASED; urgency=low +zookeeper (3.4.5+dfsg-1~exp1) experimental; urgency=low * New upstream release (Closes: #699120, LP: #1107400, #954160): - d/p/ZOOKEEPER-{1374,1033}: Dropped, included upstream. @@ -13,6 +13,8 @@ zookeeper (3.4.5+dfsg-1~exp1) UNRELEASED; urgency=low - d/rules: Only execute native test suite on i386 and amd64 architectures; its a bit racey and does not execute reliably on others. + * d/rules,zookeeperd.upstart: Rejig now that debhelper in Debian and + Ubuntu does the right things with init and upstart configs. -- James Page <james.p...@ubuntu.com> Thu, 07 Feb 2013 10:48:31 +0000 diff --git a/debian/rules b/debian/rules index 77d363b..3dc5525 100755 --- a/debian/rules +++ b/debian/rules @@ -135,9 +135,5 @@ override_dh_installdocs: -plibzookeeper-st2 -plibzookeeper-st-dev endif -# Install init script for Debian and upstart for Ubuntu override_dh_installinit: - if dpkg-vendor --derives-from ubuntu ; then \ - cp debian/zookeeperd.upstart.in debian/zookeeperd.upstart ; \ - fi dh_installinit -d diff --git a/debian/zookeeperd.upstart.in b/debian/zookeeperd.upstart similarity index 100% rename from debian/zookeeperd.upstart.in rename to debian/zookeeperd.upstart -- Apache ZooKeeper _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits