[Pkg-erlang-commits] r1102 - in couchdb/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2009-10-05 16:51:23 +0000 (Mon, 05 Oct 2009)
New Revision: 1102

Removed:
   couchdb/trunk/debian/patches/pid.patch
Modified:
   couchdb/trunk/debian/binary.lintian-overrides
   couchdb/trunk/debian/changelog
   couchdb/trunk/debian/control
   couchdb/trunk/debian/rules
Log:
[couchdb]
  * New upstream release.
  * 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.


Modified: couchdb/trunk/debian/binary.lintian-overrides
===================================================================
--- couchdb/trunk/debian/binary.lintian-overrides	2009-10-01 20:38:53 UTC (rev 1101)
+++ couchdb/trunk/debian/binary.lintian-overrides	2009-10-05 16:51:23 UTC (rev 1102)
@@ -1 +1 @@
-couchdb binary: virtual-package-depends-without-real-package-depends depends: erlang-abi-11.b.3
+couchdb: virtual-package-depends-without-real-package-depends

Modified: couchdb/trunk/debian/changelog
===================================================================
--- couchdb/trunk/debian/changelog	2009-10-01 20:38:53 UTC (rev 1101)
+++ couchdb/trunk/debian/changelog	2009-10-05 16:51:23 UTC (rev 1102)
@@ -1,8 +1,17 @@
-couchdb (0.9.0-3) UNRELEASED; urgency=low
+couchdb (0.9.1-1) unstable; urgency=low
 
+  [ Sergei Golovan ]
+  * New upstream release.
+  * 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.
+
+  [ Noah Slater ]
   * Updated debian/control, updated Build-Depends on debhelper to 7.2.11.
 
- -- Noah Slater <nslater at tumbolia.org>  Thu, 14 May 2009 17:02:46 +0100
+ -- Sergei Golovan <sgolovan at debian.org>  Mon, 05 Oct 2009 20:34:48 +0400
 
 couchdb (0.9.0-2) unstable; urgency=low
 

Modified: couchdb/trunk/debian/control
===================================================================
--- couchdb/trunk/debian/control	2009-10-01 20:38:53 UTC (rev 1101)
+++ couchdb/trunk/debian/control	2009-10-05 16:51:23 UTC (rev 1102)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Noah Slater <nslater at tumbolia.org>
 Uploaders: Sergei Golovan <sgolovan at debian.org>
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Build-Depends: cdbs (>= 0.4.42), debhelper (>= 7.2.11),
- erlang-dev (>= 1:13.b), erlang-nox, help2man, libcurl4-openssl-dev,
+ erlang-dev (>= 1:13.b.1-dfsg-3), help2man, libcurl4-openssl-dev,
  libicu-dev, libmozjs-dev, libreadline5-dev
 Homepage: http://couchdb.apache.org/
 Vcs-Svn: svn://svn.berlios.de/erlang-pkg/couchdb/trunk/
@@ -13,8 +13,8 @@
 
 Package: couchdb
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ${erlang-base:Depends},
- ${erlang-nox:Depends}, ${erlang-abi:Depends}, adduser, libjs-jquery, lsb-base
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${erlang:Depends},
+ ${erlang-abi:Depends}, adduser, libjs-jquery, lsb-base
 Description: RESTful document oriented database
  Apache CouchDB is a distributed, fault-tolerant and schema-free
  document-oriented database accessible via a RESTful HTTP/JSON API. Among other

Deleted: couchdb/trunk/debian/patches/pid.patch
===================================================================
--- couchdb/trunk/debian/patches/pid.patch	2009-10-01 20:38:53 UTC (rev 1101)
+++ couchdb/trunk/debian/patches/pid.patch	2009-10-05 16:51:23 UTC (rev 1102)
@@ -1,35 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' apache-couchdb-0.9.0/bin/couchdb.tpl.in apache-couchdb-0.9.0.new/bin/couchdb.tpl.in
---- apache-couchdb-0.9.0/bin/couchdb.tpl.in	2009-04-14 20:08:47.000000000 +0100
-+++ apache-couchdb-0.9.0.new/bin/couchdb.tpl.in	2009-04-14 20:08:47.000000000 +0100
-@@ -27,7 +27,7 @@
- DEFAULT_INI_FILE=%localconfdir%/%defaultini%
- LOCAL_INI_FILE=%localconfdir%/%localini%
- 
--PID_FILE=%localstatedir%/run/couchdb.pid
-+PID_FILE=%localstatedir%/run/couchdb/couchdb.pid
- 
- STDOUT_FILE=couchdb.stdout
- STDERR_FILE=couchdb.stderr
-diff -Nur -x '*.orig' -x '*~' apache-couchdb-0.9.0/etc/init/couchdb.tpl.in apache-couchdb-0.9.0.new/etc/init/couchdb.tpl.in
---- apache-couchdb-0.9.0/etc/init/couchdb.tpl.in	2009-03-20 17:26:59.000000000 +0000
-+++ apache-couchdb-0.9.0.new/etc/init/couchdb.tpl.in	2009-04-14 20:12:25.000000000 +0100
-@@ -63,9 +63,6 @@
-     # Start Apache CouchDB as a background process.
- 
-     command="$COUCHDB -b"
--    if test -n "$COUCHDB_PID_FILE"; then
--        command="$command -p $COUCHDB_PID_FILE"
--    fi
-     if test -n "$COUCHDB_STDOUT_FILE"; then
-         command="$command -o $COUCHDB_STDOUT_FILE"
-     fi
-@@ -78,7 +75,9 @@
-     if test -n "$COUCHDB_OPTIONS"; then
-         command="$command $COUCHDB_OPTIONS"
-     fi
-+    mkdir -p /var/run/couchdb
-     if test -n "$COUCHDB_USER"; then
-+	chown $COUCHDB_USER /var/run/couchdb
-         if su $COUCHDB_USER -c "$command" > /dev/null; then
-             return $SCRIPT_OK
-         else

Modified: couchdb/trunk/debian/rules
===================================================================
--- couchdb/trunk/debian/rules	2009-10-01 20:38:53 UTC (rev 1101)
+++ couchdb/trunk/debian/rules	2009-10-05 16:51:23 UTC (rev 1102)
@@ -31,6 +31,7 @@
 	sed -i s,VERSION=$(DEB_UPSTREAM_VERSION)$$,VERSION=%VERSION%, debian/postrm
 
 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
 	dh_link /usr/share/javascript/jquery/jquery.js /usr/share/couchdb/www/script/jquery.js