The following commit has been merged in the master branch:
commit f136fb7184e54b4d92d54f845dca74edb90a8793
Author: James Page <james.p...@ubuntu.com>
Date: Mon Feb 25 13:52:23 2013 +0000
d/control: Added new BD's on netty, slf4j and mockito.
diff --git a/debian/changelog b/debian/changelog
index ee8c767..073f6a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ zookeeper (3.4.5+dfsg-1~exp1) experimental; urgency=low
- 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/control: Added new BD's on netty, slf4j and mockito.
- d/zookeeper.{install,cron.daily}: Drop scheduled transaction
log purging as now handled internally.
* d/control: Bumped Standards-Version, no changes.
diff --git a/debian/control b/debian/control
index be5fda7..fb21c0c 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends:
libjline-java,
liblog4cxx10-dev,
liblog4j1.2-java (>> 1.2.15-8),
+ libmockito-java,
libnetty-java,
libslf4j-java,
libtool,
diff --git a/debian/patches/debian/patch-build-system
b/debian/patches/debian/patch-build-system
index 07e611e..e6e0ad0 100644
--- a/debian/patches/debian/patch-build-system
+++ b/debian/patches/debian/patch-build-system
@@ -15,7 +15,7 @@ Forwarded: not-needed
<property name="revision.dir" value="${basedir}/.revision" />
<property name="revision.properties" value="revision.properties" />
<property file="${basedir}/src/java/${revision.properties}" />
-@@ -184,27 +184,20 @@
+@@ -184,27 +184,21 @@
<path id="java.classpath">
<pathelement location="${build.classes}"/>
<!-- allow the user to override (e.g. if there are local versions) -->
@@ -49,10 +49,11 @@ Forwarded: not-needed
- <include name="**/*.jar" />
+ <fileset dir="/usr/share/java">
+ <include name="junit4.jar" />
++ <include name="mockito-core.jar" />
</fileset>
<path refid="java.classpath"/>
</path>
-@@ -246,7 +239,7 @@
+@@ -246,7 +240,7 @@
targetfile="${src_generated.dir}/.generated"/>
</target>
@@ -61,7 +62,7 @@ Forwarded: not-needed
<mkdir dir="${src_generated.dir}" />
<mkdir dir="${csrc_generated.dir}" />
<java classname="org.apache.jute.compiler.generated.Rcc" fork="true"
dir="${src_generated.dir}">
-@@ -354,7 +347,7 @@
+@@ -354,7 +348,7 @@
<ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
</target>
@@ -70,7 +71,7 @@ Forwarded: not-needed
<javac srcdir="${java.src.dir}" destdir="${build.classes}"
includeantruntime="false"
target="${javac.target}" source="${javac.source}" debug="on">
<classpath refid="java.classpath"/>
-@@ -363,7 +356,7 @@
+@@ -363,7 +357,7 @@
</javac>
</target>
@@ -79,7 +80,7 @@ Forwarded: not-needed
<mkdir dir="${test.java.classes}"/>
<javac srcdir="${test.src.dir}" destdir="${test.java.classes}"
includeantruntime="false"
target="${javac.target}" source="${javac.source}" debug="on">
-@@ -1124,21 +1117,10 @@
+@@ -1124,21 +1118,10 @@
<target name="test-init" depends="jar,compile-test">
<delete dir="${test.log.dir}" />
<delete dir="${test.tmp.dir}" />
@@ -101,7 +102,7 @@ Forwarded: not-needed
</target>
<condition property="quicktest">
-@@ -1191,6 +1173,9 @@
+@@ -1191,6 +1174,9 @@
<batchtest todir="${test.log.dir}" if="fulltest">
<fileset dir="${test.src.dir}">
<include name="**/*${test.category}Test.java"/>
--
Apache ZooKeeper
_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
