lp:~james-page/ubuntu/precise/zookeeper/arm-ftbfs-fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/precise/zookeeper

Matthias Klose: Approve on 2012-01-27

Clint Byrum: Pending requested 2012-01-24

Diff: 214 lines (+135/-13)

7 files modified

.pc/applied-patches (+1/-0)
.pc/fixes/ZOOKEEPER-1374/src/c/tests/ThreadingUtil.cc (+79/-0)
debian/changelog (+11/-0)
debian/patches/fixes/ZOOKEEPER-1374 (+38/-0)
debian/patches/series (+1/-0)
debian/rules (+3/-0)
src/c/tests/ThreadingUtil.cc (+2/-13)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #920871: zookeeper 3.3.4+dfsg1-2ubuntu2 FTBFS on armel and armhf

High

Fix Released

Link a bug report

Related blueprints

17. By James Page on 2012-01-24

d/patches/fixes/ZOOKEEPER-1374: Use __sync_* primitives

16. By James Page on 2012-01-24

* Fix FTBFS of test suite on armel/armhf (LP: #920871):
  - d/patches/use-gcc-sync-primitives.patch: Use __sync_* primitives
    instead of ASM code to improve portability across supported
    platforms.
  - d/rules: Don't run full core Java test suite on arm architectures
    as it breaks due to JVM incompatibilities.

15. By Clint Byrum on 2012-01-06

[ Clint Byrum ]
* d/patches/fix-broken-c-client-test.patch: Fixes the unit test so it
  will pass with EINVAL which is the correct error. (LP: #912935)

[ James Page ]
* d/rules: Enable execution of C client and core Java tests (LP: #913881).

14. By Clint Byrum on 2012-01-09

[ Clint Byrum ]
* d/zookeeperd.upstart.in: Change to use start-stop-daemon instead
  of daemon.

[ James Page ]
* d/control,rules: Drop control_var generation for Debian/Ubuntu as no
  longer required.
* d/ubuntu_control_vars,debian_control_vars: Dropped - no longer required.
* d/zookeeperd.upstart.in: Update start-stop-daemon usage to enable
  use on systems where a java process is already running.

13. By James Page on 2011-12-12

* 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).

12. By James Page on 2011-12-01

[ 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.

11. By James Page on 2011-08-31

* 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.

10. By Clint Byrum on 2011-08-21

d/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. (LP: #830601)

9. By James Page on 2011-07-13

* 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.

8. By Matthias Klose on 2010-12-03

Rebuild to add support for python 2.7.