Merge lp:~jderose/ubuntu/precise/couchdb/1.1.1-low-delta into lp:debian/wheezy/couchdb

Proposed by Jason Gerard DeRose
Status: Needs review
Proposed branch: lp:~jderose/ubuntu/precise/couchdb/1.1.1-low-delta
Merge into: lp:debian/wheezy/couchdb
Diff against target: 171 lines (+70/-17)
7 files modified
debian/changelog (+17/-0)
debian/control (+21/-1)
debian/couchdb-bin.install (+3/-0)
debian/couchdb.install (+7/-0)
debian/couchdb.postinst (+2/-1)
debian/couchdb.postrm (+5/-2)
debian/rules (+15/-13)
To merge this branch: bzr merge lp:~jderose/ubuntu/precise/couchdb/1.1.1-low-delta
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+85389@code.launchpad.net

Description of the change

I don't know if merging into this branch actually works, but the point is I want lp:ubuntu/couchdb to be replaced by what *this* merge produces.

Yes, my merge is like a 70k line diff from lp:ubuntu/couchdb, but it's only around a 160 line diff from lp:debian/wheezy/couchdb... and that was the point :^)

To post a comment you must log in.
26. By Jason Gerard DeRose

Seemingly fixed amd64 PPA build problem by using common-binary-predeb-indep

27. By Jason Gerard DeRose

Made couchdb.install a bit clearer

28. By Jason Gerard DeRose

couchdb now Replaces couchdb-bin (<= 1.0.1-0ubuntu18)

29. By Jason Gerard DeRose

Merged 1.1.1-2 from debian

30. By Jason Gerard DeRose

Appended my changelog entry, now 1.1.1-2ubuntu1

Unmerged revisions

30. By Jason Gerard DeRose

Appended my changelog entry, now 1.1.1-2ubuntu1

29. By Jason Gerard DeRose

Merged 1.1.1-2 from debian

28. By Jason Gerard DeRose

couchdb now Replaces couchdb-bin (<= 1.0.1-0ubuntu18)

27. By Jason Gerard DeRose

Made couchdb.install a bit clearer

26. By Jason Gerard DeRose

Seemingly fixed amd64 PPA build problem by using common-binary-predeb-indep

25. By Jason Gerard DeRose

Made couchdb.install a bit clearer

24. By Jason Gerard DeRose

Updated debian/changelog

23. By Jason Gerard DeRose

Fixed couchdb.postrm so it doesn't remove everything in /etc/couchdb

22. By Jason Gerard DeRose

couchdb-bin now carries /etc/couchdb/default.ini

21. By Jason Gerard DeRose

Renamed postinst, postrm scripts

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-20 06:41:16 +0000
3+++ debian/changelog 2012-07-09 01:33:20 +0000
4@@ -1,3 +1,20 @@
5+couchdb (1.1.1-2ubuntu1) quantal; urgency=low
6+
7+ * Started with branch of 1.1.1-2 from Debian testing
8+ * Split into `couchdb-bin` and `couchdb` packages as found in Ubuntu, with
9+ goal of keeping delta between Debian and Ubuntu as low as possible
10+ * Changes from how split is done in Ubuntu:
11+ - /etc/couchdb/default.ini and /etc/couchdb/default.d are delivered in
12+ `couchdb-bin` and are owned by root
13+ - Only `couchdb` has postinst, postrm scripts, meaning `couchdb-bin` does
14+ not create (or remove) the "couchdb" user/group
15+ * Changes from Debian:
16+ - After couchdb.postinst runs, only /etc/couchdb/local.ini and
17+ /etc/couchdb/local.d are owned by the "couchdb" user, while /etc/couchdb
18+ remains owned by root
19+
20+ -- Jason Gerard DeRose <jderose@novacut.com> Mon, 09 Jul 2012 01:30:32 +0000
21+
22 couchdb (1.1.1-2) unstable; urgency=low
23
24 * Declare correct libmozjs-dev build dependency to make views working again,
25
26=== modified file 'debian/control'
27--- debian/control 2012-03-20 06:41:16 +0000
28+++ debian/control 2012-07-09 01:33:20 +0000
29@@ -17,7 +17,7 @@
30 libreadline-dev
31 Homepage: http://couchdb.apache.org/
32
33-Package: couchdb
34+Package: couchdb-bin
35 Architecture: any
36 Depends: adduser,
37 erlang-base-hipe | erlang-base | ${erlang-abi:Depends},
38@@ -43,3 +43,23 @@
39 that provides means to make HTTP requests. There are a multitude of third-party
40 client libraries that make this even easier for a variety of programming
41 languages and environments.
42+
43+Package: couchdb
44+Architecture: all
45+Replaces: couchdb-bin (<= 1.0.1-0ubuntu18)
46+Depends: couchdb-bin (>= ${binary:Version}), ${misc:Depends}
47+Description: RESTful document oriented database, system DB
48+ Apache CouchDB is a distributed, fault-tolerant and schema-free
49+ document-oriented database accessible via a RESTful HTTP/JSON API. Among other
50+ features, it provides robust, incremental replication with bi-directional
51+ conflict detection and resolution, and is queryable and indexable using a
52+ table-oriented view engine with JavaScript acting as the default view
53+ definition language.
54+ .
55+ CouchDB is written in Erlang, but can be easily accessed from any environment
56+ that provides means to make HTTP requests. There are a multitude of third-party
57+ client libraries that make this even easier for a variety of programming
58+ languages and environments.
59+ .
60+ This package adds init.d script and other items needed for a system-wide
61+ CouchDB instance that is started at boot.
62
63=== added file 'debian/couchdb-bin.install'
64--- debian/couchdb-bin.install 1970-01-01 00:00:00 +0000
65+++ debian/couchdb-bin.install 2012-07-09 01:33:20 +0000
66@@ -0,0 +1,3 @@
67+debian/tmp/usr
68+debian/tmp/etc/couchdb/default.ini
69+debian/tmp/etc/couchdb/default.d
70
71=== added file 'debian/couchdb.install'
72--- debian/couchdb.install 1970-01-01 00:00:00 +0000
73+++ debian/couchdb.install 2012-07-09 01:33:20 +0000
74@@ -0,0 +1,7 @@
75+debian/tmp/etc/init.d
76+debian/tmp/etc/couchdb/local.ini
77+debian/tmp/etc/couchdb/local.d
78+debian/tmp/etc/default
79+debian/tmp/etc/logrotate.d
80+debian/tmp/var
81+
82
83=== renamed file 'debian/postinst' => 'debian/couchdb.postinst'
84--- debian/postinst 2011-08-06 09:33:58 +0000
85+++ debian/couchdb.postinst 2012-07-09 01:33:20 +0000
86@@ -21,7 +21,8 @@
87 echo "The couchdb administrative group must not be root." >&2
88 false
89 fi
90- chown -R couchdb:couchdb /etc/couchdb
91+ chown couchdb:couchdb /etc/couchdb/local.ini
92+ chown -R couchdb:couchdb /etc/couchdb/local.d
93 chown -R couchdb:couchdb /var/lib/couchdb
94 chown -R couchdb:couchdb /var/log/couchdb
95 ;;
96
97=== renamed file 'debian/postrm' => 'debian/couchdb.postrm'
98--- debian/postrm 2011-08-06 09:33:58 +0000
99+++ debian/couchdb.postrm 2012-07-09 01:33:20 +0000
100@@ -10,8 +10,11 @@
101
102 case $1 in
103 purge)
104- if test -d "/etc/couchdb"; then
105- rm -r -f "/etc/couchdb"
106+ if test -f "/etc/couchdb/local.ini"; then
107+ rm "/etc/couchdb/local.ini"
108+ fi
109+ if test -d "/etc/couchdb/local.d"; then
110+ rm -r -f "/etc/couchdb/local.d"
111 fi
112 if test -d "/var/lib/couchdb"; then
113 rm -r -f "/var/lib/couchdb"
114
115=== modified file 'debian/rules'
116--- debian/rules 2012-03-20 06:41:16 +0000
117+++ debian/rules 2012-07-09 01:33:20 +0000
118@@ -12,7 +12,7 @@
119
120 #DEB_CONFIGURE_EXTRA_FLAGS = --enable-js-trunk
121 DEB_INSTALL_DOCS_ALL =
122-DEB_DH_INSTALLINIT_ARGS = --onlyscripts
123+DEB_DH_INSTALLINIT_ARGS = -Ncouchdb-bin --onlyscripts
124
125 LIB = ${localstatedir}/lib/\$${package_identifier}
126
127@@ -21,30 +21,32 @@
128
129 post-patches::
130 sed -i s,$(LIB)$$,$(LIB)/$(DEB_UPSTREAM_VERSION), configure
131- sed -i s,VERSION=%VERSION%$$,VERSION=$(DEB_UPSTREAM_VERSION), debian/postrm
132+ sed -i s,VERSION=%VERSION%$$,VERSION=$(DEB_UPSTREAM_VERSION), debian/couchdb.postrm
133
134 cleanbuilddir::
135 sed -i s,$(LIB)/$(DEB_UPSTREAM_VERSION)$$,$(LIB), configure
136- sed -i s,VERSION=$(DEB_UPSTREAM_VERSION)$$,VERSION=%VERSION%, debian/postrm
137+ sed -i s,VERSION=$(DEB_UPSTREAM_VERSION)$$,VERSION=%VERSION%, debian/couchdb.postrm
138
139 common-binary-post-install-arch::
140- rm -r debian/couchdb/var/run
141- rm -f debian/couchdb/usr/share/doc/couchdb/LICENSE.gz
142- rm -f debian/couchdb/usr/share/doc/couchdb/INSTALL.*
143- rm -f debian/couchdb/usr/lib/couchdb/erlang/lib/couch-*/priv/lib/couch_erl_driver.la
144- rm -f debian/couchdb/usr/share/couchdb/www/script/jquery.js
145- rm -f debian/couchdb/usr/share/couchdb/www/script/jquery.form.js
146- chmod a-x debian/couchdb/usr/share/couchdb/server/main.js
147- sed -i "/dependency_libs/ s/'.*'/''/" `find debian/couchdb -name '*.la'`
148+ rm -r debian/tmp/var/run
149+ rm -f debian/couchdb-bin/usr/share/doc/couchdb/LICENSE.gz
150+ rm -f debian/couchdb-bin/usr/share/doc/couchdb/INSTALL.*
151+ rm -f debian/couchdb-bin/usr/lib/couchdb/erlang/lib/couch-*/priv/lib/couch_erl_driver.la
152+ rm -f debian/couchdb-bin/usr/share/couchdb/www/script/jquery.js
153+ rm -f debian/couchdb-bin/usr/share/couchdb/www/script/jquery.form.js
154+ chmod a-x debian/couchdb-bin/usr/share/couchdb/server/main.js
155+ sed -i "/dependency_libs/ s/'.*'/''/" `find debian/couchdb-bin -name '*.la'`
156 dh_link /usr/share/javascript/jquery/jquery.js /usr/share/couchdb/www/script/jquery.js
157 dh_link /usr/share/javascript/jquery-form/jquery.form.js /usr/share/couchdb/www/script/jquery.form.js
158
159 common-binary-predeb-arch::
160- dh_fixperms debian/couchdb/
161+ dh_fixperms debian/couchdb-bin/
162+ erlang-depends -pcouchdb-bin
163+
164+common-binary-predeb-indep::
165 chmod 660 debian/couchdb/etc/couchdb/local.ini
166 chmod 750 debian/couchdb/var/lib/couchdb
167 chmod 750 debian/couchdb/var/log/couchdb
168- erlang-depends
169
170 # @@ only works from source directory, see #494141
171 .PHONY: get-orig-source

Subscribers

People subscribed via source and target branches