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

[Sam Bisbee]

Hey Elliot,

Is there any reason you undid the original parts of the patch from rev1103?
The $ENABLE_SERVER stuff came about @1134 and I believe we still want to keep
everything prior (@1103).
http://svn.debian.org/viewsvn/pkg-erlang/couchdb/trunk/debian/patches/init.patch?view=log&pathrev=1174

Simple to fix (assumes you're pwd'ing in the patches dir):
svn merge -r HEAD:1103 .
svn revert icu-config.patch

You might also want to ammend your changelog entry.

Cheers,

--
Sam Bisbee

On Tue, Jan 19, 2010 at 04:31:08AM +0000, statik-guest at alioth.debian.org wrote:
> Author: statik-guest
> Date: 2010-01-19 04:31:07 +0000 (Tue, 19 Jan 2010)
> New Revision: 1175
> 
> Removed:
>    couchdb/trunk/debian/patches/init.patch
> Modified:
>    couchdb/trunk/debian/changelog
> Log:
> Dropped init.patch.
> 
> 
> 
> Modified: couchdb/trunk/debian/changelog
> ===================================================================
> --- couchdb/trunk/debian/changelog	2010-01-19 04:27:49 UTC (rev 1174)
> +++ couchdb/trunk/debian/changelog	2010-01-19 04:31:07 UTC (rev 1175)
> @@ -1,8 +1,10 @@
>  couchdb (0.10.1-2) UNRELEASED; urgency=low
>  
> -  * NOT RELEASED YET
> +  [ Elliot Murphy ]
> +  * Updated debian/control, added Elliot to Uploaders
> +  * Dropped debian/patches/init.patch
>  
> - -- Sergei Golovan <sgolovan at debian.org>  Tue, 29 Dec 2009 00:54:29 +0300
> + -- Elliot Murphy <elliot at ubuntu.com>  Mon, 18 Jan 2010 23:30:25 -0500
>  
>  couchdb (0.10.1-1) unstable; urgency=low
>  
> 
> Deleted: couchdb/trunk/debian/patches/init.patch
> ===================================================================
> --- couchdb/trunk/debian/patches/init.patch	2010-01-19 04:27:49 UTC (rev 1174)
> +++ couchdb/trunk/debian/patches/init.patch	2010-01-19 04:31:07 UTC (rev 1175)
> @@ -1,45 +0,0 @@
> ---- 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 @@
> - LSB_LIBRARY=/lib/lsb/init-functions
> - 
> - if test ! -x $COUCHDB; then
> --    exit $SCRIPT_ERROR
> -+    exit $SCRIPT_OK
> - fi
> - 
> - if test -r $CONFIGURATION_FILE; then
> -@@ -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"
> -+    cd "$RUN_DIR"
> -     if test -n "$COUCHDB_USER"; then
> -         chown $COUCHDB_USER "$RUN_DIR"
> -         if su $COUCHDB_USER -c "$command" > /dev/null; then
> 
> 
> _______________________________________________
> Pkg-erlang-commits mailing list
> Pkg-erlang-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-erlang-commits