[SCM] Apache ZooKeeper branch, master, updated. debian/3.3.6+dfsg-1-5-g7ada89e
James Page
james.page at ubuntu.com
Mon Feb 25 09:09:52 UTC 2013
The following commit has been merged in the master branch:
commit 7ada89e461e6f209613b247ffff24cbb4cfa0af0
Author: James Page <james.page at ubuntu.com>
Date: Mon Feb 25 09:09:15 2013 +0000
* New upstream release (Closes: #699120, LP: #1107400, #954160):
- d/p/ZOOKEEPER-{1374,1033}: Dropped, included upstream.
- Refreshed remaining patches.
- Drop bookkeeper support, now a separate project.
- d/control: Added new BD's on netty and slf4j.
- d/zookeeper.{install,cron.daily}: Drop scheduled transaction
log purging as now handled internally.
* d/control: Bumped Standards-Version, no changes.
* d/control: Dropped obsolete DM-Upload-Allowed.
* Sync Ubuntu changes:
- d/rules: Only execute native test suite on i386 and amd64
architectures; its a bit racey and does not execute reliably
on others.
diff --git a/debian/changelog b/debian/changelog
index d8a8fce..ed7e4b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,18 @@
-zookeeper (3.4.5+dfsg-1) UNRELEASED; urgency=low
-
- * New upstream release
+zookeeper (3.4.5+dfsg-1~exp1) UNRELEASED; urgency=low
+
+ * New upstream release (Closes: #699120, LP: #1107400, #954160):
+ - d/p/ZOOKEEPER-{1374,1033}: Dropped, included upstream.
+ - Refreshed remaining patches.
+ - Drop bookkeeper support, now a separate project.
+ - d/control: Added new BD's on netty and slf4j.
+ - d/zookeeper.{install,cron.daily}: Drop scheduled transaction
+ log purging as now handled internally.
+ * d/control: Bumped Standards-Version, no changes.
+ * d/control: Dropped obsolete DM-Upload-Allowed.
+ * Sync Ubuntu changes:
+ - d/rules: Only execute native test suite on i386 and amd64
+ architectures; its a bit racey and does not execute reliably
+ on others.
-- James Page <james.page at ubuntu.com> Thu, 07 Feb 2013 10:48:31 +0000
diff --git a/debian/control b/debian/control
index bdbb4cc..be5fda7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: James Page <james.page at ubuntu.com>
-Homepage: http://hadoop.apache.org/zookeeper
+Homepage: http://zookeeper.apache.org
Vcs-Browser: http://git.debian.org/?p=pkg-java/zookeeper.git
Vcs-Git: git://git.debian.org/pkg-java/zookeeper.git
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Build-Depends:
ant (>= 1.6.0),
ant-optional,
@@ -25,13 +25,13 @@ Build-Depends:
liblog4cxx10-dev,
liblog4j1.2-java (>> 1.2.15-8),
libnetty-java,
+ libslf4j-java,
libtool,
libxerces2-java,
libxml2-dev,
procps,
python-all-dev (>= 2.6.6-3~)
X-Python-Version: >= 2.6
-DM-Upload-Allowed: yes
Package: libzookeeper-java
Architecture: all
@@ -39,6 +39,7 @@ Depends:
libjline-java,
liblog4j1.2-java (>> 1.2.15-8),
libnetty-java,
+ libslf4j-java,
libxerces2-java,
${misc:Depends}
Description: Core Java libraries for zookeeper
@@ -68,7 +69,7 @@ Description: High-performance coordination service for distributed applications
Package: zookeeperd
Architecture: all
-Depends: zookeeper (= ${binary:Version}), ${misc:Depends}, lsb-base (>= 3.2-14)
+Depends: lsb-base (>= 3.2-14), zookeeper (= ${binary:Version}), ${misc:Depends}
Description: Init control scripts for zookeeper
ZooKeeper is a centralized, reliable, service for maintaining configuration
information, naming, providing distributed synchronization, and group
@@ -168,7 +169,10 @@ Description: Development files for single threaded zookeeper C bindings
Package: zookeeper-bin
Architecture: any
Section: misc
-Depends: libzookeeper-mt2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ libzookeeper-mt2 (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Command line utilities for zookeeper
ZooKeeper is a centralized, reliable, service for maintaining configuration
information, naming, providing distributed synchronization, and group
diff --git a/debian/libzookeeper-java.jlibs b/debian/libzookeeper-java.jlibs
index 4711480..8c15053 100644
--- a/debian/libzookeeper-java.jlibs
+++ b/debian/libzookeeper-java.jlibs
@@ -1,2 +1 @@
build/zookeeper.jar
-build/contrib/bookkeeper/zookeeper-bookkeeper.jar
diff --git a/debian/patches/debian/disable-cygwin-detection b/debian/patches/debian/disable-cygwin-detection
index 0ee9c3a..9d5a6d1 100644
--- a/debian/patches/debian/disable-cygwin-detection
+++ b/debian/patches/debian/disable-cygwin-detection
@@ -7,12 +7,10 @@ Description: Disable detection of cygwin under Debian installs
Author: Akira Kitada <akitada at gmail.com>
Forwarded: not-needed
-Index: zookeeper/bin/zkServer.sh
-===================================================================
---- zookeeper.orig/bin/zkServer.sh 2012-03-21 21:14:50.620574500 +0000
-+++ zookeeper/bin/zkServer.sh 2012-03-21 21:17:22.472936041 +0000
-@@ -70,15 +70,6 @@
- echo "Using config:$2" >&2
+--- a/bin/zkServer.sh
++++ b/bin/zkServer.sh
+@@ -69,15 +69,6 @@ then
+ ZOOCFG="$2"
fi
-if $cygwin
@@ -26,8 +24,8 @@ Index: zookeeper/bin/zkServer.sh
-
echo "Using config: $ZOOCFG" >&2
- if [ -z $ZOOPIDFILE ]
-@@ -130,7 +121,7 @@
+ if [ -z $ZOOPIDFILE ]; then
+@@ -140,7 +131,7 @@ stop)
then
echo "no zookeeper to stop (could not find file $ZOOPIDFILE)"
else
diff --git a/debian/patches/debian/patch-build-system b/debian/patches/debian/patch-build-system
index d34661a..07e611e 100644
--- a/debian/patches/debian/patch-build-system
+++ b/debian/patches/debian/patch-build-system
@@ -4,20 +4,18 @@ Description: Patches to upstream build system to disable use of ivy,
Author: James Page <james.page at ubuntu.com>, Thomas Koch <thomas at koch.ro>
Forwarded: not-needed
-Index: zookeeper/build.xml
-===================================================================
---- zookeeper.orig/build.xml 2012-08-08 09:39:55.000000000 +0100
-+++ zookeeper/build.xml 2012-08-08 09:40:57.822032084 +0100
+--- a/build.xml
++++ b/build.xml
@@ -25,7 +25,7 @@
<property environment="env"/>
- <property name="version" value="3.3.6" />
+ <property name="version" value="3.4.5" />
- <property name="final.name" value="${name}-${version}"/>
+ <property name="final.name" value="${name}"/>
<property name="revision.dir" value="${basedir}/.revision" />
<property name="revision.properties" value="revision.properties" />
<property file="${basedir}/src/java/${revision.properties}" />
-@@ -169,27 +169,17 @@
+@@ -184,27 +184,20 @@
<path id="java.classpath">
<pathelement location="${build.classes}"/>
<!-- allow the user to override (e.g. if there are local versions) -->
@@ -28,6 +26,9 @@ Index: zookeeper/build.xml
+ <include name="log4j-1.2.jar" />
+ <include name="jline.jar" />
+ <include name="xercesImpl.jar" />
++ <include name="slf4j-api.jar" />
++ <include name="slf4j-log4j12.jar" />
++ <include name="netty.jar" />
</fileset>
- <fileset dir="${lib.dir}">
- <include name="${lib.dir.includes}" />
@@ -51,7 +52,7 @@ Index: zookeeper/build.xml
</fileset>
<path refid="java.classpath"/>
</path>
-@@ -223,7 +213,7 @@
+@@ -246,7 +239,7 @@
targetfile="${src_generated.dir}/.generated"/>
</target>
@@ -60,25 +61,25 @@ Index: zookeeper/build.xml
<mkdir dir="${src_generated.dir}" />
<mkdir dir="${csrc_generated.dir}" />
<java classname="org.apache.jute.compiler.generated.Rcc" fork="true" dir="${src_generated.dir}">
-@@ -325,7 +315,7 @@
+@@ -354,7 +347,7 @@
<ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
</target>
- <target name="compile" depends="ivy-retrieve,clover,build-generated">
+ <target name="compile" depends="build-generated">
- <javac srcdir="${java.src.dir}" destdir="${build.classes}"
- target="${javac.target}" debug="on">
+ <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
+ target="${javac.target}" source="${javac.source}" debug="on">
<classpath refid="java.classpath"/>
-@@ -334,7 +324,7 @@
+@@ -363,7 +356,7 @@
</javac>
</target>
- <target name="compile-test" depends="ivy-retrieve-test,compile">
+ <target name="compile-test" depends="compile">
<mkdir dir="${test.java.classes}"/>
- <javac srcdir="${test.src.dir}" destdir="${test.java.classes}"
- target="${javac.target}" debug="on">
-@@ -769,21 +759,10 @@
+ <javac srcdir="${test.src.dir}" destdir="${test.java.classes}" includeantruntime="false"
+ target="${javac.target}" source="${javac.source}" debug="on">
+@@ -1124,21 +1117,10 @@
<target name="test-init" depends="jar,compile-test">
<delete dir="${test.log.dir}" />
<delete dir="${test.tmp.dir}" />
@@ -100,7 +101,7 @@ Index: zookeeper/build.xml
</target>
<condition property="quicktest">
-@@ -836,6 +815,9 @@
+@@ -1191,6 +1173,9 @@
<batchtest todir="${test.log.dir}" if="fulltest">
<fileset dir="${test.src.dir}">
<include name="**/*${test.category}Test.java"/>
@@ -110,24 +111,9 @@ Index: zookeeper/build.xml
</fileset>
</batchtest>
<batchtest todir="${test.log.dir}" if="testcase">
-Index: zookeeper/src/contrib/bookkeeper/build.xml
-===================================================================
---- zookeeper.orig/src/contrib/bookkeeper/build.xml 2012-08-08 09:39:55.000000000 +0100
-+++ zookeeper/src/contrib/bookkeeper/build.xml 2012-08-08 09:40:47.673998090 +0100
-@@ -34,7 +34,7 @@
-
- <target name="setjarname">
- <property name="jarname"
-- value="${build.dir}/zookeeper-${version}-${name}.jar"/>
-+ value="${build.dir}/zookeeper-${name}.jar"/>
- </target>
-
- <target name="init" depends="checkMainCompiled, zookeeperbuildcontrib.init"/>
-Index: zookeeper/src/contrib/build-contrib.xml
-===================================================================
---- zookeeper.orig/src/contrib/build-contrib.xml 2012-08-08 09:39:55.000000000 +0100
-+++ zookeeper/src/contrib/build-contrib.xml 2012-08-08 09:40:47.673998090 +0100
-@@ -70,25 +70,14 @@
+--- a/src/contrib/build-contrib.xml
++++ b/src/contrib/build-contrib.xml
+@@ -70,25 +70,16 @@
<path id="classpath">
<pathelement location="${build.classes}"/>
@@ -140,6 +126,8 @@ Index: zookeeper/src/contrib/build-contrib.xml
+ <include name="jline.jar" />
+ <include name="xercesImpl.jar" />
+ <include name="netty.jar" />
++ <include name="slf4j-api.jar" />
++ <include name="slf4j-log4j12.jar" />
</fileset>
- <fileset refid="lib.jars"/>
+ <!-- allow the user to override (e.g. if there are local versions) -->
@@ -159,7 +147,7 @@ Index: zookeeper/src/contrib/build-contrib.xml
</path>
<!-- ====================================================== -->
-@@ -133,7 +122,7 @@
+@@ -133,7 +124,7 @@
<target name="jar" depends="compile" unless="skip.contrib">
<echo message="contrib: ${name}"/>
<jar
@@ -168,7 +156,7 @@ Index: zookeeper/src/contrib/build-contrib.xml
basedir="${build.classes}"
/>
</target>
-@@ -211,15 +200,9 @@
+@@ -233,15 +224,9 @@
</target>
<target name="ivy-retrieve" depends="init,ivy-init">
@@ -184,10 +172,8 @@ Index: zookeeper/src/contrib/build-contrib.xml
</target>
-Index: zookeeper/src/contrib/zooinspector/build.xml
-===================================================================
---- zookeeper.orig/src/contrib/zooinspector/build.xml 2012-08-08 09:39:55.000000000 +0100
-+++ zookeeper/src/contrib/zooinspector/build.xml 2012-08-08 09:40:47.673998090 +0100
+--- a/src/contrib/zooinspector/build.xml
++++ b/src/contrib/zooinspector/build.xml
@@ -20,7 +20,7 @@
@@ -201,8 +187,8 @@ Index: zookeeper/src/contrib/zooinspector/build.xml
<fileset file="${basedir}/lib/log4j.properties" />
</copy>
<copy todir="${build.dir}/lib">
-- <fileset file="../../../build/zookeeper-3.3.1.jar" />
-+ <fileset file="../../../build/zookeeper-3.3.3.jar" />
+- <fileset file="../../../build/zookeeper-3.3.0.jar" />
++ <fileset file="../../../build/zookeeper.jar" />
</copy>
<copy todir="${build.dir}">
<fileset dir="${basedir}" includes="*.*" excludes="build.xml,ivy.xml" />
@@ -210,7 +196,7 @@ Index: zookeeper/src/contrib/zooinspector/build.xml
<jar jarfile="${jarname}">
<manifest>
<attribute name="Main-Class" value="org.apache.zookeeper.inspector.ZooInspector" />
-- <attribute name="Class-Path" value="lib/log4j-1.2.15.jar lib/TableLayout-20050920.jar lib/zookeeper-3.3.1.jar lib/jToaster-1.0.4.jar lib" />
+- <attribute name="Class-Path" value="lib/log4j-1.2.15.jar lib/TableLayout-20050920.jar lib/zookeeper-3.3.0.jar lib/jToaster-1.0.4.jar lib" />
<attribute name="Built-By" value="${user.name}" />
<attribute name="Built-At" value="${build.time}" />
<attribute name="Built-On" value="${host.name}" />
diff --git a/debian/patches/fixes/ZOOKEEPER-1033 b/debian/patches/fixes/ZOOKEEPER-1033
deleted file mode 100644
index 6a0a78b..0000000
--- a/debian/patches/fixes/ZOOKEEPER-1033
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Patch for 3.4.0 adapated for 3.3.3 to ensure that header
- files are installed to /usr/include/zookeeper instead of
- /usr/include/c-client-src
-Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-1033
-
-Index: zookeeper/src/c/configure.ac
-===================================================================
---- zookeeper.orig/src/c/configure.ac 2012-08-08 09:39:55.000000000 +0100
-+++ zookeeper/src/c/configure.ac 2012-08-08 09:41:33.358151084 +0100
-@@ -3,7 +3,7 @@
-
- AC_PREREQ(2.59)
-
--AC_INIT([zookeeper C client],3.3.6,[zookeeper-user at hadoop.apache.org],[c-client-src])
-+AC_INIT([zookeeper C client],3.3.6,[zookeeper-user at hadoop.apache.org],[zookeeper])
- AC_CONFIG_SRCDIR([src/zookeeper.c])
-
- # initialize Doxygen support
diff --git a/debian/patches/fixes/ZOOKEEPER-1374 b/debian/patches/fixes/ZOOKEEPER-1374
deleted file mode 100644
index 3b75735..0000000
--- a/debian/patches/fixes/ZOOKEEPER-1374
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Use __sync primitives for better cross platform support when
- compiling with gcc.
-Origin: https://issues.apache.org/jira/browse/ZOOKEEPER-1374
-
-Index: zookeeper/src/c/tests/ThreadingUtil.cc
-===================================================================
---- zookeeper.orig/src/c/tests/ThreadingUtil.cc 2012-01-27 22:36:14.696423169 +0000
-+++ zookeeper/src/c/tests/ThreadingUtil.cc 2012-01-27 22:36:46.460422374 +0000
-@@ -47,6 +47,9 @@
- // Atomics
- int32_t atomic_post_incr(volatile int32_t* operand, int32_t incr)
- {
-+#if defined(__GNUC__)
-+ return __sync_fetch_and_add(operand,incr);
-+#else
- int32_t result;
- __asm__ __volatile__(
- "lock xaddl %0,%1\n"
-@@ -54,15 +57,20 @@
- : "0"(incr)
- : "memory");
- return result;
-+#endif
- }
- int32_t atomic_fetch_store(volatile int32_t *ptr, int32_t value)
- {
-+#if defined(__GNUC__)
-+ return __sync_lock_test_and_set(ptr,value);
-+#else
- int32_t result;
- __asm__ __volatile__("lock xchgl %0,%1\n"
- : "=r"(result), "=m"(*ptr)
- : "0"(value)
- : "memory");
- return result;
-+#endif
- }
- #else
- int32_t atomic_post_incr(volatile int32_t* operand, int32_t incr){
diff --git a/debian/patches/fixes/ZOOKEEPER-705 b/debian/patches/fixes/ZOOKEEPER-705
index a7b16fa..ddb4f2a 100644
--- a/debian/patches/fixes/ZOOKEEPER-705
+++ b/debian/patches/fixes/ZOOKEEPER-705
@@ -1,10 +1,8 @@
-diff --git a/src/c/src/mt_adaptor.c b/src/c/src/mt_adaptor.c
-index 451eff1..2186f47 100644
--- a/src/c/src/mt_adaptor.c
+++ b/src/c/src/mt_adaptor.c
-@@ -350,11 +350,7 @@ int32_t inc_ref_counter(zhandle_t* zh,int i)
- int32_t fetch_and_add(volatile int32_t* operand, int incr)
+@@ -484,11 +484,7 @@ int32_t fetch_and_add(volatile int32_t*
{
+ #ifndef WIN32
int32_t result;
- asm __volatile__(
- "lock xaddl %0,%1\n"
@@ -13,5 +11,5 @@ index 451eff1..2186f47 100644
- : "memory");
+ result = __sync_fetch_and_add(operand, incr);
return result;
- }
-
+ #else
+ volatile int32_t result;
diff --git a/debian/patches/series b/debian/patches/series
index ea76641..d0b5792 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
-#debian/add_jtoaster_source_to_zooinspector
-#debian/patch-build-system
-#debian/disable-cygwin-detection
-#fixes/ZOOKEEPER-705
-#fixes/ZOOKEEPER-1033
-#fixes/ZOOKEEPER-1374
-#ftbfs-gcc-4.7.diff
+debian/add_jtoaster_source_to_zooinspector
+debian/patch-build-system
+debian/disable-cygwin-detection
+fixes/ZOOKEEPER-705
+ftbfs-gcc-4.7.diff
diff --git a/debian/rules b/debian/rules
index 5c17fbe..77d363b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,11 +22,6 @@ override_dh_auto_build:
cd src/c && ./configure --prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
$(MAKE) -C src/c
- # Compile contribs - bookkeeper
- cd src/contrib && \
- ant -Dversion=$(DEB_UPSTREAM_VERSION) \
- -propertyfile ../../debian/ant.properties \
- -Dcontribfilesetincludes="bookkeeper/build.xml"
# Compile contribs - zooinspector
cd src/contrib && \
ant -Dversion=$(DEB_UPSTREAM_VERSION) \
@@ -59,16 +54,21 @@ override_dh_install:
dh_install
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+# Limit architectures which execute tests as some
+# non x86 archs can be a bit racey.
+TEST_ARCH=i386 amd64
+ifneq (,$(findstring $(DEB_BUILD_ARCH), $(TEST_ARCH)))
+TEST_JARS=jline log4j-1.2 xercesImpl xmlParserAPIs netty slf4j-api slf4j-log4j12
override_dh_auto_test-arch:
# C testing starts/stops zookeeper
# this ensures that all the right classes are found
- for jar in jline log4j-1.2 xercesImpl xmlParserAPIs; do \
+ for jar in $(TEST_JARS); do \
ln -sf /usr/share/java/$$jar.jar build/lib/$$jar.jar; \
done;
# Execute multi-threaded test suite
$(MAKE) -C src/c zktest-mt
cd src/c && ./zktest-mt
-
+endif
# Only run core Java unit tests on i386 architecture as this is the arch
# that they are built and published on - works around -indep not working
# in Ubuntu.
diff --git a/debian/zookeeper.cron.daily b/debian/zookeeper.cron.daily
deleted file mode 100644
index 6c4147e..0000000
--- a/debian/zookeeper.cron.daily
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-ZK_PURGE_SCRIPT=/usr/share/zookeeper/bin/zkPurgeTxnLog.sh
-[ -r $ZK_PURGE_SCRIPT ] && . $ZK_PURGE_SCRIPT || :
diff --git a/debian/zookeeper.install b/debian/zookeeper.install
index c49ece4..d7f100a 100644
--- a/debian/zookeeper.install
+++ b/debian/zookeeper.install
@@ -2,7 +2,6 @@ bin/zkCleanup.sh /usr/share/zookeeper/bin/
bin/zkCli.sh /usr/share/zookeeper/bin/
bin/zkServer.sh /usr/share/zookeeper/bin/
build/contrib/ZooInspector/zookeeper-ZooInspector.jar /usr/share/zookeeper/zooinspector
-debian/bin/zkPurgeTxnLog.sh /usr/share/zookeeper/bin/
debian/conf_example /etc/zookeeper/
debian/zooinspector /usr/bin
src/contrib/zooinspector/config/* /etc/zookeeper/zooinspector
--
Apache ZooKeeper
More information about the pkg-java-commits
mailing list