[Git][java-team/zookeeper][master] 6 commits: Declare compliance with Debian Policy 4.2.0.
Markus Koschany
gitlab at salsa.debian.org
Thu Aug 23 12:02:07 BST 2018
Markus Koschany pushed to branch master at Debian Java Maintainers / zookeeper
Commits:
edf4393a by Markus Koschany at 2018-08-23T10:13:58Z
Declare compliance with Debian Policy 4.2.0.
- - - - -
b56bf88d by Markus Koschany at 2018-08-23T10:15:36Z
Use https for Format field.
- - - - -
152fd34f by Markus Koschany at 2018-08-23T10:16:29Z
Release 3.4.12-2
- - - - -
55f4d87e by Markus Koschany at 2018-08-23T10:21:10Z
Remove ancient X-Python-Version field because it is satisfied even in
oldstable.
- - - - -
2bc36241 by Markus Koschany at 2018-08-23T10:29:37Z
Remove trailing whitespace
- - - - -
95ee2e51 by Markus Koschany at 2018-08-23T10:55:14Z
Add 15-javadoc-doclet.patch. The missing doclet class causes a javadoc error.
The patch removes the optional doclet option and the standard doclet is used.
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/15-javadoc-doclet.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
-zookeeper (3.4.12-2) UNRELEASED; urgency=medium
+zookeeper (3.4.12-2) unstable; urgency=medium
+ * Team upload.
+
+ [ tony mancill ]
* Add patch for FTBFS with GCC-8 (Closes: #897892)
- -- tony mancill <tmancill at debian.org> Sat, 30 Jun 2018 20:59:21 -0700
+ [ Markus Koschany ]
+ * Declare compliance with Debian Policy 4.2.0.
+ * debian/control: Remove ancient X-Python-Version field because it is
+ satisfied even in oldstable.
+ * Add 15-javadoc-doclet.patch. The missing doclet class causes a javadoc
+ error. Now the documentation is built again.
+
+ -- Markus Koschany <apo at debian.org> Thu, 23 Aug 2018 12:16:06 +0200
zookeeper (3.4.12-1) unstable; urgency=medium
@@ -288,7 +298,7 @@ zookeeper (3.3.5+dfsg1-2) unstable; urgency=low
* d/patches/fixes/ZOOKEEPER-1431: Fix up memory leak in zookeeper
python binding which results in significant memory growth for large
- result sets (Closes: #665962). Thanks to Johan Rydberg for identifying
+ result sets (Closes: #665962). Thanks to Johan Rydberg for identifying
this bug and Kapil Thangavelu for the patch.
-- James Page <james.page at ubuntu.com> Mon, 28 May 2012 11:51:03 +0100
@@ -319,20 +329,20 @@ zookeeper (3.3.4+dfsg1-3) unstable; urgency=low
Thanks to Clint Byrum for this fix.
- Enable C and Java test suites:
- d/patches/fixes/ZOOKEEPER-1374: Use __sync_* primitives
- instead of ASM code when available to improve portability across
+ instead of ASM code when available to improve portability across
supported platforms.
- d/patches/fix-broken-c-client-test.patch: Fixes the unit test so
it will pass with EINVAL which is the correct error. Thanks to
Clint Byrum for this fix.
- d/rules: Enable C client test suite for all architectures.
- - d/rules: Only run core Java test suite when building
+ - d/rules: Only run core Java test suite when building
Architecture: all packages.
-- James Page <james.page at ubuntu.com> Mon, 30 Jan 2012 13:21:21 +0000
zookeeper (3.3.4+dfsg1-2) unstable; urgency=low
- * Added new libzookeeper-st{2,-dev} packages (Closes: #650938) and
+ * Added new libzookeeper-st{2,-dev} packages (Closes: #650938) and
renamed libzookeeper{2,-dev} -> libzookeeper-mt{2,-dev}.
* Added transitional package libzookeeper2 -> libzookeeper-mt2.
* Convert libzookeeper-{st,mt}2 for MultiArch support.
@@ -350,18 +360,18 @@ zookeeper (3.3.4+dfsg1-1) unstable; urgency=low
- d/patches/fixes/ZOOKEEPER-1117: Dropped - fix included upstream.
- Refreshed patches.
* Added support for upstart under Ubuntu (LP: #862762):
- - d/rules,d/zookeeperd.upstart.in: Detect Ubuntu and swap in provided
+ - d/rules,d/zookeeperd.upstart.in: Detect Ubuntu and swap in provided
upstart configuration if required.
- - d/ubuntu|debian_control_vars,d/control,d/rules: Provide different Depends
+ - d/ubuntu|debian_control_vars,d/control,d/rules: Provide different Depends
for zookeeperd package when building under Ubuntu/Debian.
* Enabled C and Java test suites:
- - d/control,d/compat: Bumped debhelper compat level to 8 to allow
+ - d/control,d/compat: Bumped debhelper compat level to 8 to allow
arch/indep overrides.
- d/rules: Enable test suites for -arch and -indep builds.
- - d/patches/debian/patch-build-system: Patch unit testing to exclude
- InvalidSnapshot and Upgrade tests (non-free data) and to pickup
+ - d/patches/debian/patch-build-system: Patch unit testing to exclude
+ InvalidSnapshot and Upgrade tests (non-free data) and to pickup
junit4 from system library.
- - d/rules: Disable test suite execution for the time being as does
+ - d/rules: Disable test suite execution for the time being as does
not run reliably.
* Close RFH for this package (LP: #579791).
@@ -387,7 +397,7 @@ zookeeper (3.3.3+dfsg2-1) unstable; urgency=low
* Re-enable python 2.7 modules (Closes: #633690):
- debian/control: X-Python-Version: >= 2.6
* debian/copyright: added EPL-1.0 for src/contrib/zooinspector/icons/*.
- * debian/patches/fixes/ZOOKEEPER-1033: Cherry picked patch from 3.4.0
+ * debian/patches/fixes/ZOOKEEPER-1033: Cherry picked patch from 3.4.0
so that headers for c bindings are installed to /usr/include/zookeeper.
* Purged additional non-DFSG files from upstream source:
- src/java/test/data/* : invalid snapshot and upgrade testing data.
@@ -397,16 +407,16 @@ zookeeper (3.3.3+dfsg2-1) unstable; urgency=low
zookeeper (3.3.3+dfsg1-1) unstable; urgency=low
* New upstream release.
- * Resolve FTBFS on mips and hppa - platforms should not be supported
+ * Resolve FTBFS on mips and hppa - platforms should not be supported
as zookeeper needs default-jdk >= 1:1.6 (Closes: #626020,#594970).
* Added myself to Uploaders.
* Removed Thomas Koch from Uploaders - thanks for all of your work.
* Bumped Standards-Version: 3.9.2; no changes.
* Transition to dh_python2.
- * Fixed FTBFS due to -Werror actually working and causing build
+ * Fixed FTBFS due to -Werror actually working and causing build
failures in gcc >= 4.6.1 (Closes: #625441).
* debian/bin/zkPurgeTxnLog.sh: Switch DATADIR and DATALOGDIR to match
- parameter ordering in Zookeeper code (Closes: #601383) - thanks to
+ parameter ordering in Zookeeper code (Closes: #601383) - thanks to
Paul Paradise for identifying this issue and the fix.
* debian/copyright: upgrade to DEP-5 format.
@@ -444,7 +454,7 @@ zookeeper (3.2.2+dfsg3-3) unstable; urgency=low
* fix lintian tag debian-rules-ignores-make-clean-error
* don't install executables to /usr/bin without manpages and proper
names
- * Use Built-in functions for atomic memory access instead of
+ * Use Built-in functions for atomic memory access instead of
hard-coded assembler. Thx Matthias Klose. Closes: #568618.
* move executables to /usr/lib/... instead of /usr/share/...
@@ -460,7 +470,7 @@ zookeeper (3.2.2+dfsg3-2) unstable; urgency=low
zookeeper (3.2.2+dfsg3-1) unstable; urgency=low
* New repackaging after FTP rejection due to overseen license issues.
- * New repackaging of upstream tarball to exclude generated code.
+ * New repackaging of upstream tarball to exclude generated code.
* Initial release. (Closes: #561947)
-- Thomas Koch <thomas.koch at ymc.ch> Fri, 27 Jan 2010 16:41:22 +0100
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -35,8 +35,7 @@ Build-Depends:
pkg-config,
procps,
python-all-dev (>= 2.6.6-3~)
-X-Python-Version: >= 2.6
-Standards-Version: 4.1.4
+Standards-Version: 4.2.0
Vcs-Git: https://salsa.debian.org/java-team/zookeeper.git
Vcs-Browser: https://salsa.debian.org/java-team/zookeeper
Homepage: https://zookeeper.apache.org
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache Zookeeper
Source: http://hadoop.apache.org/zookeeper/releases.html
=====================================
debian/patches/15-javadoc-doclet.patch
=====================================
--- /dev/null
+++ b/debian/patches/15-javadoc-doclet.patch
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 23 Aug 2018 12:52:04 +0200
+Subject: 15 javadoc doclet
+
+The missing doclet class causes a javadoc error thus no javadoc will be built
+at all.
+
+Forwarded: not-needed
+---
+ build.xml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 9e81b99..7c1fa40 100644
+--- a/build.xml
++++ b/build.xml
+@@ -554,8 +554,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
+ bottom="Copyright © ${year} The Apache Software Foundation"
+ locale="en"
+ additionalparam="-notimestamp"
+- doclet="org.apache.yetus.audience.tools.IncludePublicAnnotationsStandardDoclet"
+- docletpath="${ivy.lib}/audience-annotations-${audience-annotations.version}.jar"
+ >
+
+ <fileset dir="${java.src.dir}">
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
12-add-yetus-annotations.patch
13-disable-netty-connection-factory.patch
14-ftbfs-with-gcc-8.patch
+15-javadoc-doclet.patch
View it on GitLab: https://salsa.debian.org/java-team/zookeeper/compare/d5307342e5876599c1bfcdf973ea85906b737b36...95ee2e51261377819fd949d27ba6c5b76cd600d3
--
View it on GitLab: https://salsa.debian.org/java-team/zookeeper/compare/d5307342e5876599c1bfcdf973ea85906b737b36...95ee2e51261377819fd949d27ba6c5b76cd600d3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180823/48bcf50b/attachment.html>
More information about the pkg-java-commits
mailing list