lp:~clint-fewbar/ubuntu/maverick/rrdtool/merge-1.4.3-1
- Get this branch:
- bzr branch lp:~clint-fewbar/ubuntu/maverick/rrdtool/merge-1.4.3-1
Branch merges
- Mathias Gug: Approve
- Ubuntu branches: Pending requested
-
Diff: 119930 lines (+62786/-46616)288 files modifiedABOUT-NLS (+1068/-0)
CHANGES (+6974/-579)
CONTRIBUTORS (+14/-5)
COPYRIGHT (+2/-1)
Makefile.am (+10/-24)
Makefile.in (+222/-97)
NEWS (+80/-4)
README (+1/-0)
TODO (+1/-25)
acinclude.m4 (+0/-592)
aclocal.m4 (+285/-8715)
autogen.sh (+3/-0)
bindings/Makefile.am (+13/-10)
bindings/Makefile.in (+180/-59)
bindings/lua/Makefile.am (+66/-0)
bindings/lua/Makefile.in (+748/-0)
bindings/lua/README (+68/-0)
bindings/lua/compat-5.1r5/compat-5.1.c (+118/-0)
bindings/lua/compat-5.1r5/compat-5.1.h (+34/-0)
bindings/lua/compat-5.1r5/compat-5.1.lua (+287/-0)
bindings/lua/rrdlua.c (+380/-0)
bindings/lua/test.lua.bottom (+90/-0)
bindings/perl-piped/RRDp.pm (+3/-3)
bindings/perl-shared/RRDs.pm (+2/-1)
bindings/perl-shared/RRDs.xs (+10/-0)
bindings/python/rrdtoolmodule.c (+76/-14)
bindings/ruby/CHANGES (+4/-0)
bindings/ruby/main.c (+69/-3)
bindings/ruby/test.rb (+12/-0)
bindings/tcl/Makefile.am (+1/-0)
bindings/tcl/Makefile.in (+214/-88)
bindings/tcl/tclrrd.c (+48/-15)
compile (+143/-0)
config.guess (+0/-1526)
config.rpath (+666/-0)
config.sub (+0/-1658)
configure (+14720/-4354)
configure.ac (+275/-87)
debian/README.Debian (+3/-0)
debian/README.source (+4/-0)
debian/changelog (+110/-0)
debian/control (+54/-14)
debian/copyright (+79/-6)
debian/liblua5.1-rrd-dev.install (+4/-0)
debian/liblua5.1-rrd0.install (+2/-0)
debian/librrd4.symbols (+32/-0)
debian/lua-rrd.h (+6/-0)
debian/patches/bts332766-negative-timestamps (+0/-15)
debian/patches/bts428778-floating-point-exception (+1/-1)
debian/patches/bts494874-gnu-kfreebsd (+0/-24)
debian/patches/compiler-warning-fixes (+0/-257)
debian/patches/series (+0/-3)
debian/rrdcached.default (+21/-0)
debian/rrdcached.doc-base (+14/-0)
debian/rrdcached.init.d (+145/-0)
debian/rrdcached.install (+4/-0)
debian/rrdcached.postrm (+42/-0)
debian/rrdtool.doc-base (+16/-0)
debian/rrdtool.install (+3/-1)
debian/rules (+28/-5)
depcomp (+64/-23)
doc/Makefile.am (+40/-25)
doc/Makefile.in (+223/-99)
doc/RRDp.html (+0/-142)
doc/RRDs.html (+0/-169)
doc/bin_dec_hex.1 (+0/-531)
doc/bin_dec_hex.html (+0/-363)
doc/bin_dec_hex.pod (+0/-2)
doc/bin_dec_hex.txt (+0/-376)
doc/cdeftutorial.1 (+0/-978)
doc/cdeftutorial.html (+0/-842)
doc/cdeftutorial.pod (+1/-1)
doc/cdeftutorial.txt (+0/-787)
doc/librrd.3 (+256/-0)
doc/librrd.pod (+136/-0)
doc/rpntutorial.1 (+0/-352)
doc/rpntutorial.html (+0/-207)
doc/rpntutorial.pod (+4/-5)
doc/rpntutorial.txt (+0/-190)
doc/rrd-beginners.1 (+0/-450)
doc/rrd-beginners.html (+0/-360)
doc/rrd-beginners.pod (+22/-22)
doc/rrd-beginners.txt (+0/-318)
doc/rrdbuild.1 (+0/-539)
doc/rrdbuild.html (+0/-413)
doc/rrdbuild.pod (+27/-28)
doc/rrdbuild.txt (+0/-347)
doc/rrdcached.pod (+699/-0)
doc/rrdcgi.1 (+0/-331)
doc/rrdcgi.html (+0/-271)
doc/rrdcgi.txt (+0/-205)
doc/rrdcreate.1 (+0/-660)
doc/rrdcreate.html (+0/-591)
doc/rrdcreate.pod (+7/-2)
doc/rrdcreate.txt (+0/-531)
doc/rrddump.1 (+0/-175)
doc/rrddump.html (+0/-101)
doc/rrddump.pod (+41/-12)
doc/rrddump.txt (+0/-51)
doc/rrdfetch.1 (+0/-366)
doc/rrdfetch.html (+0/-277)
doc/rrdfetch.pod (+27/-1)
doc/rrdfetch.txt (+0/-226)
doc/rrdfirst.1 (+0/-151)
doc/rrdfirst.html (+0/-69)
doc/rrdfirst.txt (+0/-29)
doc/rrdflushcached.pod (+53/-0)
doc/rrdgraph.1 (+0/-624)
doc/rrdgraph.html (+0/-464)
doc/rrdgraph.pod (+117/-67)
doc/rrdgraph.txt (+0/-479)
doc/rrdgraph_data.1 (+0/-258)
doc/rrdgraph_data.html (+0/-170)
doc/rrdgraph_data.pod (+3/-3)
doc/rrdgraph_data.txt (+0/-131)
doc/rrdgraph_examples.1 (+0/-341)
doc/rrdgraph_examples.html (+0/-252)
doc/rrdgraph_examples.txt (+0/-192)
doc/rrdgraph_graph.1 (+0/-587)
doc/rrdgraph_graph.html (+0/-594)
doc/rrdgraph_graph.pod (+14/-7)
doc/rrdgraph_graph.txt (+0/-421)
doc/rrdgraph_libdbi.pod (+158/-0)
doc/rrdgraph_rpn.1 (+0/-436)
doc/rrdgraph_rpn.html (+0/-315)
doc/rrdgraph_rpn.pod (+76/-2)
doc/rrdgraph_rpn.txt (+0/-312)
doc/rrdinfo.1 (+0/-184)
doc/rrdinfo.html (+0/-100)
doc/rrdinfo.pod (+32/-6)
doc/rrdinfo.txt (+0/-58)
doc/rrdlast.1 (+0/-146)
doc/rrdlast.html (+0/-62)
doc/rrdlast.pod (+25/-0)
doc/rrdlast.txt (+0/-23)
doc/rrdlastupdate.1 (+0/-146)
doc/rrdlastupdate.html (+0/-62)
doc/rrdlastupdate.pod (+26/-1)
doc/rrdlastupdate.txt (+0/-23)
doc/rrdlua.pod (+204/-0)
doc/rrdresize.1 (+0/-170)
doc/rrdresize.html (+0/-96)
doc/rrdresize.txt (+0/-44)
doc/rrdrestore.1 (+0/-157)
doc/rrdrestore.html (+0/-79)
doc/rrdrestore.txt (+0/-33)
doc/rrdthreads.1 (+0/-227)
doc/rrdthreads.html (+0/-162)
doc/rrdthreads.txt (+0/-103)
doc/rrdtool.1 (+0/-406)
doc/rrdtool.html (+0/-357)
doc/rrdtool.pod (+15/-3)
doc/rrdtool.txt (+0/-271)
doc/rrdtune.1 (+0/-286)
doc/rrdtune.html (+0/-234)
doc/rrdtune.txt (+0/-163)
doc/rrdtutorial.1 (+0/-1368)
doc/rrdtutorial.html (+0/-1129)
doc/rrdtutorial.pod (+5/-5)
doc/rrdtutorial.txt (+0/-1157)
doc/rrdupdate.1 (+0/-218)
doc/rrdupdate.html (+0/-135)
doc/rrdupdate.pod (+77/-4)
doc/rrdupdate.txt (+0/-94)
doc/rrdxport.1 (+0/-265)
doc/rrdxport.html (+0/-190)
doc/rrdxport.pod (+25/-1)
doc/rrdxport.txt (+0/-128)
etc/rrdcached-default (+14/-0)
etc/rrdcached-init (+57/-0)
examples/Makefile.am (+2/-0)
examples/Makefile.in (+391/-77)
examples/rrdcached/Makefile.am (+10/-0)
examples/rrdcached/Makefile.in (+553/-0)
examples/rrdcached/RRDCached.pm (+90/-0)
examples/rrdcached/rrdcached-size.pl (+153/-0)
install-sh (+3/-2)
intl/Makefile.in (+587/-0)
libtool (+8893/-0)
ltmain.sh (+7/-13)
m4/acinclude.m4 (+601/-0)
m4/codeset.m4 (+21/-0)
m4/gettext.m4 (+381/-0)
m4/glibc2.m4 (+30/-0)
m4/glibc21.m4 (+30/-0)
m4/iconv.m4 (+180/-0)
m4/intdiv0.m4 (+84/-0)
m4/intl.m4 (+285/-0)
m4/intlmacosx.m4 (+51/-0)
m4/intmax.m4 (+33/-0)
m4/inttypes-pri.m4 (+36/-0)
m4/inttypes_h.m4 (+26/-0)
m4/lcmessage.m4 (+30/-0)
m4/lib-ld.m4 (+110/-0)
m4/lib-link.m4 (+709/-0)
m4/lib-prefix.m4 (+185/-0)
m4/libtool.m4 (+7357/-0)
m4/lock.m4 (+316/-0)
m4/longlong.m4 (+109/-0)
m4/ltoptions.m4 (+368/-0)
m4/ltsugar.m4 (+123/-0)
m4/ltversion.m4 (+23/-0)
m4/lt~obsolete.m4 (+92/-0)
m4/nls.m4 (+31/-0)
m4/po.m4 (+449/-0)
m4/printf-posix.m4 (+44/-0)
m4/progtest.m4 (+92/-0)
m4/size_max.m4 (+68/-0)
m4/stdint_h.m4 (+26/-0)
m4/uintmax_t.m4 (+30/-0)
m4/visibility.m4 (+52/-0)
m4/wchar_t.m4 (+20/-0)
m4/wint_t.m4 (+28/-0)
m4/xsize.m4 (+13/-0)
missing (+29/-20)
po/ChangeLog (+12/-1)
po/LINGUAS (+0/-2)
po/Makefile.in.in (+368/-156)
po/Makevars (+41/-0)
po/Rules-quot (+47/-0)
po/boldquot.sed (+10/-0)
po/de.po (+0/-334)
po/en@boldquot.header (+25/-0)
po/en@quot.header (+22/-0)
po/insert-header.sin (+23/-0)
po/quot.sed (+6/-0)
po/remove-potcdate.sin (+19/-0)
po/rrdtool.pot (+354/-0)
po/stamp-po (+1/-0)
rrd_config.h.in (+329/-16)
rrdtool.spec (+56/-4)
src/Makefile.am (+21/-5)
src/Makefile.in (+497/-264)
src/gettext.h (+271/-0)
src/librrd.sym.in.in (+16/-0)
src/pngsize.c (+1/-1)
src/rrd.h (+74/-33)
src/rrd_cgi.c (+24/-14)
src/rrd_client.c (+848/-0)
src/rrd_client.h (+99/-0)
src/rrd_config_bottom.h (+4/-3)
src/rrd_create.c (+48/-64)
src/rrd_daemon.c (+3198/-0)
src/rrd_diff.c (+3/-6)
src/rrd_dump.c (+335/-250)
src/rrd_error.c (+5/-7)
src/rrd_fetch.c (+46/-23)
src/rrd_fetch_libdbi.c (+655/-0)
src/rrd_first.c (+3/-4)
src/rrd_flushcached.c (+118/-0)
src/rrd_format.c (+15/-2)
src/rrd_format.h (+1/-1)
src/rrd_getopt.c (+1/-54)
src/rrd_getopt.h (+0/-14)
src/rrd_getopt1.c (+2/-31)
src/rrd_gfx.c (+3/-3)
src/rrd_graph.c (+676/-366)
src/rrd_graph.h (+20/-6)
src/rrd_graph_helper.c (+1/-1)
src/rrd_hw.c (+3/-5)
src/rrd_hw.h (+1/-1)
src/rrd_hw_math.c (+0/-3)
src/rrd_hw_update.c (+0/-3)
src/rrd_i18n.h (+10/-10)
src/rrd_info.c (+74/-18)
src/rrd_is_thread_safe.h (+2/-2)
src/rrd_last.c (+50/-5)
src/rrd_lastupdate.c (+145/-47)
src/rrd_not_thread_safe.c (+2/-2)
src/rrd_open.c (+213/-95)
src/rrd_parsetime.c (+2/-4)
src/rrd_resize.c (+29/-79)
src/rrd_restore.c (+676/-555)
src/rrd_rpncalc.c (+90/-10)
src/rrd_rpncalc.h (+2/-1)
src/rrd_thread_safe.c (+3/-3)
src/rrd_thread_safe_nt.c (+21/-18)
src/rrd_tool.c (+96/-99)
src/rrd_tool.h (+23/-11)
src/rrd_tune.c (+49/-9)
src/rrd_update.c (+145/-93)
src/rrd_utils.c (+159/-0)
src/rrd_version.c (+1/-1)
src/rrd_xport.c (+32/-5)
src/rrd_xport.h (+1/-1)
src/rrdupdate.c (+2/-2)
win32/config.h (+2/-2)
win32/rrd_config.h.msvc (+1/-0)
Branch information
- Owner:
- Clint Byrum
- Status:
- Development
Recent revisions
- 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
upstream.
* 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
upstream.
- 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
6.2.2).
- 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). - 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:
- lp:ubuntu/maverick/rrdtool