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

[James Page]

The following commit has been merged in the master branch:
commit 1d29167e553706b84a9157ffd38c0ab82a9cb192
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jan 3 10:53:25 2012 +0000

    Tidy of README's and rule

diff --git a/debian/README b/debian/README
deleted file mode 100644
index 9a7113c..0000000
--- a/debian/README
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-The contrib rest could not be compiled since Debian misses the dependency
-https://grizzly.dev.java.net/
-
diff --git a/debian/README.source b/debian/README.source
index 8ab464a..6a0fd40 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,6 +1,9 @@
+Upstream tarball
+----------------
+
 The command used to filter and import the upstream tarball was:
 
-VERSION=3.3.1
+VERSION=3.3.4
 git-import-orig --pristine-tar --filter-pristine-tar --no-merge --upstream-version=$VERSION+dfsg1 \
                 --filter="*.jar" \
                 --filter="Makefile.in" \
@@ -19,3 +22,9 @@ git-import-orig --pristine-tar --filter-pristine-tar --no-merge --upstream-versi
                 --filter="zookeeper-$VERSION/src/c/generated" \
                 --filter="zookeeper-$VERSION/src/java/main/org/apache/jute/compiler/generated/*.java" \
                 --filter="zookeeper-$VERSION/src/java/generated" <tarball>
+
+RESTful support
+---------------
+
+The contrib rest could not be compiled since Debian misses the dependency
+https://grizzly.dev.java.net/
diff --git a/debian/rules b/debian/rules
index 4d3d425..429ba63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,9 +90,6 @@ override_dh_auto_clean:
 	rm -rf src/java/generated
 	rm -rf src/java/main/org/apache/jute/compiler/generated/*.java
 	rm -f zookeeper*.jar
-	#The following line caused lintian tag debian-rules-ignores-make-clean-error
-	#-$(MAKE) -C src/c distclean
-	#replaced by
 	[ ! -f src/c/Makefile ] || $(MAKE) -C src/c distclean
 	rm -f src/c/config.log src/c/config.status
 	[ ! -f src/contrib/zktreeutil/Makefile ] || $(MAKE) -C src/contrib/zktreeutil distclean

-- 
Apache ZooKeeper