Created by Clint Byrum and last modified
Get this branch:
bzr branch lp://staging/~clint-fewbar/ubuntu/maverick/rrdtool/merge-1.4.3-1
Only Clint Byrum can upload to this branch. If you are Clint Byrum please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Clint Byrum

Recent revisions

23. By Clint Byrum

Restoring 1.3.8-1ubuntu1 changes to changelog

22. By Clint Byrum

* Merge from debian unstable, Remaining changes:
  - debian/control, debian/control:
* require libdbi >= 0.8.3 to prevent aborts when using dbi datasources
* New upstream release.
* debian/patches:
  - Removed bts573638-rrdcgi-segfault and bts573299-rrdgraph-M -- included
* debian/patches:
  - Added bts573638-rrdcgi-segfault: upstream patch fixing a segfault in
    rrdcgi's printlasttime() (and possibly others); thanks to Robert Luberda
    for reporting this (Closes: #573638).
  - Added bts573299-rrdgraph-M: fix short option parsing in rrd_graph() --
    added support for '-M' as documented in the manpage; thanks to Ralf
    Hildebrandt for reporting this (Closes: #573299).
* debian/control:
  - Updated Standards-Version to 3.8.4 -- no changes.
* debian/rules:
  - Prepare to build with Python 2.6.
* New upstream release; thanks to Antoine Beaupre for reporting this
  (Closes: #559370):
  - Fixed some typos in the manpages; thanks to Justin T. Pryzby for
    reporting this (Closes: #550919).
* Uploading to unstable as this is not an SVN snapshot any more.
* debian/README.Debian:
  - Added a note about <http://oss.oetiker.ch/rrdtool/pub/contrib/> as
    requested in #323969 and lost in 1.2.26-1.
* debian/control, debian/rules:
  - Switched from Ruby 1.9 to Ruby 1.9.1 (affecting the librrd-ruby1.9 and
    rrdtool-dbg packages); thanks to Lucas Nussbaum for reporting this
    (Closes: #565833, #565835).
* debian/control:
  - Let librrd-ruby depend on ${misc:Depends} (to shut up lintian, mostly).
* Added debian/rrdtool.doc-base:
  - … pointing to /u/s/d/rrdtool/html/.
* Added debian/rrdcached.doc-base:
  - … pointing to /u/s/d/rrdcached/html/.
* New upstream SVN snapshot based on trunk at revision 1930.
* Uploading to experimental.
* debian/control:
  - Build-depend on gettext instead of intltool following the switch made by
  - Build-depend on libdbi0-dev, required by rrdgraph to read values from an
    SQL database.
  - Updated Standards-Version to 3.8.3.
  - Let the synopsis start with a small letter (as suggested in dev-ref
  - Let rrdtool-dbg recommend liblua5.1-rrd0.
* debian/rules:
  - Remove config.h in the 'clean' target - this is created by configure but
    not cleaned up by any Makefile.
  - Use DEB_HOST_ARCH_CPU instead of DEB_HOST_GNU_TYPE to check for the
    build host.
  - Set examples/rrdcached/RRDCached.pm's file mode to 0644.
  - Run dh_installinit for the "rrdcached" package.
* debian/patches:
  - Removed bts494874-gnu-kfreebsd - included upstream.
  - Removed bts332766-negative-timestamps - included upstream.
  - Removed compiler-warning-fixes - included upstream.
  - Updated bts428778-floating-point-exception for RRDtool 1.4.
* Added debian/README.source:
  - The file includes a pointer to /usr/share/doc/quilt/README.source.
* debian/librrd4.symbols:
  - Added symbols introduced in 1.4~rc2.
* Added new binary package 'rrdcached' for the newly introduced "data
  caching daemon".
* debian/rrdcached.init.d, debian/rrdcached.default:
  - Added an init script for rrdcached supporting start, stop, status,
    restart, force-reload. The script is based on the collectd init script.
* debian/rrdtool.install:
  - Install manpages in section 3 as well.
* debian/rrdcached.postrm:
  - Remove /var/lib/rrdcached/ on purge.
* debian/rules, debian/control:
  - Build Lua bindings and put them into appropriate packages.
* Added debian/lua-rrd.h.
* debian/rules:
  - Tell dh_makeshlibs to not modify postinst/postrm of the lua packages -
    we do not need to run ldconfig when installing them.

21. By Marc Deslauriers

* debian/control, debian/control:
  - Don't build against ruby1.9 as we don't want it in main.

20. By Sebastian Harl

[ Sebastian Harl ]
* New upstream release:
  - Fixed various memory leaks in the Python bindings, thanks to Anders
    Hammarquist for reporting this and providing a patch (Closes: #529291).
* debian/patches:
  - Added bts530814-hurd to fix a FTBFS on Hurd, thanks to Marc Dequènes for
    reporting this and providing a patch (Closes: #530814).
  - Removed doc-fixes - applied upstream.
  - Added bts332766-negative-timestamps - upstream patch to fix the handling
    of negative timestamps in rrdupdate(1), thanks to Frank Zacharias for
    reporting this (Closes: #332766).
* debian/control:
  - Removed transitional package "python-rrd" which is no longer required.
  - Let rrdtool-dbg depend on ${shlibs:Depends}.
  - Build-depend on intltool.

[ Bernd Zeimetz ]
* debian/rules, debian/control:
  - Build Python dbg modules into rrdtool-dbg. Add necessary
    (build-) dependencies.

19. By Mackenzie Morgan

Backport http://oss.oetiker.ch/rrdtool-trac/changeset/1459
(Closes: #497739) (LP: #371409)

18. By Alessio Treglia

* Python 2.6 transition (LP: #344307):
  - Update debian/pyversions.
  - debian/rules:
    + Include /usr/share/python/python.mk.
    + Add $(py_setup_install_args) to setup.py install to build with
      Python 2.6.

17. By Sebastian Harl

* Urgency set to high because of the fix for #499350.
* debian/patches:
  - Added upstream patch bts499350-data-corruption (upstream SVN r1480) to
    fix data corruption when updating multiple values in one go
    (Closes: #499350).
    (upstream bug #178 - http://oss.oetiker.ch/rrdtool-trac/ticket/178)
  - Added bts498183-segfault-madvise to fix a segfault on sparc caused by a
    wrong argument passed to madvise(2) - thanks to Jurij Smakov for
    valuable debugging information (Closes: #498183).
  - Added upstream patch bts496847-error-handling (upstream SVN r1471) to
    fix error handling of syscalls in rrdtool(1) (Closes: #496847).
  - Added upstream patch bts499349-memleaks (upstream SVN r1465, r1467,
    r1468, r1469, r1470, r1473) to fix a couple of memory leaks in rrdtool,
    librrd and the Perl and Ruby bindings (Closes: #499349).
  - Added trivial upstream patch typo-ruby (upstream SVN r1462) to fix a
    typo in the Ruby bindings.
* debian/NEWS:
  - Added. Documented the changes required by the switch to libpango
    (Closes: #493575, #493594).

16. By Matthias Klose

Rebuild (perl-5.8 -> perl-5.10 transition on hppa).

15. By James Westby

Fix buffer overflow in librrd's error handling. Cherry-picked from
Debian bug #450578. (LP: #96850)

14. By Sebastian Harl

* Renamed global definition of LDFLAGS to LINKER_FLAGS in debian/rules to
  work around a broken behavior of dpkg which would use those flags
  unconditionally whenever invoking the linker, which is not wanted e.g.
  when compiling the python bindings (Closes: #476022).
* Actually pass the linker flags to configure.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.