--- couchdb-1.0.0.orig/debian/copyright +++ couchdb-1.0.0/debian/copyright @@ -0,0 +1,67 @@ +Upstream-Name: CouchDB +Upstream-Maintainer: Noah Slater +Upstream-Source: http://couchdb.apache.org/downloads.html + +Files: * +Copyright: Copyright 2009, The Apache Software Foundation +License: Apache-2.0 + On Debian systems the full text of the Apache License (Version 2) can be found + in the `/usr/share/common-licenses/Apache-2.0' file. + +Files: debian/* +Copyright: Copyright 2009, Noah Slater +License: GAP + +Files: m4/* +Copyright: Copyright 2008, Akos Maroy +License: GAP + +Files: share/www/script/jquery.js +Copyright: Copyright 2007, John Resig +License: MIT | GPL-2 + On Debian systems the full text of the GNU General Public License (Version 2) + can be found in the `/usr/share/common-licenses/GPL-2' file. + +Files: share/www/script/json2.js +License: PD + In the public domain. + +Files: src/mochiweb/* +Copyright: Copyright 2007, Mochi Media Coporation +License: MIT + +Files: src/ibrowse/* +Copyright: Copyright 2008, Chandrashekhar Mullaparthi +License: BSD + On Debian systems the full text of the BSD License can be found in the + `/usr/share/common-licenses/BSD' file. + +Files: src/etap/* +Copyright: Copyright 2008-2009 Nick Gerakines +License: MIT + +License: GAP + Copying and distribution of this package, with or without modification, are + permitted in any medium without royalty provided the copyright notice and this + notice are preserved. + +License: MIT + Copyright (c) + . + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. --- couchdb-1.0.0.orig/debian/compat +++ couchdb-1.0.0/debian/compat @@ -0,0 +1 @@ +5 --- couchdb-1.0.0.orig/debian/couchdb.postinst +++ couchdb-1.0.0/debian/couchdb.postinst @@ -0,0 +1,22 @@ +#!/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 + configure) + mkdir -p /var/lib/couchdb/"${VERSION}" + mkdir -p /var/log/couchdb + chown -R couchdb:couchdb /var/lib/couchdb + chown -R couchdb:couchdb /var/log/couchdb + chmod 0770 /var/lib/couchdb /var/lib/couchdb/"${VERSION}" + chmod 0770 /var/log/couchdb + ;; +esac + +#DEBHELPER# --- couchdb-1.0.0.orig/debian/README.Debian +++ couchdb-1.0.0/debian/README.Debian @@ -0,0 +1,26 @@ +Debian README +============= + +Apache CouchDB is alpha software and still under heavy development. Please be +aware that important areas such as the public API or internal database format +may see backwards incompatible changes between versions. + +More detailed information can be found on the CouchDB wiki: + + http://wiki.apache.org/couchdb/BreakingChanges + +Because the internal database format may change, rendering your database +unusable with a new version of the package, the database directory is +partitioned by the CouchDB release number of the database format in use. + +The partitioned database directories are named like this: + + /var/lib/couchdb/VERSION + +Before you upgrade to a new version of this package with a changed database +format you should export any data that you want keep from the old database and +import the data into the new database after the upgrade. + +Migration tools are available in the `python-couchdb` package. + + -- Sam Bisbee Wed, 11 Nov 2009 23:22:21 -0500 --- couchdb-1.0.0.orig/debian/README.source +++ couchdb-1.0.0/debian/README.source @@ -0,0 +1,20 @@ +Source README +============= + +The upstream source can be downloaded with the following command: + + ./debian/rules get-orig-source + +You will need the following packages installed: + + devscripts + +You can patch the upstream source with the following command: + + ./debian/rules patch + +You can add or edit patches using the following command: + + cdbs-edit-patch + + -- Noah Slater , Wed, 14 Jan 2009 16:46:53 +0000 --- couchdb-1.0.0.orig/debian/control +++ couchdb-1.0.0/debian/control @@ -0,0 +1,53 @@ +Source: couchdb +Section: misc +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Erlang Packaging Team +Uploaders: Sergei Golovan , Sam Bisbee , Elliot Murphy +Standards-Version: 3.9.1 +Build-Depends: cdbs (>= 0.4.42), debhelper (>= 7.2.11), + erlang-dev (>= 1:13.b.1-dfsg-3), help2man (>= 1.37), libcurl4-openssl-dev, + libicu-dev, libreadline-dev, + xulrunner-dev (>= 1.9.2), erlang-crypto, erlang-inets, erlang-xmerl +Homepage: http://couchdb.apache.org/ +Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-erlang/couchdb +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-erlang/couchdb + +Package: couchdb-bin +Depends: ${misc:Depends}, ${shlibs:Depends}, ${erlang-base:Depends}, + ${erlang-crypto:Depends}, ${erlang-inets:Depends}, ${erlang-xmerl:Depends}, ${erlang-abi:Depends}, adduser, libjs-jquery, lsb-base, procps, mawk, + ${xulrunner:Depends} +Suggests: couchdb +Architecture: any +Description: RESTful document oriented database, programs + 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. + . + This package contains the database program (so one can run personal servers), + but no system database or "init" startup files. To get those, you need the + "couchdb" package. + . + 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. + +Package: couchdb +Architecture: all +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. --- couchdb-1.0.0.orig/debian/couchdb.install +++ couchdb-1.0.0/debian/couchdb.install @@ -0,0 +1,3 @@ +debian/tmp/etc/default +debian/tmp/etc/init.d +debian/tmp/etc/logrotate.d --- couchdb-1.0.0.orig/debian/binary.lintian-overrides +++ couchdb-1.0.0/debian/binary.lintian-overrides @@ -0,0 +1 @@ +couchdb-bin: virtual-package-depends-without-real-package-depends --- couchdb-1.0.0.orig/debian/couchdb-bin.install +++ couchdb-1.0.0/debian/couchdb-bin.install @@ -0,0 +1,2 @@ +debian/tmp/etc/couchdb +debian/tmp/usr --- couchdb-1.0.0.orig/debian/rules +++ couchdb-1.0.0/debian/rules @@ -0,0 +1,49 @@ +#!/usr/bin/make -f + +# 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. + +include /usr/share/cdbs/1/rules/buildcore.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_INSTALL_DOCS_ALL = +DEB_DH_INSTALLINIT_ARGS = -Ncouchdb-bin --onlyscripts + +LIB = ${localstatedir}/lib/\$${package_identifier} + +xulrunner_gre_version := $(shell xulrunner --gre-version) +xulrunner_dep = xulrunner-$(shell echo $(xulrunner_gre_version) | cut -f1-3 -d.) +DEB_CONFIGURE_EXTRA_FLAGS += --with-js-lib=/usr/lib/xulrunner-devel-$(xulrunner_gre_version)/lib/ +DEB_CONFIGURE_EXTRA_FLAGS += --with-js-include=/usr/lib/xulrunner-devel-$(xulrunner_gre_version)/include/ + +# @@ workaround for #486848 +binary-arch binary-indep: build + +post-patches:: + sed -i s,$(LIB)$$,$(LIB)/$(DEB_UPSTREAM_VERSION), configure + sed -i s,VERSION=%VERSION%$$,VERSION=$(DEB_UPSTREAM_VERSION), debian/couchdb.postrm debian/couchdb.postinst + +cleanbuilddir:: + sed -i s,$(LIB)/$(DEB_UPSTREAM_VERSION)$$,$(LIB), configure + sed -i s,VERSION=$(DEB_UPSTREAM_VERSION)$$,VERSION=%VERSION%, debian/couchdb.postrm debian/couchdb.postinst + +common-binary-post-install-arch:: + rm -r debian/tmp/var/run + 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 + dh_link /usr/share/javascript/jquery/jquery.js /usr/share/couchdb/www/script/jquery.js + cp debian/binary.lintian-overrides debian/couchdb-bin/usr/share/lintian/overrides/couchdb-bin + +common-binary-predeb-arch:: + echo 'xulrunner:Depends=$(xulrunner_dep)' >> debian/couchdb-bin.substvars + erlang-depends -pcouchdb-bin + +# @@ only works from source directory, see #494141 +.PHONY: get-orig-source +get-orig-source: + uscan --force-download --rename --download-version=$(DEB_UPSTREAM_VERSION) --destdir . --- couchdb-1.0.0.orig/debian/watch +++ couchdb-1.0.0/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://www.apache.org/dist/couchdb/([\d\.]+)/apache-couchdb-([\d\.]+)\.tar\.gz --- couchdb-1.0.0.orig/debian/couchdb.postrm +++ couchdb-1.0.0/debian/couchdb.postrm @@ -0,0 +1,28 @@ +#!/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 "/var/lib/couchdb/$VERSION"; then + rmdir --ignore-fail-on-non-empty "/var/lib/couchdb/$VERSION" || true + fi + if test -d "/var/lib/couchdb"; then + rmdir --ignore-fail-on-non-empty "/var/lib/couchdb" || true + fi + if test -d "/var/log/couchdb"; then + rm -r -f "/var/log/couchdb" + fi + if test -d "/var/run/couchdb"; then + rmdir --ignore-fail-on-non-empty "/var/run/couchdb" || true + fi + ;; +esac + +#DEBHELPER# --- couchdb-1.0.0.orig/debian/couchdb-bin.postinst +++ couchdb-1.0.0/debian/couchdb-bin.postinst @@ -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 -R couchdb:couchdb /etc/couchdb + chmod 0775 /etc/couchdb + chmod 0664 /etc/couchdb/default.ini + chmod 0664 /etc/couchdb/local.ini + ;; +esac + +#DEBHELPER# --- couchdb-1.0.0.orig/debian/couchdb-bin.dirs +++ couchdb-1.0.0/debian/couchdb-bin.dirs @@ -0,0 +1,3 @@ +etc/couchdb/default.d +etc/couchdb/local.d +usr/share/lintian/overrides --- couchdb-1.0.0.orig/debian/couchdb-bin.postrm +++ couchdb-1.0.0/debian/couchdb-bin.postrm @@ -0,0 +1,18 @@ +#!/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 + rmdir --ignore-fail-on-non-empty "/etc/couchdb" || true + fi +esac + +#DEBHELPER# --- couchdb-1.0.0.orig/debian/changelog +++ couchdb-1.0.0/debian/changelog @@ -0,0 +1,459 @@ +couchdb (1.0.0-0ubuntu1) maverick; urgency=low + + * New upstream release (LP: #609728) + * debian/patches/auth_cache.patch (already forwarded upstream) + - fix a loop in the auth cache that stopped people from logging into futon + * debian/patches/remove_users.patch (already forwarded upstream) + - fix failure to delete couch users + * source/format - mark package as 1.0 format + * debian/control - bump standards version + * debian/control - fix lintian error not-binnmuable-all-depends-any + + -- Elliot Murphy Mon, 26 Jul 2010 10:24:11 -0400 + +couchdb (0.11.0-1ubuntu1) maverick; urgency=low + + * Merge from debian unstable. Remaining changes: (LP: #591444) + - debian/patches/fix-help2man.patch, debian/control: build with help2man + >= 1.37; add --no-discard-stderr + - debian/patches/init.patch: updated to account for upstream conflicting + changes + - debian/rules, debian/control: split couchdb and couchdb-bin + - debian/control: add missing erlang-{inets,crypto,xmerl} + (build-)dependencies + - debian/patches/mozjs_ldlibpath.patch, debian/control: change version + of xulrunner to xulrunner-1.9.2 + - debian/control: transition from libmozjs-dev to xulrunner-dev in + ubuntu + - debian/rules, debian/control: grab the current xulrunner version with + "xulrunner --gre-version" to use as a dependency + - debian/postinst: renamed to couchdb-bin.postinst, change the default + permissions on /etc/couchdb to 0775 and files to 0664 + - debian/couchdb-bin.postrm: don't try to delete couchdb system + user/group + * erlang-depends, pass explicit -pcouchdb-bin + + -- Clint Byrum Tue, 08 Jun 2010 23:16:21 -0700 + +couchdb (0.11.0-1) unstable; urgency=medium (security fixes) + + * New upstream release, including security fix for CVE-2010-00009. + (closes: #576304, #577417) + * Removed debian/patches/icu-patch.patch, as it's no longer needed. + + -- Sam Bisbee Fri, 16 Apr 2010 18:04:47 +0400 + +couchdb (0.10.1-2) unstable; urgency=low + + [ Elliot Murphy ] + * Updated debian/control, added Elliot to Uploaders + * Dropped $ENABLE_SERVER portion of debian/patches/init.patch + + [ Sam Bisbee ] + * Updated debian/patches/init.patch, adding a grace period to the init + script's stop task to allow couchdb's child processes (ie., heart) a chance + to exit before deciding whether the task was successful or not. This adds a + dependency on procps (`ps` command). + * Removed debian/preinst, undoing killall preinst patch from 0.10.0-1 that is + no longer needed due to the grace period init patch in this release. This + also removes the dependency on psmisc. (closes: #562901) + * Updated debian/control, bumping Debian standards version to 3.8.4. + * Updated debian/control, adding mawk as a dependency. The majority of + systems will have it installed with the base system, but it's required and + not essential. (closes: #569965) + + -- Sam Bisbee Tue, 09 Mar 2010 21:55:59 +0300 + +couchdb (0.10.1-1) unstable; urgency=low + + * New upstream release (closes: #550782). + * Cleaning up nmu related lintian warnings. + + -- Sam Bisbee Wed, 23 Dec 2009 23:15:27 -0500 + +couchdb (0.10.0-1ubuntu2) lucid; urgency=low + + * debian/patches/fix-help2man.patch, debian/control: build with help2man 1.37; + add --no-discard-stderr for 1.37 help2man version (LP: #536740) + * debian/patches/mozjs_ldlibpath.patch, debian/control: change version of + xulrunner to xulrunner-1.9.2 (LP: #536737) + + -- Micah Gersten Tue, 09 Mar 2010 12:27:55 -0600 + +couchdb (0.10.0-1ubuntu1) lucid; urgency=low + + * Merge from Debian testing, remaining changes: + - split package into couchdb and couchdb-bin binary packages, so that + the programs can be installed without starting the system service + - debian/control: add missing erlang-{inets,crypto,xmerl} + (build-)dependencies + - debian/control: transition from libmozjs-dev to xulrunner-dev in + ubuntu + - debian/rules, debian/control: grab the current xulrunner version with + "xulrunner --gre-version" to use as a dependency + - debian/patches/mozjs_ldlibpath.patch: explicitly set LD_LIBRARY_PATH to + pkglibdir of current installed xulrunner version on startup; this works + around the fact that couchdb relies on the not publicly exported + libmozjs + - debian/postinst: change the default permissions on /etc/couchdb to + 0775, and /etc/couchdb/default.ini and /etc/couchdb/local.ini to 0774 + - debian/patches/http-redirect-query-string-fix.patch: fix replication + over OAuth, which was broken because of incorrect query-string handling + after HTTP redirection + - debian/couchdb-bin.postrm: don't try to delete couchdb system + user/group + - debian/rules, debian/couchdb.{postinst,postrm}: create + /var/{log,lib}/couchdb/${couchdbversion}, so couchdb will run. + * Dropped changes, superseded in Debian: + - debian/control: bump the Standards-Version to 3.8.2 (latest) + - debian/copyright: added src/etap/* to copyright file + * debian/rules: don't munge debian/couchdb-bin.postrm, it doesn't contain + the VERSION tag anymore + * Fix permissions on files in /etc/couchdb to be 0664, not 0774 - config + files should not be executable! + * Remove the debian/preinst, and drop the build-dependency on psmisc which + doesn't do the right thing /anyway/. A preinst invocation implies a + Pre-Depends, not a Build-Depends, and the heuristic being used here with + 'killall' is useless. + * Don't recursively chmod /var/lib/couchdb, only chmod the directories - + we don't want the files to wind up executable. + * debian/rules: fix dh_installinit invocation to only add scripts for the + couchdb package, not couchdb-bin. + + -- Steve Langasek Tue, 29 Dec 2009 13:24:28 -0800 + +couchdb (0.10.0-1) unstable; urgency=low + + [ Elliot Murphy ] + * Updated debian/copyright, added src/etap* + * Updated debian/control, changed Maintainer to Erlang team address + * Updated debian/control, changed Vcs- links to new locations. + + [ Sergei Golovan ] + * New upstream release (closes: #551212, #554080, #554593). + * Removed unnecessary build dependency on transitional erlang-nox package. + * Replaced subst variables in dependencies by ${erlang:Depends} which allows + to calculate dependencies automatically. This removes erlang-nox from + dependencies (closes: #532756). + * Bumped standards version to 3.8.3. + * It's normal if /etc/init.d script is left after package removal as a + config file (and the binary isn't available). Therefore made it return + success in case if /usr/bin/couchdb doesn't exist or isn't an executable. + * Change current directory to /var/run/couchdb in init script to prevent + error messages about access violation by code server if the current dir + isn't readable by the couchdb user. + * Put log files directly into /var/log/couchdb directory. There's no reason + to have different log subdirectories for different couchdb versions. + + [ Noah Slater ] + * Updated debian/control, updated Build-Depends on debhelper to 7.2.11. + + [ Sam Bisbee ] + * Updated debian/control, repointed Vcs links. + * Fix "replacing libreadline5-dev build dependency with libreadline- + dev" Updated debian/control, changed libreadline5-dev dependency to + libreadline-dev. (Closes: #553742) + * Updated debian/README.Debian, removed log directory partitioning info + per Sergei's related changes to put all logs in one directory. + * Updated debian/postrm, rmdir didn't like that its target directories + weren't non-empty (despite passed args), causing errors and failing to + remove directories. Also removed the version partitioning cases. + * Created debian/preinst, now we make sure that couchdb isn't running any + beam processes on upgrade. Upgrading from 0.9.0-2 was leaving old code in a + running beam process, so you were running 0.9.0 couchdb but had 0.10.0 code + installed until you killed the process. Adds a dependency on psmisc. + + -- Sam Bisbee Sat, 21 Nov 2009 17:10:39 -0500 + +couchdb (0.10.0-0ubuntu3) karmic; urgency=low + + * Fix replication over OAuth, which was broken because of incorrect + query-string handling after HTTP redirection. (LP: #456234) + * create /var/log/couchdb/${couchdbversion} also, as couchdb does not + create it. (LP: #453049) + + -- Chad Miller Tue, 20 Oct 2009 16:30:45 -0400 + +couchdb (0.10.0-0ubuntu2) karmic; urgency=low + + * create /var/log/couchdb so that couchdb installs/runs (LP: #453049) + + -- Chad Miller Mon, 19 Oct 2009 09:37:43 -0400 + +couchdb (0.10.0-0ubuntu1) karmic; urgency=low + + * Final 0.10.0 upstream release. (LP: #450442) + - CouchDB 0.10.0 is now a beta version, not alpha. + - Fixes replication with 0.9 servers. + - Fix UUID's tests. + - Includes ETap into the test suite. + - Fix UUID's ETags. + - Fix cookie and oauth+replication. + - OAuth support for https URL scheme. + - Reject invalid UTF-8. + * debian/patches + - dropped oauth-replication-crash-fix-backport.patch + * debian/copyright + - added src/etap/* to copyright file. + + -- Elliot Murphy Tue, 13 Oct 2009 16:50:35 -0400 + +couchdb (0.10.0~svn818859-0ubuntu3) karmic; urgency=low + + * Finish split of couchdb-bin and couchdb by renaming substvar file + for xulrunner dependency. (LP: #449653) + + -- Chad Miller Mon, 12 Oct 2009 12:11:29 -0400 + +couchdb (0.10.0~svn818859-0ubuntu2) karmic; urgency=low + + * Backport future patches that fixes replication crash for authenticated + connections from other couchdb instances. (LP: #439499) + * Remove explicit version from debian/couchdb-bin/postinst . + + -- Chad Miller Thu, 01 Oct 2009 09:56:37 -0400 + +couchdb (0.10.0~svn818859-0ubuntu1) karmic; urgency=low + + * Import code from pre-release branch. (LP: #427860, #408909) + + Build and System Integration: + * Changed `couchdb` script configuration options. + * Added default.d and local.d configuration directories to load + sequence. + + HTTP Interface: + * Added optional cookie-based authentication handler. + * Added optional two-legged OAuth authentication handler. + * Packaging of couchdb-bin must replace pre-split couchdb. + (LP: #432219) + * Move all of /etc and /var out of the couchdb-bin package, to the + couchdb package. + * /etc/couchdb must be in couchdb-bin, as config files are needed + by all servers. + + So the couchdb user must be managed by couchdb-bin. + + Split postinst/postrm files to manage different files. + + Set Replaces of couchdb-bin by couchdb so that config files + migrate. + * Update the version number in postrm. (!) + * Use the new "Breaks" field in control file to help split pkg. + + [Ken VanDine] + * debian/couchdb.install: + - removed /var + * debian/rules: + - removed bootstrap + * debian/couchdb.postinst: + - Added the debhelper tag + + -- Chad Miller Fri, 25 Sep 2009 19:18:26 -0400 + +couchdb (0.10.0~svn813472-0ubuntu2) karmic; urgency=low + + * Split couchdb into couchdb (to hold only the init) and couchdb-bin + (to hold everything else). (LP: #427036) + + -- Chad Miller Wed, 16 Sep 2009 14:12:56 -0400 + +couchdb (0.10.0~svn813472-0ubuntu1) karmic; urgency=low + + * New snapshot of couchdb 0.10.x stable prerelease branch + - pass config reset option to recursed background startup (LP: #424330) + closes COUCHDB-498 + - Fix for building on snow leopard COUCHDB-490 + - Fix SSL replication (LP: #422178) COUCHDB-491 + - Fix continuous-after-normal replication + - Use the same password hash calculation for user creation via ini + file and user db, closes COUCHDB-492 + - Fix for WebKit XHR, closes COUCHDB-483 + - Don't check for response code text, closes COUCHDB-482 + - Remove a debugging leftover + + -- Elliot Murphy Thu, 10 Sep 2009 11:35:54 -0400 + +couchdb (0.10.0~svn809550-0ubuntu1) karmic; urgency=low + + * New snapshot of couchdb 0.10.x stable prerelease branch (LP: #421971) + - fixes a process leak in local changes feed consumer + - disables internal gen_server timeouts + - minimize the number of full commits + - follow 302 redirects during replication + - more precise and accurate calculation of replication progress + - added crypto export notice to README + - Fix for problem where HEAD requests that would have a chunked responses + would send the chunked response anyway. + - send deleted docs to changes filters and protect against missing + filters. + - merge cascading auth patch by Jason Davies, closes COUCHDB-478 + * Drop debian/patches/oauth_ini_users.patch as it has been merged upstream. + * debian/postrm + - don't try to delete couchdb system user/group (LP: #387945) + + -- Elliot Murphy Mon, 31 Aug 2009 09:06:26 -0400 + +couchdb (0.10.0~svn806985-0ubuntu2) karmic; urgency=low + + * Pick up the xulrunner dep from xulrunner --gre-version instead of + hard-coding it in debian/control; this gets us onto xulrunner-1.9.1, + which we're already building against, instead of xulrunner-1.9. + + -- Steve Langasek Fri, 28 Aug 2009 23:21:39 +0000 + +couchdb (0.10.0~svn806985-0ubuntu1) karmic; urgency=low + + * First snapshot of couchdb 0.10pre, from + http://build.couchdb.org/0.10.x-UNOFFICIAL (LP: #418288) + * debian/postinst + - Make /etc/couchdb/local.ini world readable (LP: #403575) + + [Elliot Murphy] + * Added debian/patches/oauth_ini_users.patch from + http://issues.apache.org/jira/browse/COUCHDB-478 + + -- Ken VanDine Mon, 24 Aug 2009 15:44:14 -0400 + +couchdb (0.9.0-2ubuntu5) karmic; urgency=low + + * Fixes LP: #389089 - couchdb fails to start: looking for absent 'xulrunner' + - Use version-specific xulrunner binary in couchdb wrapper script. + + -- Elliot Murphy Wed, 05 Aug 2009 11:27:30 +0100 + +couchdb (0.9.0-2ubuntu4) karmic; urgency=low + + * debian/postinst + - Change the default permissions on /etc/couchdb to 0775, + /etc/couchdb/default.ini to 0774 and /etc/couchdb/local.ini + to 0770 (LP: #403575) + * debian/control + - Bump the Standards-Version to 3.8.2 (latest) + + -- Ken VanDine Thu, 23 Jul 2009 13:35:12 -0400 + +couchdb (0.9.0-2ubuntu3) karmic; urgency=low + + * Add missing erlang-{crypto,xmerl} dependencies, thanks James Henstridge! + (LP: #385104) + + -- Martin Pitt Fri, 12 Jun 2009 18:06:25 +0200 + +couchdb (0.9.0-2ubuntu2) karmic; urgency=low + + * Change erlang-nox dependency to erlang-inets. (LP: #385104) + + -- James Henstridge Tue, 02 Jun 2009 17:17:40 +0800 + +couchdb (0.9.0-2ubuntu1) karmic; urgency=low + + De-libmoz-dev'ification (LP: #352968) + * debian/control: transition from libmozjs-dev to xulrunner-dev in ubuntu + * debian/control: add xulrunner-1.9 as explicit dependency for couchdb package + * debian/patches/mozjs_ldlibpath.patch: explicitly set LD_LIBRARY_PATH to + pkglibdir of current installed xulrunner version on startup; this works around + the fact that couchdb relies on the not publicly exported libmozjs + + -- Alexander Sack Wed, 10 Jun 2009 15:39:54 +0200 + +couchdb (0.9.0-2) unstable; urgency=low + + * Updated debian/dirs, removed /var/run/couchdb directory per policy. + * Updated debian/patches/pid.patch, create /var/run/couchdb dynamically. + * Updated debian/postrm, added VERSION variable. + * Updated debian/postrm, added missing removal of log directories. + * Updated debian/postrm, fixed missing function error. + * Updated debian/rules, added patch for debian/postrm to update VERSION. + * Updated debian/rules, fixed bug with configure patch. + * Updated debian/control, added build-dependency on erlang-dev >= 1:13.b + to make transition to Erlang R13B easier. + + -- Noah Slater Mon, 11 May 2009 11:26:55 +0400 + +couchdb (0.9.0-1) unstable; urgency=low + + * New upstream release. Closes: #522051 + * Added debian/patches/pid.patch, corrects daemon pidfile handling. + * Updated debian/control, added Build-Depends on libcurl4-openssl-dev. + * Updated debian/control, changed Homepage and Description. + * Updated debian/control, changed Standards-Version to 3.8.0. + * Updated debian/copyright, changed maintainer email address. + * Updated debian/postinst, changed owner of /etc/couchdb directory. + * Updated debian/postrm, changed so only empty data directories are removed. + * Updated debian/rules, improved uscan options for get-orig-source. + + -- Noah Slater Tue, 14 Apr 2009 16:32:45 +0100 + +couchdb (0.8.1-1) experimental; urgency=low + + * New upstream release. + * Updated debian/control, added Depends on libjs-jquery. + * Updated debian/control, removed Depends on mime-support. + * Updated debian/rules, added standard uscan options for get-orig-source. + * Removed debian/patches/directory-version.patch, replaces manual sed invocation. + + -- Noah Slater Mon, 18 Aug 2008 15:10:07 +0100 + +couchdb (0.8.0-2) unstable; urgency=low + + * Added debian/README.source, contains upstream source information. + * Updated debian/README.Debian, added note about python-couchdb. + * Updated debian/control, changed Standards-Version to 3.8.0. + * Updated debian/copyright, changed for latest proposed format. + * Updated debian/rules, changed binary-arch and binary-indep targets + to depend on the build target as a workaround for #486848. + * Updated debian/watch, updated version number. + + -- Noah Slater Fri, 11 Jul 2008 11:29:17 +0100 + +couchdb (0.8.0-1) unstable; urgency=low + + * New upstream release. + * Added debian/watch, upstream information for uscan. + * Updated debian/copyright, changed to use Apache Licence from common-licenses. + * Updated debian/rules, changed get-orig-source to work with uscan. + + -- Noah Slater Wed, 25 Jun 2008 20:19:40 +0100 + +couchdb (0.7.3~svn650270-2) unstable; urgency=low + + * Updated debian/rules, added release partitioning to data directories. + * Updated debian/postrm, changed so that log files are not removed. + + -- Noah Slater Sat, 24 May 2008 16:30:21 +0100 + +couchdb (0.7.3~svn650270-1) experimental; urgency=low + + * New upstream snapshot, database format change, no boot file, no + SpiderMonkey and all tests pass. Closes: #465592, #465722, #466424 + * Updated debian/control, removed Debian revision from erlang-dev Build-Depends. + * Updated debian/control, removed Depends on libicu-dev. Closes: #466076 + * Updated debian/copyright, changed for latest proposed format. + + -- Noah Slater Thu, 01 May 2008 12:07:31 +0100 + +couchdb (0.7.3~svn684-1) unstable; urgency=low + + * New upstream snapshot. + * Updated debian/control, changed Standards-Version to 3.7.3. + + -- Noah Slater Wed, 06 Feb 2008 17:03:38 +0000 + +couchdb (0.7.2-2) experimental; urgency=low + + * Updated debian/control, added Build-Depends on libicu-dev as an + alternative to libicu36-dev which is removed from unstable. + + -- Sergei Golovan Wed, 19 Dec 2007 17:54:47 +0300 + +couchdb (0.7.2-1) experimental; urgency=low + + * New upstream release. + * Updated debian/rules, changed to pass -fPIC to compiler. Closes: #451996 + * Updated debian/rules, changed to force removal of unwanted files. + * Updated debian/rules, added a get-orig-source target. + + -- Noah Slater Sat, 08 Dec 2007 01:21:01 +0300 + +couchdb (0.7.0-1) experimental; urgency=low + + * Initial release. Closes: #445880 + + -- Noah Slater Sat, 6 Oct 2007 19:44:36 +0100 + --- couchdb-1.0.0.orig/debian/source/format +++ couchdb-1.0.0/debian/source/format @@ -0,0 +1 @@ +1.0 --- couchdb-1.0.0.orig/debian/patches/auth_cache.patch +++ couchdb-1.0.0/debian/patches/auth_cache.patch @@ -0,0 +1,15 @@ +Description: fix badmatch error after deleting a user doc +Origin: upstream: http://svn.apache.org/viewvc?view=revision&revision=964108 +diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl +index bff801f..078bfcc 100644 +--- a/src/couchdb/couch_auth_cache.erl ++++ b/src/couchdb/couch_auth_cache.erl +@@ -289,7 +289,7 @@ refresh_entry(Db, #doc_info{high_seq = DocSeq} = DocInfo) -> + [] -> + ok; + [{UserName, {_OldCreds, ATime}}] -> +- {ok, Doc} = couch_db:open_doc(Db, DocInfo, [conflicts]), ++ {ok, Doc} = couch_db:open_doc(Db, DocInfo, [conflicts, deleted]), + NewCreds = user_creds(Doc), + true = ets:insert(?BY_USER, {UserName, {NewCreds, ATime}}) + end; --- couchdb-1.0.0.orig/debian/patches/mozjs1.9_ldlibpath.patch +++ couchdb-1.0.0/debian/patches/mozjs1.9_ldlibpath.patch @@ -0,0 +1,26 @@ +diff -Nur -x '*.orig' -x '*~' couchdb-0.9.0/bin/couchdb.tpl.in couchdb-0.9.0.new/bin/couchdb.tpl.in +--- couchdb-0.9.0/bin/couchdb.tpl.in 2009-03-24 14:04:46.000000000 +0100 ++++ couchdb-0.9.0.new/bin/couchdb.tpl.in 2009-06-10 15:49:59.000000000 +0200 +@@ -35,6 +35,9 @@ + HEART_COMMAND="%bindir%/%couchdb_command_name% -k" + HEART_BEAT_TIMEOUT=11 + ++LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/xulrunner-`xulrunner-1.9.2 --gre-version`/ ++export LD_LIBRARY_PATH ++ + basename=`basename $0` + + display_version () { +diff -Nur -x '*.orig' -x '*~' couchdb-0.9.0/bin/couchjs.tpl.in couchdb-0.9.0.new/bin/couchjs.tpl.in +--- couchdb-0.9.0/bin/couchjs.tpl.in 2008-08-18 11:49:40.000000000 +0200 ++++ couchdb-0.9.0.new/bin/couchjs.tpl.in 2009-06-10 15:50:51.000000000 +0200 +@@ -17,6 +17,9 @@ + + DEFAULT_VERSION=170 + ++LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/xulrunner-`xulrunner-1.9.2 --gre-version`/ ++export LD_LIBRARY_PATH ++ + basename=`basename $0` + + display_version () { --- couchdb-1.0.0.orig/debian/patches/init.patch +++ couchdb-1.0.0/debian/patches/init.patch @@ -0,0 +1,129 @@ +Index: couchdb-0.11.0/etc/default/couchdb +=================================================================== +--- couchdb-0.11.0.orig/etc/default/couchdb 2010-06-08 23:44:24.191349434 -0700 ++++ couchdb-0.11.0/etc/default/couchdb 2010-06-08 23:45:37.321377097 -0700 +@@ -5,3 +5,7 @@ + COUCHDB_STDERR_FILE=/dev/null + COUCHDB_RESPAWN_TIMEOUT=5 + COUCHDB_OPTIONS= ++ ++# Set this option to 0 if you don't want CouchDB server to start ++# during system boot. ++ENABLE_SERVER=1 +Index: couchdb-0.11.0/etc/init/couchdb.tpl.in +=================================================================== +--- couchdb-0.11.0.orig/etc/init/couchdb.tpl.in 2010-06-08 23:43:24.631291022 -0700 ++++ couchdb-0.11.0/etc/init/couchdb.tpl.in 2010-06-08 23:50:55.771324618 -0700 +@@ -33,8 +33,12 @@ + RUN_DIR=%localstaterundir% + LSB_LIBRARY=/lib/lsb/init-functions + ++# Grace time in seconds to give the beam process to stop when we're running the ++# stop target. Will end before grace time ends if the process ends sooner. ++STOP_GRACE_TIME=5 ++ + if test ! -x $COUCHDB; then +- exit $SCRIPT_ERROR ++ exit $SCRIPT_OK + fi + + if test -r $CONFIGURATION_FILE; then +@@ -60,6 +64,15 @@ + . $LSB_LIBRARY + fi + ++if test "$ENABLE_SERVER" = "0"; then ++ case "$1" in ++ start|restart|force-reload) ++ echo "Database server $NAME is disabled in $CONFIGURATION_FILE." ++ exit $SCRIPT_OK ++ ;; ++ esac ++fi ++ + start_couchdb () { + # Start Apache CouchDB as a background process. + +@@ -77,6 +90,7 @@ + command="$command $COUCHDB_OPTIONS" + fi + mkdir -p "$RUN_DIR" ++ cd "$RUN_DIR" + if test -n "$COUCHDB_USER"; then + chown $COUCHDB_USER "$RUN_DIR" + if su $COUCHDB_USER -c "$command" > /dev/null; then +@@ -96,23 +110,50 @@ + stop_couchdb () { + # Stop the running Apache CouchDB process. + ++ pidFile="$RUN_DIR/couchdb.pid" ++ if [ ! -r "$pidFile" ] ++ then ++ #exists, but can't read it ++ [ -f "$pidFile" ] && return $SCRIPT_ERROR ++ ++ #doesn't exist, so assume couchdb is already stopped ++ return $SCRIPT_OK ++ fi ++ ++ pid=`cat $pidFile` ++ #unset $pidFile ++ [ -z "$pid" ] && return $SCRIPT_OK ++ + command="$COUCHDB -d" + if test -n "$COUCHDB_OPTIONS"; then + command="$command $COUCHDB_OPTIONS" + fi ++ ++ # We need `heart`'s pid because its ppid is set to 1 when the beam proc ++ # ends, thereby hiding itself from our `ps` check bellow. ++ heart_pid=`ps -f --ppid $pid | grep "heart -pid $pid " | awk '{print $2}'` ++ [ -n "$heart_pid" ] && heart_pid=",$heart_pid" #for `ps` call formatting ++ + if test -n "$COUCHDB_USER"; then +- if su $COUCHDB_USER -c "$command" > /dev/null; then +- return $SCRIPT_OK +- else ++ if ! su $COUCHDB_USER -c "$command" > /dev/null; then + return $SCRIPT_ERROR + fi + else +- if $command > /dev/null; then +- return $SCRIPT_OK +- else ++ if ! $command > /dev/null; then + return $SCRIPT_ERROR + fi + fi ++ ++ i=0 ++ while ps -p $pid$heart_pid --ppid $pid$heart_pid > /dev/null ++ do ++ [ $i -ge $STOP_GRACE_TIME ] && return $SCRIPT_ERROR ++ ++ sleep 1 ++ i=`expr $i + 1` ++ done ++ ++ return $SCRIPT_OK + } + + display_status () { +@@ -141,7 +182,7 @@ + log_end_msg $SCRIPT_ERROR + fi + ;; +- restart) ++ restart|force-reload) + log_daemon_msg "Restarting $DESCRIPTION" $NAME + if stop_couchdb; then + if start_couchdb; then +@@ -158,7 +199,7 @@ + ;; + *) + cat << EOF >&2 +-Usage: $SCRIPT_NAME {start|stop|restart|status} ++Usage: $SCRIPT_NAME {start|stop|restart|force-reload|status} + EOF + exit $SCRIPT_ERROR + ;; --- couchdb-1.0.0.orig/debian/patches/remove_users.patch +++ couchdb-1.0.0/debian/patches/remove_users.patch @@ -0,0 +1,47 @@ +Description: test and fix for deleting users documents. +Origin: upstream, http://svn.apache.org/viewvc?view=revision&revision=963723 +diff --git a/share/www/script/test/users_db.js b/share/www/script/test/users_db.js +index b85adf0..667ff3c 100644 +--- a/share/www/script/test/users_db.js ++++ b/share/www/script/test/users_db.js +@@ -85,8 +85,13 @@ couchTests.users_db = function(debug) { + T(/conflict/.test(e.reason)) + } + ++ // you can delete a user doc ++ s = CouchDB.session().userCtx; ++ T(s.name == null); ++ T(s.roles.indexOf("_admin") !== -1); ++ T(usersDb.deleteDoc(jchrisWithConflict).ok); + }; +- ++ + usersDb.deleteDb(); + run_on_modified_server( + [{section: "couch_httpd_auth", +diff --git a/src/couchdb/couch_js_functions.hrl b/src/couchdb/couch_js_functions.hrl +index 3214b1f..1f314f6 100644 +--- a/src/couchdb/couch_js_functions.hrl ++++ b/src/couchdb/couch_js_functions.hrl +@@ -12,10 +12,6 @@ + + -define(AUTH_DB_DOC_VALIDATE_FUNCTION, <<" + function(newDoc, oldDoc, userCtx) { +- if ((oldDoc && oldDoc.type !== 'user') || newDoc.type !== 'user') { +- throw({forbidden : 'doc.type must be user'}); +- } // we only allow user docs for now +- + if (newDoc._deleted === true) { + // allow deletes by admins and matching users + // without checking the other fields +@@ -27,6 +23,10 @@ + } + } + ++ if ((oldDoc && oldDoc.type !== 'user') || newDoc.type !== 'user') { ++ throw({forbidden : 'doc.type must be user'}); ++ } // we only allow user docs for now ++ + if (!newDoc.name) { + throw({forbidden: 'doc.name is required'}); + } --- couchdb-1.0.0.orig/debian/patches/fix-help2man.patch +++ couchdb-1.0.0/debian/patches/fix-help2man.patch @@ -0,0 +1,13 @@ +# Version 1.37 of help2man requires --no-discard-stderr +--- couchdb-0.10.0.orig/bin/Makefile.in ++++ couchdb-0.10.0/bin/Makefile.in +@@ -211,7 +211,7 @@ + CLEANFILES = $(bin_SCRIPTS) $(dist_man1_MANS) $(noinst_SCRIPTS) + couchdb_command_name = `echo couchdb | sed '$(transform)'` + couchjs_command_name = `echo couchjs | sed '$(transform)'` +-HELP2MAN_OPTION = --no-info --help-option="-h" --version-option="-V" ++HELP2MAN_OPTION = --no-info --no-discard-stderr --help-option="-h" --version-option="-V" + all: all-am + + .SUFFIXES: +