lp:~logan/ubuntu/raring/couchdb/debian-merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/raring/couchdb at revision 71

Didier Roche-Tolomelli: Approve on 2013-01-09

Ubuntu branches: Pending requested 2012-12-25

Diff: 216 lines (+116/-8)

10 files modified

.pc/applied-patches (+3/-0)
bin/couchdb.tpl.in (+1/-1)
debian/changelog (+19/-0)
debian/patches/couchdb_own_rundir.patch (+7/-5)
debian/patches/couchdb_sighup.patch (+22/-0)
debian/patches/logrotate_as_couchdb.patch (+16/-0)
debian/patches/series (+3/-0)
debian/patches/wait_for_couchdb_stop.patch (+30/-0)
etc/init/couchdb.tpl.in (+13/-2)
etc/logrotate.d/couchdb.tpl.in (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

71. By Logan Rosen on 2012-12-25

* Merge from Debian unstable. Remaining changes:
  - debian/rules, debian/control: Split couchdb and couchdb-bin.
  - debian/postinst: Rename to couchdb-bin.postinst.
  - debian/couchdb-bin.postrm: Don't try to delete couchdb system
    user/group.
* Rework couchdb own run directory (updates: #681549).
* Use SIGTERM instead of SIGHUP for graceful shutdown (closes: #692295).
* Wait until complete stop of service.
* Use couchdb user for logrotate (closes: #652172).

70. By Steve Langasek on 2012-07-31

releasing version 1.2.0-2ubuntu1

69. By Steve Langasek on 2012-07-31

Document a bug fix

68. By Steve Langasek on 2012-07-31

fixes ownership of /etc/couchdb.

67. By Steve Langasek on 2012-07-31

Merge from Debian unstable (LP: #1022515, LP: #817656), remaining changes:

66. By Steve Langasek on 2012-07-31

we really do need to pass -Ncouchdb-bin to dh_installinit, since otherwise
something's getting confused and adding handling to the maintainer scripts
in a package that contains no init scripts

65. By Steve Langasek on 2012-07-31

Merge from Debian unstable (LP: #1022515), remaining changes:

64. By Steve Langasek on 2012-07-31

meh, get my dpkg --compare-versions usage right

63. By Steve Langasek on 2012-07-31

Yes, this has to point to debian/tmp, not to debian/couchdb, since it
otherwise fails if the dir doesn't exist... even though we don't actually
care about removing this dir.

62. By Jason Gerard DeRose on 2012-07-31

Added a short sleep delay in couchdb.postrm so couchdb is more likely to
have actually terminated by the time we `deluser couchdb`, which is needed
for `sudo apt-get purge couchdb` to work when couchdb is running