Ubuntu
couchdb package

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

  1. Precise (12.04)
  2. 1.1.1-low-delta
  3. Merge into wheezy
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.
lp:~jderose/ubuntu/precise/couchdb/1.1.1-low-delta updated
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
=== modified file 'debian/changelog'
--- debian/changelog 2012-03-20 06:41:16 +0000
+++ debian/changelog 2012-07-09 01:33:20 +0000
@@ -1,3 +1,20 @@
1couchdb (1.1.1-2ubuntu1) quantal; urgency=low
2
3 * Started with branch of 1.1.1-2 from Debian testing
4 * Split into `couchdb-bin` and `couchdb` packages as found in Ubuntu, with
5 goal of keeping delta between Debian and Ubuntu as low as possible
6 * Changes from how split is done in Ubuntu:
7 - /etc/couchdb/default.ini and /etc/couchdb/default.d are delivered in
8 `couchdb-bin` and are owned by root
9 - Only `couchdb` has postinst, postrm scripts, meaning `couchdb-bin` does
10 not create (or remove) the "couchdb" user/group
11 * Changes from Debian:
12 - After couchdb.postinst runs, only /etc/couchdb/local.ini and
13 /etc/couchdb/local.d are owned by the "couchdb" user, while /etc/couchdb
14 remains owned by root
15
16 -- Jason Gerard DeRose <jderose@novacut.com> Mon, 09 Jul 2012 01:30:32 +0000
17
1couchdb (1.1.1-2) unstable; urgency=low18couchdb (1.1.1-2) unstable; urgency=low
219
3 * Declare correct libmozjs-dev build dependency to make views working again,20 * Declare correct libmozjs-dev build dependency to make views working again,
421
=== modified file 'debian/control'
--- debian/control 2012-03-20 06:41:16 +0000
+++ debian/control 2012-07-09 01:33:20 +0000
@@ -17,7 +17,7 @@
17 libreadline-dev17 libreadline-dev
18Homepage: http://couchdb.apache.org/18Homepage: http://couchdb.apache.org/
1919
20Package: couchdb20Package: couchdb-bin
21Architecture: any21Architecture: any
22Depends: adduser,22Depends: adduser,
23 erlang-base-hipe | erlang-base | ${erlang-abi:Depends},23 erlang-base-hipe | erlang-base | ${erlang-abi:Depends},
@@ -43,3 +43,23 @@
43 that provides means to make HTTP requests. There are a multitude of third-party43 that provides means to make HTTP requests. There are a multitude of third-party
44 client libraries that make this even easier for a variety of programming44 client libraries that make this even easier for a variety of programming
45 languages and environments.45 languages and environments.
46
47Package: couchdb
48Architecture: all
49Replaces: couchdb-bin (<= 1.0.1-0ubuntu18)
50Depends: couchdb-bin (>= ${binary:Version}), ${misc:Depends}
51Description: RESTful document oriented database, system DB
52 Apache CouchDB is a distributed, fault-tolerant and schema-free
53 document-oriented database accessible via a RESTful HTTP/JSON API. Among other
54 features, it provides robust, incremental replication with bi-directional
55 conflict detection and resolution, and is queryable and indexable using a
56 table-oriented view engine with JavaScript acting as the default view
57 definition language.
58 .
59 CouchDB is written in Erlang, but can be easily accessed from any environment
60 that provides means to make HTTP requests. There are a multitude of third-party
61 client libraries that make this even easier for a variety of programming
62 languages and environments.
63 .
64 This package adds init.d script and other items needed for a system-wide
65 CouchDB instance that is started at boot.
4666
=== added file 'debian/couchdb-bin.install'
--- debian/couchdb-bin.install 1970-01-01 00:00:00 +0000
+++ debian/couchdb-bin.install 2012-07-09 01:33:20 +0000
@@ -0,0 +1,3 @@
1debian/tmp/usr
2debian/tmp/etc/couchdb/default.ini
3debian/tmp/etc/couchdb/default.d
04
=== added file 'debian/couchdb.install'
--- debian/couchdb.install 1970-01-01 00:00:00 +0000
+++ debian/couchdb.install 2012-07-09 01:33:20 +0000
@@ -0,0 +1,7 @@
1debian/tmp/etc/init.d
2debian/tmp/etc/couchdb/local.ini
3debian/tmp/etc/couchdb/local.d
4debian/tmp/etc/default
5debian/tmp/etc/logrotate.d
6debian/tmp/var
7
08
=== renamed file 'debian/postinst' => 'debian/couchdb.postinst'
--- debian/postinst 2011-08-06 09:33:58 +0000
+++ debian/couchdb.postinst 2012-07-09 01:33:20 +0000
@@ -21,7 +21,8 @@
21 echo "The couchdb administrative group must not be root." >&221 echo "The couchdb administrative group must not be root." >&2
22 false22 false
23 fi23 fi
24 chown -R couchdb:couchdb /etc/couchdb24 chown couchdb:couchdb /etc/couchdb/local.ini
25 chown -R couchdb:couchdb /etc/couchdb/local.d
25 chown -R couchdb:couchdb /var/lib/couchdb26 chown -R couchdb:couchdb /var/lib/couchdb
26 chown -R couchdb:couchdb /var/log/couchdb27 chown -R couchdb:couchdb /var/log/couchdb
27 ;;28 ;;
2829
=== renamed file 'debian/postrm' => 'debian/couchdb.postrm'
--- debian/postrm 2011-08-06 09:33:58 +0000
+++ debian/couchdb.postrm 2012-07-09 01:33:20 +0000
@@ -10,8 +10,11 @@
1010
11case $1 in11case $1 in
12 purge)12 purge)
13 if test -d "/etc/couchdb"; then13 if test -f "/etc/couchdb/local.ini"; then
14 rm -r -f "/etc/couchdb" 14 rm "/etc/couchdb/local.ini"
15 fi
16 if test -d "/etc/couchdb/local.d"; then
17 rm -r -f "/etc/couchdb/local.d"
15 fi18 fi
16 if test -d "/var/lib/couchdb"; then19 if test -d "/var/lib/couchdb"; then
17 rm -r -f "/var/lib/couchdb" 20 rm -r -f "/var/lib/couchdb"
1821
=== modified file 'debian/rules'
--- debian/rules 2012-03-20 06:41:16 +0000
+++ debian/rules 2012-07-09 01:33:20 +0000
@@ -12,7 +12,7 @@
1212
13#DEB_CONFIGURE_EXTRA_FLAGS = --enable-js-trunk13#DEB_CONFIGURE_EXTRA_FLAGS = --enable-js-trunk
14DEB_INSTALL_DOCS_ALL =14DEB_INSTALL_DOCS_ALL =
15DEB_DH_INSTALLINIT_ARGS = --onlyscripts15DEB_DH_INSTALLINIT_ARGS = -Ncouchdb-bin --onlyscripts
1616
17LIB = ${localstatedir}/lib/\$${package_identifier}17LIB = ${localstatedir}/lib/\$${package_identifier}
1818
@@ -21,30 +21,32 @@
2121
22post-patches::22post-patches::
23 sed -i s,$(LIB)$$,$(LIB)/$(DEB_UPSTREAM_VERSION), configure23 sed -i s,$(LIB)$$,$(LIB)/$(DEB_UPSTREAM_VERSION), configure
24 sed -i s,VERSION=%VERSION%$$,VERSION=$(DEB_UPSTREAM_VERSION), debian/postrm24 sed -i s,VERSION=%VERSION%$$,VERSION=$(DEB_UPSTREAM_VERSION), debian/couchdb.postrm
2525
26cleanbuilddir::26cleanbuilddir::
27 sed -i s,$(LIB)/$(DEB_UPSTREAM_VERSION)$$,$(LIB), configure27 sed -i s,$(LIB)/$(DEB_UPSTREAM_VERSION)$$,$(LIB), configure
28 sed -i s,VERSION=$(DEB_UPSTREAM_VERSION)$$,VERSION=%VERSION%, debian/postrm28 sed -i s,VERSION=$(DEB_UPSTREAM_VERSION)$$,VERSION=%VERSION%, debian/couchdb.postrm
2929
30common-binary-post-install-arch::30common-binary-post-install-arch::
31 rm -r debian/couchdb/var/run31 rm -r debian/tmp/var/run
32 rm -f debian/couchdb/usr/share/doc/couchdb/LICENSE.gz32 rm -f debian/couchdb-bin/usr/share/doc/couchdb/LICENSE.gz
33 rm -f debian/couchdb/usr/share/doc/couchdb/INSTALL.*33 rm -f debian/couchdb-bin/usr/share/doc/couchdb/INSTALL.*
34 rm -f debian/couchdb/usr/lib/couchdb/erlang/lib/couch-*/priv/lib/couch_erl_driver.la34 rm -f debian/couchdb-bin/usr/lib/couchdb/erlang/lib/couch-*/priv/lib/couch_erl_driver.la
35 rm -f debian/couchdb/usr/share/couchdb/www/script/jquery.js35 rm -f debian/couchdb-bin/usr/share/couchdb/www/script/jquery.js
36 rm -f debian/couchdb/usr/share/couchdb/www/script/jquery.form.js36 rm -f debian/couchdb-bin/usr/share/couchdb/www/script/jquery.form.js
37 chmod a-x debian/couchdb/usr/share/couchdb/server/main.js37 chmod a-x debian/couchdb-bin/usr/share/couchdb/server/main.js
38 sed -i "/dependency_libs/ s/'.*'/''/" `find debian/couchdb -name '*.la'`38 sed -i "/dependency_libs/ s/'.*'/''/" `find debian/couchdb-bin -name '*.la'`
39 dh_link /usr/share/javascript/jquery/jquery.js /usr/share/couchdb/www/script/jquery.js39 dh_link /usr/share/javascript/jquery/jquery.js /usr/share/couchdb/www/script/jquery.js
40 dh_link /usr/share/javascript/jquery-form/jquery.form.js /usr/share/couchdb/www/script/jquery.form.js40 dh_link /usr/share/javascript/jquery-form/jquery.form.js /usr/share/couchdb/www/script/jquery.form.js
4141
42common-binary-predeb-arch::42common-binary-predeb-arch::
43 dh_fixperms debian/couchdb/43 dh_fixperms debian/couchdb-bin/
44 erlang-depends -pcouchdb-bin
45
46common-binary-predeb-indep::
44 chmod 660 debian/couchdb/etc/couchdb/local.ini47 chmod 660 debian/couchdb/etc/couchdb/local.ini
45 chmod 750 debian/couchdb/var/lib/couchdb48 chmod 750 debian/couchdb/var/lib/couchdb
46 chmod 750 debian/couchdb/var/log/couchdb49 chmod 750 debian/couchdb/var/log/couchdb
47 erlang-depends
4850
49# @@ only works from source directory, see #49414151# @@ only works from source directory, see #494141
50.PHONY: get-orig-source52.PHONY: get-orig-source

Subscribers

People subscribed via source and target branches