[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.4+dfsg1-1-2-gad386b5

[James Page]

The following commit has been merged in the master branch:
commit ad386b5f90d9c4fed0e51e4045f3b37fcaca8866
Author: James Page <james.page at canonical.com>
Date:   Mon Dec 12 14:16:39 2011 +0000

    Disable detection of cygwin as not relevant for Debian based installs and complicates configuration (Closes: #650882). Thanks to Akira Kitada for this patch.

diff --git a/debian/changelog b/debian/changelog
index 06dbec8..c311f48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,12 @@ zookeeper (3.3.4+dfsg1-2) UNRELEASED; urgency=low
     renamed libzookeeper{2,-dev} -> libzookeeper-mt{2,-dev}.
   * Added transitional package libzookeeper2 -> libzookeeper-mt2.
   * Convert libzookeeper-{st,mt}2 for MultiArch support.
+  * Disable detection of cygwin as not relevant for Debian based
+    installs and complicates configuration (Closes: #650882). Thanks
+    to Akira Kitada for this patch.
   * Really close RFH (Closes: #579791).
 
- -- James Page <james.page at ubuntu.com>  Mon, 12 Dec 2011 12:53:48 +0000
+ -- James Page <james.page at ubuntu.com>  Mon, 12 Dec 2011 13:31:47 +0000
 
 zookeeper (3.3.4+dfsg1-1) unstable; urgency=low
 
diff --git a/debian/patches/debian/disable-cygwin-detection b/debian/patches/debian/disable-cygwin-detection
new file mode 100644
index 0000000..e12bae7
--- /dev/null
+++ b/debian/patches/debian/disable-cygwin-detection
@@ -0,0 +1,36 @@
+Description: Disable detection of cygwin under Debian installs
+ as this is not compatible with the way the environment is 
+ managed through alternatives.
+ .
+ TODO - review alongside use of alternatives for managing 
+ configuration.
+Author: Akira Kitada <akitada at gmail.com>
+Forwarded: not-needed
+
+--- a/bin/zkServer.sh   2011-11-30 19:50:33.000000000 +0900
++++ b/bin/zkServer.sh   2011-12-04 18:12:56.000000000 +0900
+@@ -70,15 +70,6 @@
+     echo "Using config:$2" >&2
+ fi
+ 
+-if $cygwin
+-then
+-    ZOOCFG=`cygpath -wp "$ZOOCFG"`
+-    # cygwin has a "kill" in the shell itself, gets confused
+-    KILL=/bin/kill
+-else
+-    KILL=kill
+-fi
+-
+ echo "Using config: $ZOOCFG" >&2
+ 
+ if [ -z $ZOOPIDFILE ]
+@@ -126,7 +117,7 @@
+     then
+       echo "no zookeeper to stop (could not find file $ZOOPIDFILE)"
+     else
+-      $KILL -9 $(cat "$ZOOPIDFILE")
++      kill -9 $(cat "$ZOOPIDFILE")
+       rm "$ZOOPIDFILE"
+       echo STOPPED
+     fi
diff --git a/debian/patches/series b/debian/patches/series
index 2bf7812..947159a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 debian/add_jtoaster_source_to_zooinspector
 debian/patch-build-system
+debian/disable-cygwin-detection
 fixes/ZOOKEEPER-705
 fixes/ZOOKEEPER-1033
diff --git a/debian/rules b/debian/rules
index 6698959..4d3d425 100755
--- a/debian/rules
+++ b/debian/rules
@@ -122,7 +122,7 @@ override_dh_installdocs:
 	  -plibzookeeper-java -pzookeeper -pzookeeperd -plibzookeeper-java-doc
 	dh_installdocs --link-doc=libzookeeper-mt2 \
 	  -plibzookeeper-mt2 -plibzookeeper-mt-dev -pzookeeper-bin \
-      -ppython-zookeeper
+      -ppython-zookeeper -plibzookeeper2
 	dh_installdocs --link-doc=libzookeeper-st2 \
 	  -plibzookeeper-st2 -plibzookeeper-st-dev
 endif

-- 
Apache ZooKeeper