[Pkg-erlang-commits] r1255 - in couchdb/trunk/debian: . source
statik-guest at alioth.debian.org
statik-guest at alioth.debian.org
Wed Jun 23 04:46:52 UTC 2010
Author: statik-guest
Date: 2010-06-23 04:46:51 +0000 (Wed, 23 Jun 2010)
New Revision: 1255
Added:
couchdb/trunk/debian/couchdb-bin.dirs
couchdb/trunk/debian/couchdb-bin.install
couchdb/trunk/debian/couchdb-bin.postinst
couchdb/trunk/debian/couchdb-bin.postrm
couchdb/trunk/debian/couchdb.install
couchdb/trunk/debian/couchdb.postinst
couchdb/trunk/debian/couchdb.postrm
couchdb/trunk/debian/source/
couchdb/trunk/debian/source/format
Removed:
couchdb/trunk/debian/dirs
couchdb/trunk/debian/postinst
couchdb/trunk/debian/postrm
Modified:
couchdb/trunk/debian/binary.lintian-overrides
couchdb/trunk/debian/changelog
couchdb/trunk/debian/control
couchdb/trunk/debian/rules
Log:
Adding the couchdb and couchdb-bin package split.
Modified: couchdb/trunk/debian/binary.lintian-overrides
===================================================================
--- couchdb/trunk/debian/binary.lintian-overrides 2010-06-20 17:31:19 UTC (rev 1254)
+++ couchdb/trunk/debian/binary.lintian-overrides 2010-06-23 04:46:51 UTC (rev 1255)
@@ -1 +1 @@
-couchdb: virtual-package-depends-without-real-package-depends
+couchdb-bin: virtual-package-depends-without-real-package-depends
Modified: couchdb/trunk/debian/changelog
===================================================================
--- couchdb/trunk/debian/changelog 2010-06-20 17:31:19 UTC (rev 1254)
+++ couchdb/trunk/debian/changelog 2010-06-23 04:46:51 UTC (rev 1255)
@@ -1,5 +1,6 @@
couchdb (0.11.0-2) UNRELEASED; urgency=low
+ [ Sam Bisbee ]
* Updated debian/control, removing mawk as a dependency per
http://lists.debian.org/debian-release/2010/05/msg00176.html. Reverses
addition of dependency in 0.10.1-1 (see #522051).
@@ -8,8 +9,11 @@
* Updated debian/patches/init.patch, added force-reload functionality to the
init file (alias for restart).
- -- Sam Bisbee <sbisbee at computervip.com> Sat, 29 May 2010 23:39:33 -0400
+ [ Elliot Murphy ]
+ * split into couchdb and couchdb-bin (closes: #573061)
+ -- Elliot Murphy <elliot at ubuntu.com> Wed, 23 Jun 2010 00:33:38 -0400
+
couchdb (0.11.0-1) unstable; urgency=medium (security fixes)
* New upstream release, including security fix for CVE-2010-00009.
Modified: couchdb/trunk/debian/control
===================================================================
--- couchdb/trunk/debian/control 2010-06-20 17:31:19 UTC (rev 1254)
+++ couchdb/trunk/debian/control 2010-06-23 04:46:51 UTC (rev 1255)
@@ -11,11 +11,32 @@
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
+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: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${erlang:Depends},
- ${erlang-abi:Depends}, adduser, libjs-jquery, lsb-base, procps
-Description: RESTful document oriented database
+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
Copied: couchdb/trunk/debian/couchdb-bin.dirs (from rev 1254, couchdb/trunk/debian/dirs)
===================================================================
--- couchdb/trunk/debian/couchdb-bin.dirs (rev 0)
+++ couchdb/trunk/debian/couchdb-bin.dirs 2010-06-23 04:46:51 UTC (rev 1255)
@@ -0,0 +1 @@
+usr/share/lintian/overrides
Added: couchdb/trunk/debian/couchdb-bin.install
===================================================================
--- couchdb/trunk/debian/couchdb-bin.install (rev 0)
+++ couchdb/trunk/debian/couchdb-bin.install 2010-06-23 04:46:51 UTC (rev 1255)
@@ -0,0 +1,2 @@
+debian/tmp/etc/couchdb
+debian/tmp/usr
Copied: couchdb/trunk/debian/couchdb-bin.postinst (from rev 1254, couchdb/trunk/debian/postinst)
===================================================================
--- couchdb/trunk/debian/couchdb-bin.postinst (rev 0)
+++ couchdb/trunk/debian/couchdb-bin.postinst 2010-06-23 04:46:51 UTC (rev 1255)
@@ -0,0 +1,33 @@
+#!/bin/sh -e
+
+# Copyright 2009, Noah Slater <nslater at tumbolia.org>
+
+# 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
+ chmod -R 0770 /etc/couchdb
+ chmod -R 0770 /var/lib/couchdb
+ chmod -R 0770 /var/log/couchdb
+ ;;
+esac
+
+#DEBHELPER#
Copied: couchdb/trunk/debian/couchdb-bin.postrm (from rev 1254, couchdb/trunk/debian/postrm)
===================================================================
--- couchdb/trunk/debian/couchdb-bin.postrm (rev 0)
+++ couchdb/trunk/debian/couchdb-bin.postrm 2010-06-23 04:46:51 UTC (rev 1255)
@@ -0,0 +1,34 @@
+#!/bin/sh -e
+
+# Copyright 2009, Noah Slater <nslater at tumbolia.org>
+
+# 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#
Added: couchdb/trunk/debian/couchdb.install
===================================================================
--- couchdb/trunk/debian/couchdb.install (rev 0)
+++ couchdb/trunk/debian/couchdb.install 2010-06-23 04:46:51 UTC (rev 1255)
@@ -0,0 +1,3 @@
+debian/tmp/etc/default
+debian/tmp/etc/init.d
+debian/tmp/etc/logrotate.d
Added: couchdb/trunk/debian/couchdb.postinst
===================================================================
--- couchdb/trunk/debian/couchdb.postinst (rev 0)
+++ couchdb/trunk/debian/couchdb.postinst 2010-06-23 04:46:51 UTC (rev 1255)
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+# Copyright 2009, Noah Slater <nslater at tumbolia.org>
+
+# 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#
Added: couchdb/trunk/debian/couchdb.postrm
===================================================================
--- couchdb/trunk/debian/couchdb.postrm (rev 0)
+++ couchdb/trunk/debian/couchdb.postrm 2010-06-23 04:46:51 UTC (rev 1255)
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+
+# Copyright 2009, Noah Slater <nslater at tumbolia.org>
+
+# 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#
Deleted: couchdb/trunk/debian/dirs
===================================================================
--- couchdb/trunk/debian/dirs 2010-06-20 17:31:19 UTC (rev 1254)
+++ couchdb/trunk/debian/dirs 2010-06-23 04:46:51 UTC (rev 1255)
@@ -1 +0,0 @@
-usr/share/lintian/overrides
Deleted: couchdb/trunk/debian/postinst
===================================================================
--- couchdb/trunk/debian/postinst 2010-06-20 17:31:19 UTC (rev 1254)
+++ couchdb/trunk/debian/postinst 2010-06-23 04:46:51 UTC (rev 1255)
@@ -1,33 +0,0 @@
-#!/bin/sh -e
-
-# Copyright 2009, Noah Slater <nslater at tumbolia.org>
-
-# 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
- chmod -R 0770 /etc/couchdb
- chmod -R 0770 /var/lib/couchdb
- chmod -R 0770 /var/log/couchdb
- ;;
-esac
-
-#DEBHELPER#
Deleted: couchdb/trunk/debian/postrm
===================================================================
--- couchdb/trunk/debian/postrm 2010-06-20 17:31:19 UTC (rev 1254)
+++ couchdb/trunk/debian/postrm 2010-06-23 04:46:51 UTC (rev 1255)
@@ -1,34 +0,0 @@
-#!/bin/sh -e
-
-# Copyright 2009, Noah Slater <nslater at tumbolia.org>
-
-# 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#
Modified: couchdb/trunk/debian/rules
===================================================================
--- couchdb/trunk/debian/rules 2010-06-20 17:31:19 UTC (rev 1254)
+++ couchdb/trunk/debian/rules 2010-06-23 04:46:51 UTC (rev 1255)
@@ -12,30 +12,30 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_INSTALL_DOCS_ALL =
-DEB_DH_INSTALLINIT_ARGS = --onlyscripts
+DEB_DH_INSTALLINIT_ARGS = -Ncouchdb-bin --onlyscripts
LIB = ${localstatedir}/lib/\$${package_identifier}
# @@ workaround for #486848
binary-arch binary-indep: build
-post-patches::
+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 debian/couchdb.postinst
-cleanbuilddir::
+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 debian/couchdb.postinst
common-binary-post-install-arch::
- rm -r debian/couchdb/var/run
- 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 -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/usr/share/lintian/overrides/couchdb
+ cp debian/binary.lintian-overrides debian/couchdb-bin/usr/share/lintian/overrides/couchdb-bin
common-binary-predeb-arch::
- erlang-depends
+ erlang-depends -pcouchdb-bin
# @@ only works from source directory, see #494141
.PHONY: get-orig-source
Added: couchdb/trunk/debian/source/format
===================================================================
--- couchdb/trunk/debian/source/format (rev 0)
+++ couchdb/trunk/debian/source/format 2010-06-23 04:46:51 UTC (rev 1255)
@@ -0,0 +1 @@
+1.0
More information about the Pkg-erlang-commits
mailing list