[zookeeper] 01/01: Depend on libnetty-3.9-java instead of libnetty-java

Tue Jul 28 14:05:00 UTC 2015

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository zookeeper.

commit a9aed1fe80dc24e3ab89e458a89c4ffb3938b041
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 28 15:44:57 2015 +0200

    Depend on libnetty-3.9-java instead of libnetty-java
---
 debian/changelog                               |  7 +++++
 debian/control                                 |  2 +-
 debian/maven.rules                             |  1 -
 debian/patches/debian/patch-build-system.patch | 36 +++++++++++---------------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a10a96a..1353cb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zookeeper (3.4.6-6) unstable; urgency=medium
+
+  * Team upload.
+  * Depend on libnetty-3.9-java instead of libnetty-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 28 Jul 2015 15:44:25 +0200
+
 zookeeper (3.4.6-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 69d44c3..04172a1 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  liblog4cxx10-dev,
  liblog4j1.2-java (>> 1.2.15-8),
  libmockito-java,
- libnetty-java,
+ libnetty-3.9-java,
  libslf4j-java,
  libtool,
  libxerces2-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index cec6589..97cd292 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1 @@
 log4j log4j * s/.*/1.2.x/ * *
-s/io\.netty/org.jboss.netty/ * * s/.*/debian/ * *
diff --git a/debian/patches/debian/patch-build-system.patch b/debian/patches/debian/patch-build-system.patch
index 745582c..ce2fc0e 100644
--- a/debian/patches/debian/patch-build-system.patch
+++ b/debian/patches/debian/patch-build-system.patch
@@ -4,11 +4,9 @@ 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
-+++ zookeeper/build.xml
-@@ -31,7 +31,7 @@ xmlns:maven="antlib:org.apache.maven.art
+--- a/build.xml
++++ b/build.xml
+@@ -31,7 +31,7 @@
      <property environment="env"/>
      
      <property name="version" value="3.4.6" />
@@ -17,7 +15,7 @@ Index: zookeeper/build.xml
      <property name="revision.dir" value="${basedir}/.revision" />
      <property name="revision.properties" value="revision.properties" />
      <property file="${basedir}/src/java/${revision.properties}" />
-@@ -216,27 +216,21 @@ xmlns:maven="antlib:org.apache.maven.art
+@@ -216,27 +216,21 @@
      <path id="java.classpath">
        <pathelement location="${build.classes}"/>
        <!-- allow the user to override (e.g. if there are local versions) -->
@@ -30,7 +28,7 @@ Index: zookeeper/build.xml
 +        <include name="xercesImpl.jar" />
 +        <include name="slf4j-api.jar" />
 +        <include name="slf4j-log4j12.jar" />
-+        <include name="netty.jar" />
++        <include name="netty-3.9.0.Final.jar" />
        </fileset>
 -      <fileset dir="${lib.dir}">
 -        <include name="${lib.dir.includes}" />
@@ -55,7 +53,7 @@ Index: zookeeper/build.xml
        </fileset>
        <path refid="java.classpath"/>
      </path>
-@@ -278,7 +272,7 @@ xmlns:maven="antlib:org.apache.maven.art
+@@ -278,7 +272,7 @@
                    targetfile="${src_generated.dir}/.generated"/>
      </target>
  
@@ -64,7 +62,7 @@ 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}">
-@@ -391,7 +385,7 @@ xmlns:maven="antlib:org.apache.maven.art
+@@ -391,7 +385,7 @@
                      pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
        <ivy:cachepath pathid="mvn-ant-task-classpath" conf="mvn-ant-task"/>
      </target>
@@ -73,7 +71,7 @@ Index: zookeeper/build.xml
          <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
                 target="${javac.target}" source="${javac.source}" debug="on">
              <classpath refid="java.classpath"/>
-@@ -400,7 +394,7 @@ xmlns:maven="antlib:org.apache.maven.art
+@@ -400,7 +394,7 @@
          </javac>
      </target>
  
@@ -82,7 +80,7 @@ Index: zookeeper/build.xml
        <mkdir dir="${test.java.classes}"/>
        <javac srcdir="${test.src.dir}" destdir="${test.java.classes}" includeantruntime="false"
               target="${javac.target}" source="${javac.source}" debug="on">
-@@ -1222,26 +1216,10 @@ xmlns:maven="antlib:org.apache.maven.art
+@@ -1222,26 +1216,10 @@
      <target name="test-init" depends="jar,compile-test">
          <delete dir="${test.log.dir}" />
          <delete dir="${test.tmp.dir}" />
@@ -109,7 +107,7 @@ Index: zookeeper/build.xml
      </target>
  
      <condition property="quicktest">
-@@ -1294,6 +1272,9 @@ xmlns:maven="antlib:org.apache.maven.art
+@@ -1294,6 +1272,9 @@
            <batchtest todir="${test.log.dir}" if="fulltest">
              <fileset dir="${test.src.dir}">
                <include name="**/*${test.category}Test.java"/>
@@ -119,10 +117,8 @@ Index: zookeeper/build.xml
              </fileset>
            </batchtest>
            <batchtest todir="${test.log.dir}" if="testcase">
-Index: zookeeper/src/contrib/build-contrib.xml
-===================================================================
---- zookeeper.orig/src/contrib/build-contrib.xml
-+++ zookeeper/src/contrib/build-contrib.xml
+--- a/src/contrib/build-contrib.xml
++++ b/src/contrib/build-contrib.xml
 @@ -70,25 +70,16 @@
  
    <path id="classpath">
@@ -135,7 +131,7 @@ Index: zookeeper/src/contrib/build-contrib.xml
 +      <include name="log4j-1.2.jar" />
 +      <include name="jline.jar" />
 +      <include name="xercesImpl.jar" />
-+      <include name="netty.jar" />
++      <include name="netty.jar-3.9.0.Final" />
 +      <include name="slf4j-api.jar" />
 +      <include name="slf4j-log4j12.jar" />
      </fileset>
@@ -182,10 +178,8 @@ Index: zookeeper/src/contrib/build-contrib.xml
    </target>
  
  
-Index: zookeeper/src/contrib/zooinspector/build.xml
-===================================================================
---- zookeeper.orig/src/contrib/zooinspector/build.xml
-+++ zookeeper/src/contrib/zooinspector/build.xml
+--- a/src/contrib/zooinspector/build.xml
++++ b/src/contrib/zooinspector/build.xml
 @@ -20,7 +20,7 @@
  
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/zookeeper.git

