diff -Nru couchdb-1.1.1/debian/changelog couchdb-1.1.1/debian/changelog --- couchdb-1.1.1/debian/changelog 2011-11-27 02:45:06.000000000 -0700 +++ couchdb-1.1.1/debian/changelog 2012-02-25 18:51:51.000000000 -0700 @@ -1,3 +1,20 @@ +couchdb (1.1.1-1ubuntu1) precise; urgency=low + + * Started with branch of 1.1.1-1 from Debian testing + * Split into `couchdb-bin` and `couchdb` packages as found in Ubuntu, with + goal of keeping delta between Debian and Ubuntu as low as possible + * Changes from how split is done in Ubuntu: + - /etc/couchdb/default.ini and /etc/couchdb/default.d are delivered in + `couchdb-bin` and are owned by root + - Only `couchdb` has postinst, postrm scripts, meaning `couchdb-bin` does + not create (or remove) the "couchdb" user/group + * Changes from Debian: + - After couchdb.postinst runs, only /etc/couchdb/local.ini and + /etc/couchdb/local.d are owned by the "couchdb" user, while /etc/couchdb + remains owned by root + + -- Jason Gerard DeRose Mon, 12 Dec 2011 07:49:41 +0000 + couchdb (1.1.1-1) unstable; urgency=low * New upstream release. diff -Nru couchdb-1.1.1/debian/control couchdb-1.1.1/debian/control --- couchdb-1.1.1/debian/control 2011-11-27 02:33:28.000000000 -0700 +++ couchdb-1.1.1/debian/control 2012-02-25 18:52:47.000000000 -0700 @@ -17,7 +17,7 @@ libreadline-dev Homepage: http://couchdb.apache.org/ -Package: couchdb +Package: couchdb-bin Architecture: any Depends: adduser, erlang-base-hipe | erlang-base | ${erlang-abi:Depends}, @@ -43,3 +43,23 @@ that provides means to make HTTP requests. There are a multitude of third-party client libraries that make this even easier for a variety of programming languages and environments. + +Package: couchdb +Architecture: all +Replaces: couchdb-bin (<= 1.0.1-0ubuntu18) +Depends: couchdb-bin (>= ${binary:Version}), ${misc:Depends} +Description: RESTful document oriented database, system DB + Apache CouchDB is a distributed, fault-tolerant and schema-free + document-oriented database accessible via a RESTful HTTP/JSON API. Among other + features, it provides robust, incremental replication with bi-directional + conflict detection and resolution, and is queryable and indexable using a + table-oriented view engine with JavaScript acting as the default view + definition language. + . + CouchDB is written in Erlang, but can be easily accessed from any environment + that provides means to make HTTP requests. There are a multitude of third-party + client libraries that make this even easier for a variety of programming + languages and environments. + . + This package adds init.d script and other items needed for a system-wide + CouchDB instance that is started at boot. diff -Nru couchdb-1.1.1/debian/couchdb-bin.install couchdb-1.1.1/debian/couchdb-bin.install --- couchdb-1.1.1/debian/couchdb-bin.install 1969-12-31 17:00:00.000000000 -0700 +++ couchdb-1.1.1/debian/couchdb-bin.install 2011-12-11 23:54:48.000000000 -0700 @@ -0,0 +1,3 @@ +debian/tmp/usr +debian/tmp/etc/couchdb/default.ini +debian/tmp/etc/couchdb/default.d diff -Nru couchdb-1.1.1/debian/couchdb.install couchdb-1.1.1/debian/couchdb.install --- couchdb-1.1.1/debian/couchdb.install 1969-12-31 17:00:00.000000000 -0700 +++ couchdb-1.1.1/debian/couchdb.install 2011-12-17 19:55:40.000000000 -0700 @@ -0,0 +1,7 @@ +debian/tmp/etc/init.d +debian/tmp/etc/couchdb/local.ini +debian/tmp/etc/couchdb/local.d +debian/tmp/etc/default +debian/tmp/etc/logrotate.d +debian/tmp/var + diff -Nru couchdb-1.1.1/debian/couchdb.postinst couchdb-1.1.1/debian/couchdb.postinst --- couchdb-1.1.1/debian/couchdb.postinst 1969-12-31 17:00:00.000000000 -0700 +++ couchdb-1.1.1/debian/couchdb.postinst 2011-12-11 23:50:06.000000000 -0700 @@ -0,0 +1,31 @@ +#!/bin/sh -e + +# Copyright 2009, Noah Slater + +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice and this +# notice are preserved. + +case $1 in + configure) + if ! getent passwd couchdb > /dev/null; then + adduser --system --quiet \ + --home /var/lib/couchdb --no-create-home \ + --shell /bin/bash --group --gecos "CouchDB Administrator" couchdb + fi + if test "`id -u couchdb`" -eq 0; then + echo "The couchdb administrative user must not be root." >&2 + false + fi + if test "`id -g couchdb`" -eq 0; then + echo "The couchdb administrative group must not be root." >&2 + false + fi + chown couchdb:couchdb /etc/couchdb/local.ini + chown -R couchdb:couchdb /etc/couchdb/local.d + chown -R couchdb:couchdb /var/lib/couchdb + chown -R couchdb:couchdb /var/log/couchdb + ;; +esac + +#DEBHELPER# diff -Nru couchdb-1.1.1/debian/couchdb.postrm couchdb-1.1.1/debian/couchdb.postrm --- couchdb-1.1.1/debian/couchdb.postrm 1969-12-31 17:00:00.000000000 -0700 +++ couchdb-1.1.1/debian/couchdb.postrm 2012-02-25 19:07:32.000000000 -0700 @@ -0,0 +1,37 @@ +#!/bin/sh -e + +# Copyright 2009, Noah Slater + +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice and this +# notice are preserved. + +VERSION=%VERSION% + +case $1 in + purge) + if test -f "/etc/couchdb/local.ini"; then + rm "/etc/couchdb/local.ini" + fi + if test -d "/etc/couchdb/local.d"; then + rm -r -f "/etc/couchdb/local.d" + fi + if test -d "/var/lib/couchdb"; then + rm -r -f "/var/lib/couchdb" + fi + if test -d "/var/log/couchdb"; then + rm -r -f "/var/log/couchdb" + fi + if test -d "/var/run/couchdb"; then + rm -r -f "/var/run/couchdb" + fi + if getent passwd couchdb > /dev/null && which deluser > /dev/null; then + deluser couchdb + fi + if getent group couchdb > /dev/null && which delgroup > /dev/null; then + delgroup couchdb + fi + ;; +esac + +#DEBHELPER# diff -Nru couchdb-1.1.1/debian/postinst couchdb-1.1.1/debian/postinst --- couchdb-1.1.1/debian/postinst 2011-09-25 08:33:05.000000000 -0600 +++ couchdb-1.1.1/debian/postinst 1969-12-31 17:00:00.000000000 -0700 @@ -1,30 +0,0 @@ -#!/bin/sh -e - -# Copyright 2009, Noah Slater - -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice and this -# notice are preserved. - -case $1 in - configure) - if ! getent passwd couchdb > /dev/null; then - adduser --system --quiet \ - --home /var/lib/couchdb --no-create-home \ - --shell /bin/bash --group --gecos "CouchDB Administrator" couchdb - fi - if test "`id -u couchdb`" -eq 0; then - echo "The couchdb administrative user must not be root." >&2 - false - fi - if test "`id -g couchdb`" -eq 0; then - echo "The couchdb administrative group must not be root." >&2 - false - fi - chown -R couchdb:couchdb /etc/couchdb - chown -R couchdb:couchdb /var/lib/couchdb - chown -R couchdb:couchdb /var/log/couchdb - ;; -esac - -#DEBHELPER# diff -Nru couchdb-1.1.1/debian/postrm couchdb-1.1.1/debian/postrm --- couchdb-1.1.1/debian/postrm 2011-11-27 03:48:41.000000000 -0700 +++ couchdb-1.1.1/debian/postrm 1969-12-31 17:00:00.000000000 -0700 @@ -1,34 +0,0 @@ -#!/bin/sh -e - -# Copyright 2009, Noah Slater - -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice and this -# notice are preserved. - -VERSION=%VERSION% - -case $1 in - purge) - if test -d "/etc/couchdb"; then - rm -r -f "/etc/couchdb" - fi - if test -d "/var/lib/couchdb"; then - rm -r -f "/var/lib/couchdb" - fi - if test -d "/var/log/couchdb"; then - rm -r -f "/var/log/couchdb" - fi - if test -d "/var/run/couchdb"; then - rm -r -f "/var/run/couchdb" - fi - if getent passwd couchdb > /dev/null && which deluser > /dev/null; then - deluser couchdb - fi - if getent group couchdb > /dev/null && which delgroup > /dev/null; then - delgroup couchdb - fi - ;; -esac - -#DEBHELPER# diff -Nru couchdb-1.1.1/debian/rules couchdb-1.1.1/debian/rules --- couchdb-1.1.1/debian/rules 2011-11-27 02:27:12.000000000 -0700 +++ couchdb-1.1.1/debian/rules 2011-12-17 19:38:28.000000000 -0700 @@ -12,7 +12,7 @@ DEB_CONFIGURE_EXTRA_FLAGS = --enable-js-trunk DEB_INSTALL_DOCS_ALL = -DEB_DH_INSTALLINIT_ARGS = --onlyscripts +DEB_DH_INSTALLINIT_ARGS = -Ncouchdb-bin --onlyscripts LIB = ${localstatedir}/lib/\$${package_identifier} @@ -21,30 +21,32 @@ post-patches:: sed -i s,$(LIB)$$,$(LIB)/$(DEB_UPSTREAM_VERSION), configure - sed -i s,VERSION=%VERSION%$$,VERSION=$(DEB_UPSTREAM_VERSION), debian/postrm + sed -i s,VERSION=%VERSION%$$,VERSION=$(DEB_UPSTREAM_VERSION), debian/couchdb.postrm cleanbuilddir:: sed -i s,$(LIB)/$(DEB_UPSTREAM_VERSION)$$,$(LIB), configure - sed -i s,VERSION=$(DEB_UPSTREAM_VERSION)$$,VERSION=%VERSION%, debian/postrm + sed -i s,VERSION=$(DEB_UPSTREAM_VERSION)$$,VERSION=%VERSION%, debian/couchdb.postrm common-binary-post-install-arch:: - rm -r debian/couchdb/var/run - rm -f debian/couchdb/usr/share/doc/couchdb/LICENSE.gz - rm -f debian/couchdb/usr/share/doc/couchdb/INSTALL.* - rm -f debian/couchdb/usr/lib/couchdb/erlang/lib/couch-*/priv/lib/couch_erl_driver.la - rm -f debian/couchdb/usr/share/couchdb/www/script/jquery.js - rm -f debian/couchdb/usr/share/couchdb/www/script/jquery.form.js - chmod a-x debian/couchdb/usr/share/couchdb/server/main.js - sed -i "/dependency_libs/ s/'.*'/''/" `find debian/couchdb -name '*.la'` + rm -r debian/tmp/var/run + rm -f debian/couchdb-bin/usr/share/doc/couchdb/LICENSE.gz + rm -f debian/couchdb-bin/usr/share/doc/couchdb/INSTALL.* + rm -f debian/couchdb-bin/usr/lib/couchdb/erlang/lib/couch-*/priv/lib/couch_erl_driver.la + rm -f debian/couchdb-bin/usr/share/couchdb/www/script/jquery.js + rm -f debian/couchdb-bin/usr/share/couchdb/www/script/jquery.form.js + chmod a-x debian/couchdb-bin/usr/share/couchdb/server/main.js + sed -i "/dependency_libs/ s/'.*'/''/" `find debian/couchdb-bin -name '*.la'` dh_link /usr/share/javascript/jquery/jquery.js /usr/share/couchdb/www/script/jquery.js dh_link /usr/share/javascript/jquery-form/jquery.form.js /usr/share/couchdb/www/script/jquery.form.js common-binary-predeb-arch:: - dh_fixperms debian/couchdb/ + dh_fixperms debian/couchdb-bin/ + erlang-depends -pcouchdb-bin + +common-binary-predeb-indep:: chmod 660 debian/couchdb/etc/couchdb/local.ini chmod 750 debian/couchdb/var/lib/couchdb chmod 750 debian/couchdb/var/log/couchdb - erlang-depends # @@ only works from source directory, see #494141 .PHONY: get-orig-source