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

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2009-11-22 17:35:04 +0000 (Sun, 22 Nov 2009)
New Revision: 1134

Modified:
   couchdb/trunk/debian/changelog
   couchdb/trunk/debian/patches/init.patch
Log:
[couchdb] New version to work with.

Modified: couchdb/trunk/debian/changelog
===================================================================
--- couchdb/trunk/debian/changelog	2009-11-22 17:34:50 UTC (rev 1133)
+++ couchdb/trunk/debian/changelog	2009-11-22 17:35:04 UTC (rev 1134)
@@ -1,3 +1,9 @@
+couchdb (0.10.0-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 22 Nov 2009 20:34:52 +0300
+
 couchdb (0.10.0-1) unstable; urgency=low
 
   [ Elliot Murphy ]

Modified: couchdb/trunk/debian/patches/init.patch
===================================================================
--- couchdb/trunk/debian/patches/init.patch	2009-11-22 17:34:50 UTC (rev 1133)
+++ couchdb/trunk/debian/patches/init.patch	2009-11-22 17:35:04 UTC (rev 1134)
@@ -1,3 +1,13 @@
+--- apache-couchdb-0.9.1/etc/default/couchdb
++++ apache-couchdb-0.9.1.new/etc/default/couchdb
+@@ -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
 --- apache-couchdb-0.9.1/etc/init/couchdb.tpl.in
 +++ apache-couchdb-0.9.1.new/etc/init/couchdb.tpl.in
 @@ -34,7 +34,7 @@
@@ -9,7 +19,23 @@
  fi
  
  if test -r $CONFIGURATION_FILE; then
-@@ -77,6 +77,7 @@
+@@ -59,6 +59,15 @@
+ if test -r $LSB_LIBRARY; then
+     . $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 +86,7 @@
          command="$command $COUCHDB_OPTIONS"
      fi
      mkdir -p "$RUN_DIR"