Merge lp:~jderose/ubuntu/vivid/couchdb/fix-1457464 into lp:ubuntu/vivid/couchdb

[Jason Gerard DeRose]

Not sure if this is an SRU-able change, but this merge adds a couchdb.service file to start CouchDB via systemd, same as will now be done in Wily.

Changes:

* Add debian/couchdb.service

* debian/rules: call dh --with systemd

* debian/control: add `dh-systemd` to Build-Depends

For background, see:
https://bugs.launchpad.net/ubuntu/+source/couchdb/+bug/1457464

[Martin Pitt (pitti)]

Uploaded, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-12 15:40:44 +0000
+++ debian/changelog	2015-07-10 16:46:49 +0000
@@ -1,3 +1,12 @@
+couchdb (1.6.0-0ubuntu5.1) vivid; urgency=medium
+
+  * Add debian/couchdb.service to start system-wide CouchDB instance via
+    systemd (LP: #1457464)
+  * debian/rules: call dh --with systemd
+  * debian/control: Add `dh-systemd` to Build-Depends
+
+ -- Jason Gerard DeRose <[e-mail]>  Fri, 10 Jul 2015 10:33:10 -0600
+
 couchdb (1.6.0-0ubuntu5) vivid; urgency=medium
 
   * debian/rules: Reinstate init.d script, for insserv and systemd

=== modified file 'debian/control'
--- debian/control	2015-01-12 15:40:44 +0000
+++ debian/control	2015-07-10 16:46:49 +0000
@@ -5,6 +5,7 @@
 XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <[e-mail]>
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9),
+               dh-systemd,
                dh-autoreconf,
                pkg-config,
                autoconf-archive,

=== added file 'debian/couchdb.service'
--- debian/couchdb.service	1970-01-01 00:00:00 +0000
+++ debian/couchdb.service	2015-07-10 16:46:49 +0000
@@ -0,0 +1,14 @@
+[Unit]
+Description=System-wide CouchDB instance
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+RuntimeDirectory=couchdb
+User=couchdb
+ExecStart=/usr/bin/couchdb
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+

=== modified file 'debian/rules'
--- debian/rules	2015-01-12 15:40:44 +0000
+++ debian/rules	2015-07-10 16:46:49 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@ --with autoreconf
+	dh $@ --with autoreconf,systemd
 
 override_dh_auto_clean:
 	dh_auto_clean