[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:51 UTC 2013


The following commit has been merged in the master branch:
commit 63cb1a154be0155e52b55da78e8605f6743e7ec6
Merge: 9b1faf94d6813fb3cfaee91faaea9599b645ddb7 da03b76ea607990a474eae21619a6aa94bc408db
Author: James Page <james.page at ubuntu.com>
Date:   Thu Feb 7 10:48:31 2013 +0000

    Imported Debian patch 3.4.5+dfsg-1

diff --combined debian/changelog
index b784389,0000000..d8a8fce
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,195 -1,0 +1,201 @@@
++zookeeper (3.4.5+dfsg-1) UNRELEASED; urgency=low
++
++  * New upstream release
++
++ -- James Page <james.page at ubuntu.com>  Thu, 07 Feb 2013 10:48:31 +0000
++
 +zookeeper (3.3.6+dfsg-1) experimental; urgency=low
 +
 +  * Re-sync with Ubuntu.
 +  * New upstream release:
 +    - Dropped patches for ZOOKEEPER-1403 and ZOOKEEPER-1431; included upstream.
 +    - Refreshed all other patches.
 +  * d/{watch,orig-tar.sh,README.source}: Repack upstream tarball using uscan
 +    to ease new upstream releases.
 +  * d/control: Version debhelper (>= 9~).
 +  * d/rules: Refactor contrib builds to use properties file.
 +  * d/ant.properties: Collate properties for contrib builds ensuring that
 +    bytecode built is backwards compatible.
 +
 + -- James Page <james.page at ubuntu.com>  Wed, 19 Sep 2012 10:08:46 +0100
 +
 +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 
 +    this bug and Kapil Thangavelu for the patch.
 +
 + -- James Page <james.page at ubuntu.com>  Mon, 28 May 2012 11:51:03 +0100
 +
 +zookeeper (3.3.5+dfsg1-1.1) unstable; urgency=low
 +
 +  * Non maintainer upload.
 +  * Fix build failure with GCC 4.7.
 +
 + -- Matthias Klose <doko at debian.org>  Thu, 10 May 2012 18:00:25 +0200
 +
 +zookeeper (3.3.5+dfsg1-1) unstable; urgency=low
 +
 +  * New upstream bugfix release.
 +    - d/fix-broken-c-client-unittest.patch: Dropped - accepted upstream.
 +    - Refreshed all other patches.
 +  * Bumped Standards-Version: 3.9.3.
 +  * Fix issue with quoting of parameters in zkCli.sh (Closes: #661837):
 +    - d/patches/fixes/ZOOKEEPER-1403: Ensure parameters are correctly
 +      quoted - thanks to John Eikenberry for this fix.
 +
 + -- James Page <james.page at ubuntu.com>  Wed, 21 Mar 2012 21:20:30 +0000
 +
 +zookeeper (3.3.4+dfsg1-3) unstable; urgency=low
 +
 +  * Sync changes from Ubuntu:
 +    - Switch zookeeperd upstart configuration to use start-stop-daemon.
 +      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 
 +        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 
 +        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 
 +    renamed libzookeeper{2,-dev} -> libzookeeper-mt{2,-dev}.
 +  * Added transitional package libzookeeper2 -> libzookeeper-mt2.
 +  * Convert libzookeeper-{st,mt}2 for MultiArch support.
 +  * Disable detection of cygwin as not relevant for Debian based
 +    installs and complicates configuration (Closes: #650882). Thanks
 +    to Akira Kitada for this patch.
 +  * Really close RFH (Closes: #579791).
 +
 + -- James Page <james.page at ubuntu.com>  Mon, 12 Dec 2011 13:31:47 +0000
 +
 +zookeeper (3.3.4+dfsg1-1) unstable; urgency=low
 +
 +  [ James Page ]
 +  * New upstream release:
 +    - 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 
 +      upstart configuration if required.
 +    - 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 
 +      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 
 +      junit4 from system library.
 +    - d/rules: Disable test suite execution for the time being as does 
 +      not run reliably.
 +  * Close RFH for this package (LP: #579791).
 +
 +  [ Damien Raude-Morvan ]
 +  * Add DMUA flag for James Page.
 +  * Build-Depends on procps for test suite.
 +
 + -- James Page <james.page at ubuntu.com>  Thu, 01 Dec 2011 15:03:53 +0000
 +
 +zookeeper (3.3.3+dfsg2-2) unstable; urgency=low
 +
 +  * Updated patch for ZOOKEEPER-1117 with fixes accepted into
 +    zookeeper 3.4.0 upstream; should also resolve FTBFS on ia64.
 +  * Close RFH from original maintainer (Closes: #602694).
 +  * debian/zookeeper.cron.daily: handle return code of 1 so daily cron job
 +    does not produce error emails when the package is removed but not
 +    purged (Closes: #582757). Thanks to Clint Byrum for this fix.
 +
 + -- James Page <james.page at ubuntu.com>  Wed, 31 Aug 2011 08:51:04 +0100
 +
 +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 
 +    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.
 +
 + -- James Page <james.page at ubuntu.com>  Wed, 13 Jul 2011 10:01:47 +0100
 +
 +zookeeper (3.3.3+dfsg1-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * 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 
 +    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 
 +    Paul Paradise for identifying this issue and the fix.
 +  * debian/copyright: upgrade to DEP-5 format.
 +
 + -- James Page <james.page at ubuntu.com>  Tue, 12 Jul 2011 16:56:06 +0100
 +
 +zookeeper (3.3.1+dfsg1-2) unstable; urgency=low
 +
 +  * FIX: cronjob, init.d fail after package removal. Closes: #582757
 +
 + -- Thomas Koch <thomas.koch at ymc.ch>  Tue, 01 Jun 2010 13:25:34 +0200
 +
 +zookeeper (3.3.1+dfsg1-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * started over testing a new git layout for packaging
 +
 + -- Thomas Koch <thomas.koch at ymc.ch>  Tue, 18 May 2010 09:36:16 +0200
 +
 +zookeeper (3.3.0+dfsg1-1) unstable; urgency=low
 +
 +  * new upstream version
 +  * packaged zooinspector contrib
 +  * packages zktreeutil contrib
 +  * Made debian/rules a bit more sane
 +
 + -- Thomas Koch <thomas.koch at ymc.ch>  Tue, 27 Apr 2010 13:52:30 +0200
 +
 +zookeeper (3.2.2+dfsg3-3) unstable; urgency=low
 +
 +  * remove /var/run/zookeeper when purging the package
 +  * zookeeperd.init creates /var/run/zookeeper now (Closes: #569972)
 +  * cronjob to purge old zookeeper data
 +  * more elaborate config example
 +  * superfluous /var/run/zookeeper entry in zookeeper.dirs
 +  * 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 
 +    hard-coded assembler. Thx Matthias Klose. Closes: #568618.
 +  * move executables to /usr/lib/... instead of /usr/share/...
 +
 + -- Thomas Koch <thomas.koch at ymc.ch>  Wed, 24 Feb 2010 15:02:09 +0100
 +
 +zookeeper (3.2.2+dfsg3-2) unstable; urgency=low
 +
 +  * Build C and Python bindings. Thanks to Matthias Klose.
 +  * Corrected dependencies versions in debian/control.
 +
 + -- Thomas Koch <thomas.koch at ymc.ch>  Thu, 28 Jan 2010 12:07:38 +0100
 +
 +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. 
 +  * Initial release. (Closes: #561947)
 +
 + -- Thomas Koch <thomas.koch at ymc.ch>  Fri, 27 Jan 2010 16:41:22 +0100
diff --combined debian/patches/series
index 1cb74d4,0000000..ea76641
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,0 +1,7 @@@
- 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
++#fixes/ZOOKEEPER-1033
++#fixes/ZOOKEEPER-1374
++#ftbfs-gcc-4.7.diff

-- 
Apache ZooKeeper



More information about the pkg-java-commits mailing list