Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
I'd like to request an unblock for the zookeeper package. The not yet uploaded version 3.4.5+dfsg-3 fixes the version of a build dependency and adds Maven artifacts in the libzookeeper-java package. Thank you unblock zookeeper/3.4.5+dfsg-3 dpkg-source: warning: extracting unsigned source package (/home/ebourg/packaging/zookeeper_3.4.5+dfsg-3.dsc) diff -Nru zookeeper-3.4.5+dfsg/debian/changelog zookeeper-3.4.5+dfsg/debian/changelog --- zookeeper-3.4.5+dfsg/debian/changelog 2014-03-16 21:07:30.000000000 +0100 +++ zookeeper-3.4.5+dfsg/debian/changelog 2015-01-21 21:48:52.000000000 +0100 @@ -1,3 +1,16 @@ +zookeeper (3.4.5+dfsg-3) unstable; urgency=medium + + * Team upload. + + [ James Page ] + * d/control: Bump epoch on default-jdk BD to exclude archictectures which + don't have Java 6 or better (Closes: #742405). + + [ Emmanuel Bourg ] + * Install the Maven artifacts (Closes: #775893) + + -- Emmanuel Bourg <[email protected]> Wed, 21 Jan 2015 21:45:52 +0100 + zookeeper (3.4.5+dfsg-2) unstable; urgency=high [ tony mancill ] diff -Nru zookeeper-3.4.5+dfsg/debian/control zookeeper-3.4.5+dfsg/debian/control --- zookeeper-3.4.5+dfsg/debian/control 2014-03-15 23:57:22.000000000 +0100 +++ zookeeper-3.4.5+dfsg/debian/control 2015-01-21 21:45:46.000000000 +0100 @@ -13,7 +13,7 @@ autoconf, automake, debhelper (>= 9~), - default-jdk (>= 1:1.6), + default-jdk (>= 2:1.6), default-jdk-doc, help2man, javacc, @@ -30,6 +30,7 @@ libtool, libxerces2-java, libxml2-dev, + maven-repo-helper, procps, python-all-dev (>= 2.6.6-3~) X-Python-Version: >= 2.6 diff -Nru zookeeper-3.4.5+dfsg/debian/libzookeeper-java.jlibs zookeeper-3.4.5+dfsg/debian/libzookeeper-java.jlibs --- zookeeper-3.4.5+dfsg/debian/libzookeeper-java.jlibs 2014-03-15 18:45:57.000000000 +0100 +++ zookeeper-3.4.5+dfsg/debian/libzookeeper-java.jlibs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -build/zookeeper.jar diff -Nru zookeeper-3.4.5+dfsg/debian/maven.rules zookeeper-3.4.5+dfsg/debian/maven.rules --- zookeeper-3.4.5+dfsg/debian/maven.rules 1970-01-01 01:00:00.000000000 +0100 +++ zookeeper-3.4.5+dfsg/debian/maven.rules 2015-01-21 11:28:50.000000000 +0100 @@ -0,0 +1 @@ +log4j log4j * s/.*/1.2.x/ * * diff -Nru zookeeper-3.4.5+dfsg/debian/pom.xml zookeeper-3.4.5+dfsg/debian/pom.xml --- zookeeper-3.4.5+dfsg/debian/pom.xml 1970-01-01 01:00:00.000000000 +0100 +++ zookeeper-3.4.5+dfsg/debian/pom.xml 2012-11-19 01:57:42.000000000 +0100 @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Apache Maven 2 POM generated by Apache Ivy + http://ant.apache.org/ivy/ + Apache Ivy version: 2.2.0 20100923230623 +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <packaging>pom</packaging> + <version>3.4.5</version> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.15</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + <version>0.9.94</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.netty</groupId> + <artifactId>netty</artifactId> + <version>3.2.2.Final</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.vafer</groupId> + <artifactId>jdeb</artifactId> + <version>0.8</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-all</artifactId> + <version>1.8.2</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>checkstyle</groupId> + <artifactId>checkstyle</artifactId> + <version>5.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jdiff</groupId> + <artifactId>jdiff</artifactId> + <version>1.0.9</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xerces</artifactId> + <version>1.4.4</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-tasks</artifactId> + <version>0.6</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + <optional>true</optional> + </dependency> + </dependencies> +</project> diff -Nru zookeeper-3.4.5+dfsg/debian/rules zookeeper-3.4.5+dfsg/debian/rules --- zookeeper-3.4.5+dfsg/debian/rules 2014-03-15 18:45:57.000000000 +0100 +++ zookeeper-3.4.5+dfsg/debian/rules 2015-01-21 23:09:34.000000000 +0100 @@ -51,6 +51,10 @@ sed -e 's/__ARCH__/$(DEB_HOST_MULTIARCH)/g' debian/$$install.install.in \ > debian/$$install.install; \ done + + # Install the Maven artifacts + mh_installpom -plibzookeeper-java debian/pom.xml + mh_installjar -plibzookeeper-java --java-lib --has-package-version debian/pom.xml build/zookeeper.jar dh_install ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) @@ -84,6 +88,7 @@ endif override_dh_clean: + mh_clean dh_clean --exclude=src/java \ --exclude=src/docs \ --exclude=src/c \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
