--- rrdtool-1.4.7.orig/debian/rrdtool.install +++ rrdtool-1.4.7/debian/rrdtool.install @@ -0,0 +1,7 @@ +usr/share/doc/rrdtool +usr/bin +usr/lib/rrdtool/ifOctets.tcl usr/share/doc/rrdtool/examples/ +usr/share/man/man1 +usr/share/man/man3/librrd.3 +usr/share/rrdtool/examples/*.cgi usr/share/doc/rrdtool/examples/ +usr/share/rrdtool/examples/*.pl usr/share/doc/rrdtool/examples/ --- rrdtool-1.4.7.orig/debian/librrd-dev.install +++ rrdtool-1.4.7/debian/librrd-dev.install @@ -0,0 +1,6 @@ +usr/include +usr/lib/librrd.a +usr/lib/librrd_th.a +usr/lib/librrd.so +usr/lib/librrd_th.so +usr/lib/pkgconfig/librrd.pc --- rrdtool-1.4.7.orig/debian/rrdtool-tcl.dirs +++ rrdtool-1.4.7/debian/rrdtool-tcl.dirs @@ -0,0 +1 @@ +usr/lib/tcltk/rrdtool-tcl/ --- rrdtool-1.4.7.orig/debian/librrd4.symbols +++ rrdtool-1.4.7/debian/librrd4.symbols @@ -0,0 +1,134 @@ +librrd.so.4 librrd4 #MINVER# + rrd_add_ptr@Base 1.4~rc2 + rrd_add_strdup@Base 1.4~rc2 + rrd_clear_error@Base 1.3.0 + rrd_close@Base 1.3.0 + rrd_create@Base 1.3.0 + rrd_create_r@Base 1.3.0 + rrd_dontneed@Base 1.3.0 + rrd_dump@Base 1.3.0 + rrd_dump_cb_r@Base 1.4~rc2+20091004 + rrd_dump_r@Base 1.3.0 + rrd_fetch@Base 1.3.0 + rrd_fetch_r@Base 1.3.0 + rrd_first@Base 1.3.0 + rrd_first_r@Base 1.3.0 + rrd_flush@Base 1.3.0 + rrd_flushcached@Base 1.4~rc2 + rrd_free@Base 1.3.0 + rrd_free_context@Base 1.3.0 + rrd_free_ptrs@Base 1.4~rc2 + rrd_freemem@Base 1.3.0 + rrd_get_context@Base 1.3.0 + rrd_get_error@Base 1.3.0 + rrd_graph@Base 1.3.0 + rrd_graph_v@Base 1.3.0 + rrd_info@Base 1.3.0 + rrd_info_free@Base 1.3.0 + rrd_info_print@Base 1.3.0 + rrd_info_push@Base 1.3.0 + rrd_info_r@Base 1.4~rc2 + rrd_init@Base 1.3.0 + rrd_last@Base 1.3.0 + rrd_last_r@Base 1.3.0 + rrd_lastupdate@Base 1.3.0 + rrd_lastupdate_r@Base 1.4~rc2 + rrd_lock@Base 1.3.0 + rrd_mkdir_p@Base 1.4~rc2+20091004 + rrd_new_context@Base 1.3.0 + rrd_open@Base 1.3.0 + rrd_parsetime@Base 1.3.0 + rrd_proc_start_end@Base 1.3.0 + rrd_random@Base 1.4~rc2 + rrd_read@Base 1.3.0 + rrd_resize@Base 1.3.0 + rrd_restore@Base 1.3.0 + rrd_seek@Base 1.3.0 + rrd_set_error@Base 1.3.0 + rrd_set_to_DINF@Base 1.3.0 + rrd_set_to_DNAN@Base 1.3.0 + rrd_strerror@Base 1.3.0 + rrd_strversion@Base 1.3.0 + rrd_tell@Base 1.3.0 + rrd_test_error@Base 1.3.0 + rrd_tune@Base 1.3.0 + rrd_update@Base 1.3.0 + rrd_update_r@Base 1.3.0 + rrd_update_v@Base 1.3.0 + rrd_version@Base 1.3.0 + rrd_write@Base 1.3.0 + rrd_xport@Base 1.3.0 + rrdc_connect@Base 1.4~rc2 + rrdc_disconnect@Base 1.4~rc2 + rrdc_flush@Base 1.4~rc2 + rrdc_is_connected@Base 1.4~rc2 + rrdc_stats_free@Base 1.4~rc2 + rrdc_stats_get@Base 1.4~rc2 + rrdc_update@Base 1.4~rc2 +librrd_th.so.4 librrd4 #MINVER# + rrd_add_ptr@Base 1.4~rc2 + rrd_add_strdup@Base 1.4~rc2 + rrd_clear_error@Base 1.3.0 + rrd_close@Base 1.3.0 + rrd_create@Base 1.3.0 + rrd_create_r@Base 1.3.0 + rrd_dontneed@Base 1.3.0 + rrd_dump@Base 1.3.0 + rrd_dump_cb_r@Base 1.4~rc2+20091004 + rrd_dump_r@Base 1.3.0 + rrd_fetch@Base 1.3.0 + rrd_fetch_r@Base 1.3.0 + rrd_first@Base 1.3.0 + rrd_first_r@Base 1.3.0 + rrd_flush@Base 1.3.0 + rrd_flushcached@Base 1.4~rc2 + rrd_free@Base 1.3.0 + rrd_free_context@Base 1.3.0 + rrd_free_ptrs@Base 1.4~rc2 + rrd_freemem@Base 1.3.0 + rrd_get_context@Base 1.3.0 + rrd_get_error@Base 1.3.0 + rrd_graph@Base 1.3.0 + rrd_graph_v@Base 1.3.0 + rrd_info@Base 1.3.0 + rrd_info_free@Base 1.3.0 + rrd_info_print@Base 1.3.0 + rrd_info_push@Base 1.3.0 + rrd_info_r@Base 1.4~rc2 + rrd_init@Base 1.3.0 + rrd_last@Base 1.3.0 + rrd_last_r@Base 1.3.0 + rrd_lastupdate@Base 1.3.0 + rrd_lastupdate_r@Base 1.4~rc2 + rrd_lock@Base 1.3.0 + rrd_mkdir_p@Base 1.4~rc2+20091004 + rrd_new_context@Base 1.3.0 + rrd_open@Base 1.3.0 + rrd_parsetime@Base 1.3.0 + rrd_proc_start_end@Base 1.3.0 + rrd_random@Base 1.4~rc2 + rrd_read@Base 1.3.0 + rrd_resize@Base 1.3.0 + rrd_restore@Base 1.3.0 + rrd_seek@Base 1.3.0 + rrd_set_error@Base 1.3.0 + rrd_set_to_DINF@Base 1.3.0 + rrd_set_to_DNAN@Base 1.3.0 + rrd_strerror@Base 1.3.0 + rrd_strversion@Base 1.3.0 + rrd_tell@Base 1.3.0 + rrd_test_error@Base 1.3.0 + rrd_tune@Base 1.3.0 + rrd_update@Base 1.3.0 + rrd_update_r@Base 1.3.0 + rrd_update_v@Base 1.3.0 + rrd_version@Base 1.3.0 + rrd_write@Base 1.3.0 + rrd_xport@Base 1.3.0 + rrdc_connect@Base 1.4~rc2 + rrdc_disconnect@Base 1.4~rc2 + rrdc_flush@Base 1.4~rc2 + rrdc_is_connected@Base 1.4~rc2 + rrdc_stats_free@Base 1.4~rc2 + rrdc_stats_get@Base 1.4~rc2 + rrdc_update@Base 1.4~rc2 --- rrdtool-1.4.7.orig/debian/lua-rrd.h +++ rrdtool-1.4.7/debian/lua-rrd.h @@ -0,0 +1,6 @@ +#ifndef LUA_RRD_H +#define LUA_RRD_H + +extern int luaopen_rrd (lua_State * L); + +#endif --- rrdtool-1.4.7.orig/debian/rrdcached.postrm +++ rrdtool-1.4.7/debian/rrdcached.postrm @@ -0,0 +1,42 @@ +#! /bin/bash +# postrm script for rrdcached +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + purge) + rm -rf /var/lib/rrdcached/ + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + --- rrdtool-1.4.7.orig/debian/rrdtool-tcl.install +++ rrdtool-1.4.7/debian/rrdtool-tcl.install @@ -0,0 +1,2 @@ +usr/lib/tcl* usr/lib/tcltk/rrdtool-tcl/ +usr/lib/rrdtool/pkgIndex.tcl usr/lib/tcltk/rrdtool-tcl/ --- rrdtool-1.4.7.orig/debian/compat +++ rrdtool-1.4.7/debian/compat @@ -0,0 +1 @@ +5 --- rrdtool-1.4.7.orig/debian/rrdtool.doc-base +++ rrdtool-1.4.7/debian/rrdtool.doc-base @@ -0,0 +1,16 @@ +Document: rrdtool +Title: The RRDtool Manual +Author: Tobias Oetiker +Abstract: This is the manual for RRDtool, a time-series data storage and + display system. RRDtool allows one to store time-series data (e.g. network + bandwidth, machine-room temperature, server load average) and create + graphical representations of that data. It stores the data in Round Robin + Databases (RRDs), a very compact way that will not expand over time. RRDtool + processes the extracted data to enforce a certain data density, allowing for + useful graphical representation of data values. +Section: Science/Data Analysis + +Format: HTML +Index: /usr/share/doc/rrdtool/html/index.html +Files: /usr/share/doc/rrdtool/html/*.html + --- rrdtool-1.4.7.orig/debian/copyright +++ rrdtool-1.4.7/debian/copyright @@ -0,0 +1,373 @@ +Originally this package was debianized by Matt Zimmerman on +Fri, 10 Sep 1999 10:53:19 -0700. The packaging was overhauled and all parts, +except debian/control and debian/changelog, were droppend and redone by +Bernd Zeimetz on Wed, 06 Feb 2008 19:14:48 +0100 for the +RRDtool packaging team . + +The upstream source was downloaded from: + http://oss.oetiker.ch/rrdtool/pub/ + +Upstream author: Tobias Oetiker + +See CONTRIBUTORS for a list of contributors. + +Copyright: + + RRDTOOL - Round Robin Database Tool + A tool for fast logging of numerical data graphical display + of this data. + + Copyright (c) 1998-2010 Tobias Oetiker + All rights reserved. + + GNU GPL License + =============== + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + FLOSS License Exception + ======================= + (Adapted from http://www.mysql.com/company/legal/licensing/foss-exception.html) + + I want specified Free/Libre and Open Source Software ("FLOSS") + applications to be able to use specified GPL-licensed RRDtool + libraries (the "Program") despite the fact that not all FLOSS licenses are + compatible with version 2 of the GNU General Public License (the "GPL"). + + As a special exception to the terms and conditions of version 2.0 of the GPL: + + You are free to distribute a Derivative Work that is formed entirely from + the Program and one or more works (each, a "FLOSS Work") licensed under one + or more of the licenses listed below, as long as: + + 1. You obey the GPL in all respects for the Program and the Derivative + Work, except for identifiable sections of the Derivative Work which are + not derived from the Program, and which can reasonably be considered + independent and separate works in themselves, + + 2. all identifiable sections of the Derivative Work which are not derived + from the Program, and which can reasonably be considered independent and + separate works in themselves, + + 1. are distributed subject to one of the FLOSS licenses listed + below, and + + 2. the object code or executable form of those sections are + accompanied by the complete corresponding machine-readable source + code for those sections on the same medium and under the same FLOSS + license as the corresponding object code or executable forms of + those sections, and + + 3. any works which are aggregated with the Program or with a Derivative + Work on a volume of a storage or distribution medium in accordance with + the GPL, can reasonably be considered independent and separate works in + themselves which are not derivatives of either the Program, a Derivative + Work or a FLOSS Work. + + If the above conditions are not met, then the Program may only be copied, + modified, distributed or used under the terms and conditions of the GPL. + + FLOSS License List + ================== + License name Version(s)/Copyright Date + Academic Free License 2.0 + Apache Software License 1.0/1.1/2.0 + Apple Public Source License 2.0 + Artistic license From Perl 5.8.0 + BSD license "July 22 1999" + Common Public License 1.0 + GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1 + IBM Public License, Version 1.0 + Jabber Open Source License 1.0 + MIT License (As listed in file MIT-License.txt) - + Mozilla Public License (MPL) 1.0/1.1 + Open Software License 2.0 + OpenSSL license (with original SSLeay license) "2003" ("1998") + PHP License 3.0 + Python license (CNRI Python License) - + Python Software Foundation License 2.1.1 + Sleepycat License "1999" + W3C License "2001" + X11 License "2001" + Zlib/libpng License - + Zope Public License 2.0 + +The overhauled Debian packaging, which was started by Bernd Zeimetz on +Wed, 06 Feb 2008 19:14:48 +0100, is copyrighted under the same license +as RRDtool, see above. + +On Debian systems, a copy of the GNU General Public License, version 2, +can be found in the file /usr/share/common-licenses/GPL-2. The symlink +/usr/share/common-licenses/GPL points to the latest version of the GPL. + +Files with different copyrights/licenses: + + * bindings/lua/compat-5.1r5/compat-5.1.{c,h,lua}: + + Copyright (C) 2004-2006 Kepler Project + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + * bindings/lua/rrdlua.c: + + Copyright (C) 2008 Fidelis Assis + + * bindings/python/* (except rrd_extra.h): + + Author: Hye-Shik Chang + Contributors: Matthew W. Samsonoff + Brian E. Gallew + + py-rrdtool is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + py-rrdtool is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with Foobar; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + On Debian systems, a copy of the GNU Lesser General Public License, + version 2, can be found in the file /usr/share/common-licenses/LGPL-2 + The symlink /usr/share/common-licenses/LGPL points to the latest version + of the LGPL. + + * bindings/ruby/: + + Author: Miles Egan + + * bindings/tcl/{ifOctets.tcl.in,tclrrd.c}: + + Copyright: + Copyright (c) 1999,2000 Frank Strauss + Technical University of Braunschweig. + Thread-safe code in tclrrd.c: + Copyright (c) 2005 Oleg Derevenetz, CenterTelecom Voronezh ISP. + + * doc/bin_dec_hex.pod, doc/cdeftutorial.pod, doc/rrdgraph.pod, + doc/rrdgraph_data.pod, doc/rrdgraph_examples.pod, doc/rrdgraph_graph.pod, + doc/rrdgraph_rpn.pod, doc/rrdresize.pod, doc/rrdtutorial.pod: + + Author: Alex van den Bogaerdt + + * doc/rpntutorial.pod: + + Author: Steve Rader + + * doc/rrdcached.pod, doc/rrdflushcached.pod: + + Author: Florian Forster + + * doc/rrdfirst.pod: + + Author: Burton Strauss + + * doc/rrdgraph_libdbi.pod: + + Author: Martin Sperl + + * doc/rrdlast.pod: + + Author: Russ Wright + + * doc/rrdlastupdate.pod: + + Author: Andy Riebs + + * doc/rrdlua.pod: + + Author: Fidelis Assis + + * doc/rrdthreads.pod: + + Author: Peter Stamfest + + * doc/rrdupdate.pod: + + Authors: Tobias Oetiker + Florian Forster + + * doc/rrd-beginners.pod: + + Author: Ketan Patel + + * m4/* (except m4/acinclude.m4): + + Copyright (C) 1995-2007 Free Software Foundation, Inc. + + This file is free software; the Free Software Foundation + gives unlimited permission to copy and/or distribute it, + with or without modifications, as long as this notice is preserved. + + * src/{fnv.h,hash_32.c}: + + Please do not copyright this code. This code is in the public domain. + + LANDON CURT NOLL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO + EVENT SHALL LANDON CURT NOLL BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. + + By: + chongo /\oo/\ + http://reality.sgi.com/chongo/ + EMail: chongo_fnv at prime dot engr dot sgi dot com + + * src/gettext.h: + + Copyright (C) 1995-2006 Free Software Foundation, Inc. + + * src/parsetime.c: + + parsetime.c - parse time for at(1) + + Copyright (C) 1993, 1994 Thomas Koenig + + modifications for English-language times + Copyright (C) 1993 David Parsons + + A lot of modifications and extensions + (including the new syntax being useful for RRDB) + Copyright (C) 1999 Oleg Cherevko (aka Olwi Deer) + + severe structural damage inflicted by Tobi Oetiker in 1999 + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. The name of the author(s) may not be used to endorse or promote + products derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + * src/plbasename.{c,h}: + + Copyright (C) 2005 Syd Logan + + This code is distributed without warranty. You are free to use this + code for any purpose, however, if this code is republished or + redistributed in its original form, as hardcopy or electronically, + then you must include this copyright notice along with the code. + + * src/rrd_client.{c,h}, src/rrd_flushcached.c: + + Copyright (C) 2008 Florian octo Forster + + * src/rrd_daemon.c: + + Copyright (C) 2008-2009 Florian octo Forster + Copyright (C) 2008-2009 Kevin Brintnall + + * src/rrd_fetch_libdbi.c: + + Author: Martin Sperl + + * src/rrd_getopt.{c,h}, src/rrd_getopt1.c: + + Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97 + Free Software Foundation, Inc. + + This file is part of the GNU C Library. Its master source is NOT part of + the C library, however. The master source lives in /gd/gnu/lib. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + * src/rrd_hw.c: + + Copyright (C) 1997-2010 Tobias Oetiker + Initial version by Jake Brutlag, WebTV Networks, 5/1/00 + + * src/rrd_i18n.h + + Copyright (C) 2008 Takao Fujiwara + + * src/rrd_is_thread_safe.h, src/rrd_not_thread_safe.c, src/rrd_thread_safe.c, + src/rrd_thread_safe_nt.c: + + Copyright 1997-2010 Tobias Oetiker + Copyright 2003 Peter Stamfest + + * src/rrd_last.c: + + Copyright (C) 1997-2010 Tobias Oetiker + Initial version by Russ Wright, @Home Network, 9/28/98 + + * src/rrd_lastupdate.c, src/rrd_restore.c, src/rrd_update.c: + + Copyright (C) 1997-2010 Tobias Oetiker + Copyright (C) 2008 Florian Forster + + * src/rrd_utils.c: + + Copyright (C) 2009 Kevin Brintnall + Copyright (C) 2008 Sebastian Harl + + * src/strftime.c: + + Written 6 september 1989 by Jim Nutt. + Released into the public domain by Jim Nutt. + + Modified 21 october 1989 by Rob Duff. + Modified 08 december 2004 by Tobias Oetiker. + --- rrdtool-1.4.7.orig/debian/NEWS +++ rrdtool-1.4.7/debian/NEWS @@ -0,0 +1,16 @@ +rrdtool (1.3.1-4) unstable; urgency=high + + Starting with version 1.3, RRDtool uses libpango for handling text in + graphs. When specifying fonts (e.g. using the --font option of rrdgraph(1)) + a Pango font description (e.g. "Times 20") has to be used instead of + specifying truetype font files as in version 1.2. See the rrdgraph(1) + manpage for details. + + Also, Pango expects strings to be encoded in UTF-8. RRDtool tries to take + care of that but for it to work correctly the string's encoding has to match + the locale settings or has to be UTF-8 encoded already. E.g. this might be a + problem if rrdtool is called from a script whose encoding does not match the + local settings. + + -- Sebastian Harl Fri, 26 Sep 2008 00:07:32 +0200 + --- rrdtool-1.4.7.orig/debian/README.Debian +++ rrdtool-1.4.7/debian/README.Debian @@ -0,0 +1,15 @@ +RRDtool on Debian +================= + +Documentation: +-------------- + +The RRDtool documentation is available as manual pages (see rrdtool(1) as a +starting point) or HTML pages located in /usr/share/doc/rrdtool/html/. The +text and POD documentation which is usually installed by the upstream source +package has been left out of the Debian packages as it does not provide any +further benefits over the other documentation. + +More examples and useful applications can be found at the upstream site at +. + --- rrdtool-1.4.7.orig/debian/rules +++ rrdtool-1.4.7/debian/rules @@ -0,0 +1,239 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +#we use quilt +include /usr/share/quilt/quilt.make + +#needed to build with Python 2.6 +-include /usr/share/python/python.mk +ifeq (,$(py_sitename)) + py_sitename = site-packages + py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages + py_sitename_sh = $(py_sitename) + py_libdir_sh = $(py_libdir) + py_setup_install_args = +endif + + + +#Ruby versions to build for +RUBY_VERS := 1.8 1.9.1 +RUBY_DEFAULT_VERS := 1.8 + +PY_VERS := $(shell pyversions -vr) + +#tcl version we're building for +TCL_VERS := $(shell dpkg -s tcl-dev | grep '^Depends' \ + | sed 's,.*\.*,\1,') + +#let's help configure to figure out our host/build system +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + CONFFLAGS += --build $(DEB_HOST_GNU_TYPE) +else + CONFFLAGS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +#we build the bindings manually from debian/rules +CONFFLAGS += --disable-python --disable-ruby + +#set the right paths +CONFFLAGS += --prefix=/usr --docdir=/usr/share/doc/rrdtool + +#install perl libs in vendor mode +CONFFLAGS += --with-perl-options=INSTALLDIRS=vendor + +#path to tcl +CONFFLAGS += --with-tcllib=/usr/lib/tcl$(TCL_VERS) + +#let's take care of optimization + debug builds +CFLAGS += -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else +#don't optimize on arm for now - #447041 +ifneq ($(DEB_HOST_ARCH_CPU), arm) + CFLAGS += -O2 +endif +endif + +# work-around for a broken dpkg - do not rename this to LDFLAGS :-/ +LINKER_FLAGS=-Wl,-z,defs + +configure: config.status +config.status: $(QUILT_STAMPFN) + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + LDFLAGS="$(LINKER_FLAGS)" \ + CFLAGS="$(CFLAGS)" \ + RRDDOCDIR=/usr/share/doc/rrdtool \ + ./configure $(CONFFLAGS) + +build: build-arch build-indep + +build-arch: build-arch-stamp $(PY_VERS:%=build-python%) $(PY_VERS:%=build-python%-dbg) +build-arch-stamp: config.status + make + #Fix library path to tcl bindings + sed -i -e 's|lib/|lib/tcltk/rrdtool-tcl/|' bindings/tcl/pkgIndex.tcl + #sanity check if debian/control lists the right package name + LIB_major=`grep '^dlname=' src/librrd.la \ + | sed -e "s/^dlname='librrd\.so\.\\([0-9]\+\\)'\$$/\\1/"` \ + && test -n "$$LIB_major" \ + && grep -q "^Package: librrd$$LIB_major\\>" debian/control + touch $@ + +build-python%: build-arch-stamp + set -e ;\ + cd bindings/python ;\ + BUILDLIBDIR=../../src/.libs LIBDIR=../../src/.libs python$* setup.py build ;\ + touch $@ + +build-indep: build-arch-stamp + #indep stuff is built in build-arch-stamp, too. + +clean: clean-patched +clean-patched: unpatch $(PY_VERS:%=clean-python%) $(PY_VERS:%=clean-python%-dbg) + dh_testdir + dh_testroot + + [ ! -f Makefile ] || make distclean + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + rm -f config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + rm -f config.guess +endif + rm -f build-arch-stamp build-indep-stamp config.status install-common-stamp + find . -name \*.pyc | xargs rm -f + rm -rf bindings/python/build + + # clean what the Makefiles do not clean ... + rm -rf bindings/perl-piped/blib bindings/perl-shared/blib \ + bindings/perl-piped/Makefile.old bindings/perl-shared/Makefile.old bindings/perl-shared/MYMETA.yml + rm -f bindings/tcl/pkgIndex.tcl bindings/tcl/tclrrd*.so + rm -f examples/cgi-demo.cgi + rm -rf src/.libs src/.deps doc/*.html doc/*.1 doc/*.txt + rm -f intltool-extract intltool-merge intltool-update + rm -f src/librrd.sym + rm -f config.h + + dh_clean + +clean-python%: unpatch + set -e ;\ + cd bindings/python ;\ + python$* setup.py clean ;\ + rm -f build-python$* + + +install: install-arch install-indep + +install-indep: build-indep install-common-stamp + #nothing to do + +install-common-stamp: build-arch-stamp + dh_testdir + dh_testroot + dh_clean -k + + make install DESTDIR=$(CURDIR)/debian/tmp + # we don't want .txt and .pod documentation in the package + rm -rf debian/tmp/usr/share/doc/rrdtool/txt + dh_install --sourcedir=$(CURDIR)/debian/tmp -X.la --fail-missing + # remove duplicates + rm debian/rrdtool/usr/bin/rrdcached + rm debian/rrdtool/usr/share/man/man1/rrdcached.1 + rm debian/rrdtool/usr/share/doc/rrdtool/html/rrdcached.html + + touch $@ + +install-arch: install-common-stamp $(PY_VERS:%=install-python%) + #build and install ruby + set -e; \ + cd bindings/ruby ;\ + for rbv in $(RUBY_VERS); do \ + ruby$$rbv extconf.rb ;\ + make ;\ + make install sitelibdir=$(CURDIR)/debian/librrd-ruby$$rbv`ruby$$rbv -r rbconfig -e 'print Config::CONFIG["rubylibdir"]'` \ + sitearchdir=$(CURDIR)/debian/librrd-ruby$$rbv`ruby$$rbv -r rbconfig -e 'print Config::CONFIG["archdir"]'` ;\ + make distclean ;\ + done + + dh_installexamples -s + chmod 644 debian/rrdcached/usr/share/doc/rrdcached/examples/RRDCached.pm + +install-python%: install-common-stamp + dh_testdir + dh_testroot + set -e ;\ + cd bindings/python ;\ + python$* setup.py install --root=$(CURDIR)/debian/python-rrdtool \ + $(py_setup_install_args) ;\ + python$*-dbg setup.py install --root=$(CURDIR)/debian/rrdtool-dbg \ + $(py_setup_install_args) + + find $(CURDIR)/debian/rrdtool-dbg -type f -name '*.egg-info' -print0 |\ + xargs -0r rm -f + + +binary-indep: build-indep install-indep + dh_testdir + dh_testroot + dh_link -plibrrd-ruby /usr/share/doc/librrd-ruby$(RUBY_DEFAULT_VERS) /usr/share/doc/librrd-ruby + dh_installchangelogs -i -Nlibrrd-ruby CHANGES + dh_installdocs -i -Nlibrrd-ruby -A CONTRIBUTORS NEWS + dh_link -i -Nlibrrd-ruby + echo 'rubydefault:Depends=librrd-ruby$(RUBY_DEFAULT_VERS)' >> debian/librrd-ruby.substvars + dh_perl -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + + +binary-arch: build-arch install-arch + dh_testdir + dh_testroot + dh_installchangelogs -a CHANGES + dh_installdocs -a -A CONTRIBUTORS NEWS + dh_installdocs -a + echo 'tcl:Depends=tcl$(TCL_VERS) | tclsh' >> debian/rrdtool-tcl.substvars + dh_python2 -ppython-rrdtool + dh_python2 -prrdtool-dbg + dh_perl -a + dh_installman -a + dh_installinit -prrdcached + dh_link -a + dh_strip -a --dbg-package=rrdtool-dbg + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a -Nliblua5.1-rrd0 -Nliblua5.1-rrd-dev + dh_makeshlibs -pliblua5.1-rrd0 -pliblua5.1-rrd-dev -n + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + + +binary: binary-arch binary-indep +.PHONY: build clean configure \ + binary-indep binary-arch binary \ + install install-arch \ + install-python% clean-python% unpatch --- rrdtool-1.4.7.orig/debian/librrds-perl.install +++ rrdtool-1.4.7/debian/librrds-perl.install @@ -0,0 +1,3 @@ +usr/lib/perl5/auto/RRDs +usr/lib/perl5/RRDs.pm +usr/share/man/man3/RRDs.3pm --- rrdtool-1.4.7.orig/debian/control +++ rrdtool-1.4.7/debian/control @@ -0,0 +1,236 @@ +Source: rrdtool +Section: utils +Priority: optional +Maintainer: Debian RRDtool Team +Uploaders: Sebastian Harl , Alexander Wirt , Bernd Zeimetz +Standards-Version: 3.9.2 +Build-Depends: debhelper (>= 5.0.38), groff, autotools-dev, gettext, quilt, + zlib1g-dev, libpng12-dev, libcairo2-dev, libpango1.0-dev, libfreetype6-dev, + libdbi0-dev, + libxml2-dev, + tcl-dev (>= 8), tcl-dev (<= 9), + perl (>= 5.8.0), + python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.6.6-3~), + ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev, + liblua5.1-0-dev, lua5.1, + gcc-4.7 +Build-Conflicts: lua50 +Homepage: http://oss.oetiker.ch/rrdtool/ +Vcs-Browser: http://git.snow-crash.org/?p=pkg-rrdtool.git;a=summary +Vcs-Git: git://git.snow-crash.org/pkg-rrdtool.git/ +X-Python-Version: >= 2.3 + +Package: rrdtool +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: librrds-perl +Description: time-series data storage and display system (programs) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + RRDtool is often used via various wrappers that can poll data from devices + and feed data into RRDs, as well as provide a friendlier user interface and + customized graphs. + . + This package contains command-line programs used to access and manipulate + RRDs. + +Package: rrdcached +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: data caching daemon for RRDtool + RRDCacheD is a daemon that receives updates to existing RRD files, accumulates + them and, if enough have been received or a defined time has passed, writes + the updates to the RRD file. The daemon was written with big setups in mind. + Those setups usually run into I/O related problems. RRDCacheD's goal is to + alleviate these problems. + +Package: rrdtool-dbg +Architecture: any +Priority: extra +Section: debug +Depends: rrdtool (= ${binary:Version}), librrd4 (= ${binary:Version}), + ${shlibs:Depends}, ${python:Depends}, ${misc:Depends} +Recommends: librrds-perl (= ${binary:Version}), + rrdtool-tcl (= ${binary:Version}), python-rrdtool (= ${binary:Version}), + librrd-ruby1.8 (= ${binary:Version}), librrd-ruby1.9.1 (= ${binary:Version}), + python-all-dbg, liblua5.1-rrd0 (= ${binary:Version}) +Description: time-series data storage and display system (debugging symbols) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + RRDtool is often used via various wrappers that can poll data from devices + and feed data into RRDs, as well as provide a friendlier user interface and + customized graphs. + . + This package contains the debugging symbols for the program and library files. + +Package: librrd4 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: ttf-dejavu | ttf-bitstream-vera +Description: time-series data storage and display system (runtime library) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package contains shared libraries used to access and manipulate RRDs. + +Package: librrd-dev +Architecture: any +Section: libdevel +Depends: libc6-dev | libc-dev, librrd4 (= ${binary:Version}), libpng12-dev, zlib1g-dev, libcairo2-dev, libpango1.0-dev, libfreetype6-dev, libxml2-dev, ${misc:Depends} +Provides: librrd2-dev +Conflicts: librrd2-dev +Replaces: librrd2-dev +Description: time-series data storage and display system (development) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package contains header files and libraries used to develop software + that uses RRDs. + +Package: librrds-perl +Architecture: any +Section: perl +Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} +Description: time-series data storage and display system (Perl interface, shared) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package contains a Perl interface to RRDs using a shared library. + +Package: librrdp-perl +Architecture: all +Section: perl +Depends: ${perl:Depends}, rrdtool, ${misc:Depends} +Description: time-series data storage and display system (Perl interface, piped) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package contains a Perl interface to RRDs using command pipes. + +Package: rrdtool-tcl +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${tcl:Depends} +Description: time-series data storage and display system (Tcl interface) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package contains a Tcl interface to RRDs. + +Package: python-rrdtool +Architecture: any +Section: python +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Conflicts: python2.3-rrd, python2.4-rrd, python-rrd (<< 1.2.26) +Replaces: python2.3-rrd, python2.4-rrd, python-rrd (<< 1.2.26) +Provides: ${python:Provides}, python-rrd +Description: time-series data storage and display system (Python interface) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package contains a Python interface to RRDs. + +Package: librrd-ruby +Architecture: all +Section: ruby +Depends: ${rubydefault:Depends}, ${misc:Depends} +Description: time-series data storage and display system (Ruby interface) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This is a dummy package which depends on the package for Debian's default + Ruby version. + +Package: librrd-ruby1.8 +Architecture: any +Section: ruby +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: time-series data storage and display system (Ruby 1.8 interface) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package contains a Ruby 1.8 interface to RRDs. + +Package: librrd-ruby1.9.1 +Architecture: any +Section: ruby +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: time-series data storage and display system (Ruby 1.9.1 interface) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package contains a Ruby 1.9.1 interface to RRDs. + +Package: liblua5.1-rrd0 +Architecture: any +Section: interpreters +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: time-series data storage and display system (Lua 5.1 interface) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package contains a Lua 5.1 interface to RRDs. + +Package: liblua5.1-rrd-dev +Architecture: any +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends}, liblua5.1-rrd0 (= ${binary:Version}) +Description: time-series data storage and display system (Lua 5.1 development) + The Round Robin Database Tool (RRDtool) is a system to store and display + time-series data (e.g. network bandwidth, machine-room temperature, + server load average). It stores the data in Round Robin Databases (RRDs), + a very compact way that will not expand over time. RRDtool processes the + extracted data to enforce a certain data density, allowing for useful + graphical representation of data values. + . + This package contains development files for the Lua 5.1 interface to RRDs. --- rrdtool-1.4.7.orig/debian/watch +++ rrdtool-1.4.7/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://oss.oetiker.ch/rrdtool/pub/rrdtool-([\d\.]*)\.tar\.gz --- rrdtool-1.4.7.orig/debian/librrd4.install +++ rrdtool-1.4.7/debian/librrd4.install @@ -0,0 +1,2 @@ +usr/lib/librrd.so.* +usr/lib/librrd_th.so.* --- rrdtool-1.4.7.orig/debian/rrdcached.install +++ rrdtool-1.4.7/debian/rrdcached.install @@ -0,0 +1,4 @@ +usr/bin/rrdcached +usr/share/man/man1/rrdcached.1 +usr/share/doc/rrdtool/html/rrdcached.html usr/share/doc/rrdcached/html/ +usr/share/rrdtool/examples/rrdcached/* usr/share/doc/rrdcached/examples/ --- rrdtool-1.4.7.orig/debian/gbp.conf +++ rrdtool-1.4.7/debian/gbp.conf @@ -0,0 +1,14 @@ +# Configuration file for git-buildpackage and friends +[DEFAULT] +# use pristine-tar: +pristine-tar = True + +# Options only affecting git-buildpackage +[git-buildpackage] +# uncomment this to automatically GPG sign tags +sign-tags = True +# don't include information from meta tags +meta = True +# what tags to look for to generate bug-closing changelog entries +meta-closes = Closes|LP + --- rrdtool-1.4.7.orig/debian/librrdp-perl.install +++ rrdtool-1.4.7/debian/librrdp-perl.install @@ -0,0 +1,2 @@ +usr/share/perl5/RRDp.pm +usr/share/man/man3/RRDp.3pm --- rrdtool-1.4.7.orig/debian/changelog +++ rrdtool-1.4.7/debian/changelog @@ -0,0 +1,954 @@ +rrdtool (1.4.7-2+rpi1) wheezy-staging; urgency=low + + * add build-depends on gcc-4.7 for perl stuff + + -- Peter Michael Green Tue, 04 Sep 2012 23:35:55 +0000 + +rrdtool (1.4.7-2) unstable; urgency=low + + * Ack NMUs; thanks to Jonathan Wiltshire and gregor herrmann! + * Added debian/patches/bts664724-rrdcached-j-segfault: + Fixed segfault in rrdcached when starting without having the journal + directory available: canonicalize the journal path after creating the + directory; else, realpath(3) will return NULL causing strdup() to + segfault. Also, check the return value of realpath(3) before further using + it. Thanks to Helmut Grohne for reporting this (Closes: #664724). + + -- Sebastian Harl Wed, 01 Aug 2012 10:23:39 +0200 + +rrdtool (1.4.7-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "fails to install, postinst, invoke-rc.d rrdcached start, start- + stop-daemon, segfault": + (re-)create /var/lib/rrdcached/{journal,db} in init script. + (Closes: #664724) + * debian/rules: remove the generated bindings/perl-shared/MYMETA.yml in the + clean target. + + -- gregor herrmann Sun, 29 Jul 2012 17:35:13 +0200 + +rrdtool (1.4.7-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Add ruby_bindings_format_string.patch to fix FTBFS + (Closes: #676081) + + -- Jonathan Wiltshire Sun, 01 Jul 2012 12:37:47 +0100 + +rrdtool (1.4.7-1) unstable; urgency=low + + * [b59bb994] Merge commit 'upstream/1.4.7' + * [8acead25] Refreshing patches, dropping bts625631-gcc4.5. + * [75b42449] Ack NMU. + Thanks to Luk Claes (Closes: #619688) + * [e11e1d9e] Migrate to dh_python2. + + -- Bernd Zeimetz Tue, 24 Jan 2012 23:35:35 +0100 + +rrdtool (1.4.3-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Don't ship .la files (Closes: #619688). + + -- Luk Claes Sun, 26 Jun 2011 18:40:41 +0200 + +rrdtool (1.4.3-3) unstable; urgency=high + + * Reupload to unstable, which has Tcl 8.5 by now. + * debian/patches: + - Added bts625631-gcc4.5, fixing an compiler issue when using GCC 4.5; + thanks to Maxime Petazzoni for reporting this and Sven Hartge for + pointing out the upstream fix by anicka@suse.cz (Closes: #625631). + * Set urgency to high because of the fix for #625631. + * debian/source/format: Explicitly state version 1.0 for now. + * debian/control: + - Removed prehistoric 'Conflicts' introduced for an incompatibility with + Woody. + - Updated standards-version to 3.9.2. + * debian/rrdtool.doc-base: + - Fixed a spelling error detected by lintian. + + -- Sebastian Harl Mon, 16 May 2011 10:28:46 +0200 + +rrdtool (1.4.3-2) experimental; urgency=low + + * debian/control: Rebuild against Tcl 8.5 (Closes: #582211). + - Build-depend on tcl-dev (>= 8.5) and tcl (>= 8.5). + * Uploading to experimental, which hosts Tcl 8.5 for now. + * debian/patches: + - Added tcl-8.5, fixing an issue identified by Tcl 8.5 in the Tcl + bindings: So far, a strict version of the "Tcl" package was requested, + which seems to have been ignored by Tcl < 8.5. This requirement has been + removed. + + -- Sebastian Harl Sun, 06 Jun 2010 15:22:39 +0200 + +rrdtool (1.4.3-1) unstable; urgency=low + + * New upstream release. + * debian/patches: + - Removed bts573638-rrdcgi-segfault and bts573299-rrdgraph-M -- included + upstream. + + -- Sebastian Harl Wed, 24 Mar 2010 08:46:16 +0100 + +rrdtool (1.4.2-2) unstable; urgency=low + + * 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. + + -- Sebastian Harl Sun, 21 Mar 2010 21:37:37 +0100 + +rrdtool (1.4.2-1) unstable; urgency=low + + [ Bernd Zeimetz ] + * debian/rules: + - Prepare to build with Python 2.6. + + [ Sebastian Harl ] + * 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 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/. + + -- Sebastian Harl Thu, 21 Jan 2010 22:56:17 +0100 + +rrdtool (1.4~rc2+20091004-1) experimental; urgency=low + + [ Sebastian Harl ] + * 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. + + [ Bernd Zeimetz ] + * 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. + + -- Sebastian Harl Mon, 05 Oct 2009 22:27:13 +0200 + +rrdtool (1.3.8-1) unstable; urgency=low + + [ 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. + + -- Sebastian Harl Mon, 01 Jun 2009 18:49:13 +0200 + +rrdtool (1.3.7-1) unstable; urgency=low + + * New upstream release (Closes: #431060): + - Fixed pathname used in rrdgraph's --imginfo output (Closes: #497739). + * debian/patches: + - Updated bts428778-floating-point-exception to apply to the latest + version of rrdtool; use rrd_free2() instead of rrd_free() to not leak + memory. + - Updated no-rpath-for-perl to apply to the latest version of rrdtool. + - Removed bts493553-pango-utf-8 - included upstream. + - Removed bts496847-error-handling - included upstream. + - Removed bts498183-segfault-madvise - included upstream. + - Removed bts499349-memleaks - included upstream. + - Removed bts499350-data-corruption - included upstream. + - Removed typo-ruby - included upstream. + - Added bts494874-gnu-kfreebsd to fix a FTBFS on GNU/kFreeBSD - thanks to + Petr Salinger for the patch (Closes: #494874). + - Added doc-fixes to fix a POD error in doc/rrdtutorial.pod. + - Added compiler-warning-fixes - upstream patch to fix some compiler + warnings. + * debian/rules: + - Remove src/librrd.sym in the clean target - this file is automatically + created during the build but not cleaned up in the upstream Makefiles. + - Remove .txt and .pod documentation from the 'rrdtool' binary package - + the manpages are a lot more useful. + - Pass --fail-missing (instead of --list-missing) to dh_install. + - Use 'pyversions -vr' instead of 'pysupport-parseversions'. + * Added new binary package rrdtool-dbg. Unfortunately, segfaults and the + like are not uncommon in rrdtool - this will help to trace them back more + easily (Closes: #518480). + * debian/README.Debian: + - Added new file with a short paragraph about the available documentation. + * debian/control: + - Moved librrd-ruby* packages from section "interpreters" to the newly + added section "ruby". + - Updated standards-version to 3.8.1 - no changes. + - Added XS-Python-Version field, specifying versions >= 2.3. + * debian/librrd-dev.install: + - Added /usr/lib/pkgconfig/librrd.pc (Closes: #522144). + * debian/rrdtool.install, debian/rrdtool.examples: + - Install examples/* and ifOctets.tcl using dh_install instead of + dh_installexamples. This allows the use of --fail-missing when running + dh_install. + * Removed debian/pyversions - has been replaced by the XS-Python-Version + field. + + -- Sebastian Harl Mon, 11 May 2009 23:02:14 +0200 + +rrdtool (1.3.1-4) unstable; urgency=high + + * 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). + + -- Sebastian Harl Fri, 26 Sep 2008 01:41:05 +0200 + +rrdtool (1.3.1-3) unstable; urgency=low + + * Added "libxml2-dev" to librrd-dev's dependencies (Closes: #493342). + * debian/patches: + - Added bts493553-pango-utf-8 to try to make sure an UTF-8 string is + passed to pango_layout_set_{text,markup}() as required by libpango + (Closes: #493553). + + -- Sebastian Harl Mon, 04 Aug 2008 15:57:26 +0200 + +rrdtool (1.3.1-2) unstable; urgency=low + + * Reupload to unstable - thanks to Marc 'HE' Brockschmidt for the approval. + * debian/patches: + - Removed bts428780-validate-row-count - this is included in upstream + version 1.3. + * debian/control: + - librrd-dev provides and replaces librrd2-dev to ease the transition. + + -- Sebastian Harl Wed, 30 Jul 2008 11:44:53 +0200 + +rrdtool (1.3.1-1) experimental; urgency=low + + * New upstream release. + + -- Sebastian Harl Wed, 23 Jul 2008 21:44:45 +0200 + +rrdtool (1.3.0-1) experimental; urgency=low + + [ Sebastian Harl ] + * New upstream release. + - Fixes a buffer overflow in librrd's error handling (Closes: #450578). + - Validate RRA row count in rrdcreate (Closes: #428780). + * Upload to experimental because of the required transition which has not + yet been granted for Lenny by the release team. + * debian/patches: + - Updated patches to apply on 1.3.0. + - "implicit-decl-fix" partly applied upstream + - "typos" removed, has been applied upstream + * debian/control: + - Replaced librrd2 / librrd2-dev with librrd4 / librrd-dev. + - Removed SONAME version from the -dev package name. + - Added "ttf-dejavu | ttf-bitstream-vera" recommendation to librrd4 - + upstream no longer ships DejaVuSansMono-Roman.ttf. + - Replaced "libart-2.0-dev" with "libcairo2-dev, libpango1.0-dev" in the + build dependencies and librrd-dev's dependencies following the switch + made by upstream. + - Added "libxml2-dev" to the build dependencies. + - Updated standards-version to 3.8.0 - no changes. + - No longer conflict / replace librrd0 and librrd0-dev - librrd0 is no + longer available since Etch. + - Added libc6-dev | libc-dev to librrd-dev's dependencies. + * debian/librrd4.symbols: + - Added symbols file for the new SONAME version number replacing + librrd2.symbols. + * debian/rules: + - Install "NEWS" and "CHANGES" into all packages. + - No longer set TCL_INC_DIR manually - has been fixed upstream. + + [ Bernd Zeimetz ] + * debian/rules: + - Adding an option to point configure to the right path to tcl. This is + not needed for Lenny, but we also add it here to make coming backports + more simple. + + -- Sebastian Harl Sun, 15 Jun 2008 14:09:47 +0200 + +rrdtool (1.2.28-1) unstable; urgency=low + + [ Sebastian Harl ] + * New upstream release. + - Fixes a buffer overflow in librrd's error handling (Closes: #450578). + * debian/control: + - Updated standards-version to 3.8.0 - no changes. + - No longer conflict / replace librrd0 and librrd0-dev - librrd0 is no + longer available since Etch. + - Added libc6-dev | libc-dev to librrd2-dev's dependencies. + * debian/patches: + - Added backported upstream patch bts428780-validate-row-count to validate + the RRA row count in rrdcreate (Closes: #428780). + * debian/librrd2.symbols: + - Added the private symbol "rra_random_row@Base 1.2.28-1". + * debian/rules: + - Install "NEWS" and "CHANGES" into all packages. + + [ Bernd Zeimetz ] + * debian/rules: + - Adding an option to point configure to the right path to tcl. This is + not needed for Lenny, but we also add it here to make coming backports + more simple. + * debian/patches/implicit-decl-fix: + - Patching the implicit declaration in rrd_update.c in a nicer way. + + -- Sebastian Harl Wed, 23 Jul 2008 21:01:04 +0200 + +rrdtool (1.2.27-2) unstable; urgency=low + + * 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. + + -- Sebastian Harl Wed, 16 Apr 2008 15:50:54 +0200 + +rrdtool (1.2.27-1) unstable; urgency=low + + [ Bernd Zeimetz ] + * New upstream release. + - Finally allows + as leading characters in the input (Closes: #283935). + * debian/rules, debian/librrd2.install: + - Install rrdtool's ttf and configure rrd to use it. + * debian/patches: + - Updating patches to apply on 1.2.27. + - Adding debian/patches/bts428778-floating-point-exception to fix a corner + case that produces a SIGFPE (Closes: #428778). Patch created by + David Martínez Moreno. + * debian/control: + - Removing the ttf-dejavu dependency from librrd2 (Closes: #390617). + - Builds with -O2 segfault on arm, so disable it on arm for now until the + bug is properly debugged, which will take some time (Closes: #447041). + + [ Sebastian Harl ] + * Adding debian/patches/typo by David Martínez Moreno to fix some typos + (Closes: #432340). + + -- Bernd Zeimetz Sun, 24 Feb 2008 23:48:24 +0100 + +rrdtool (1.2.26-1) unstable; urgency=low + + [ Bernd Zeimetz ] + * New upstream version (Closes: #431060). + * Package hijacked as announced on debian-devel@lists.debian.org + (Message-ID: <47A7A2A4.3020106@bzed.de>) due to the old maintainer + being MIA. + * Complete overhaul of the packaging: + - debian/rules completely rewritten + - debian/copyright redone as it didn't even list upstream's copyright + correctly. + - debian/post{inst,rm}: removed, debhelper takes care of this. + - debian/control: + * Update of Maintainer, Standards-Version, Uploaders + * Building ruby modules now (Closes: #453304). + * Change the Python binary package to conform with the Python policy, + using python-support. Also renaming the package to follow the Python + policy. + * Make rrdtool-tcl compliant with policy + * Bump Standards Version to 3.7.3. + * Using and depending on quilt to handle patches. + * Adding Provides: librrd-dev to librrd2-dev. + - debian/watch: + * File redone to meet version 3 of uscan and to work again, using the + new location of the upstream source. + + [ Alexander Wirt ] + * Removed rpath from perl and tcl modules + * Let rrdtool-tcl depend on tcl 8.4 + + -- Bernd Zeimetz Mon, 11 Feb 2008 12:14:19 +0100 + +rrdtool (1.2.19-1) unstable; urgency=low + + * New maintainer (closes: #409518). + * New upstream release: + - Logarithmic graphs don't consume all available memory (closes: #402782). + - This version at least does no longer have such rrdexplorer example + (closes: #239565). + - Patch for PREV(cname) was included long ago (closes: #160485). + - I am no longer able to reproduce a segfault with PREV(name). Closes: + #180284. + * Acknowledge NMU uploads (closes: #323975, #324497, #326653, #373379, + #323771, #325708, #323611, #240369, #323969). + * bindings/python/Makefile.in: Added -lpython2.4 in order to fix build + failure. + + -- David Martínez Moreno Mon, 12 Feb 2007 02:18:22 +0100 + +rrdtool (1.2.15-0.3) unstable; urgency=high + + * Non-maintainer upload. + * Fix high memory consumption by extracting r881 und r887 from upstream. + Closes: #397691, #398111 + + -- Andreas Barth Thu, 14 Dec 2006 18:25:02 +0000 + +rrdtool (1.2.15-0.2) unstable; urgency=low + + * Non-maintainer upload. + * Fixed the python module based on the patch supplied by Brian Warner, + thank you, closes: #397781. + * Updated upstream URL in the copyright file. + + -- Josip Rodin Mon, 27 Nov 2006 00:25:41 +0100 + +rrdtool (1.2.15-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream version, closes: #364948. + + Dropped our patches for #323771, it's now fixed upstream. + + Seems to fix the crashes in RRDs::graph, closes: #392937. + * Fixed up the package descriptions a little bit. + * Updated package list in README.Debian. + * Tidied up the copyright file. + + -- Josip Rodin Mon, 6 Nov 2006 21:09:04 +0100 + +rrdtool (1.2.11-0.6) unstable; urgency=low + + * Convert to updated Python policy. Closes: #373379. + + -- Matthias Klose Sun, 18 Jun 2006 03:07:38 +0000 + +rrdtool (1.2.11-0.5) unstable; urgency=low + + * NMU. + * Fix the path to the ttf-deja font and version librrd2 dependance on + ttf-dejavu. + + -- Laurent Fousse Mon, 9 Jan 2006 17:57:20 +0100 + +rrdtool (1.2.11-0.4) unstable; urgency=low + + * NMU. + * Tighten the dependency of the binary packages on librrd2 to assert the use + of a recent version depending on ttf-dejavu. + * Fix 'rrdtool restore', replace the workaround from 1.2.11-0.3 with a patch + from the upstream repository. Closes: #323771. + * Set the priority of the language bindings, which only depend on librrd2, + to optional, as aleady done for python-rrd (rrdtool-tcl, librrds-perl). + Closes: #240369. + + -- Matthias Klose Sun, 18 Sep 2005 06:04:13 +0000 + +rrdtool (1.2.11-0.3) unstable; urgency=low + + * NMU. + * Don't include own copy of ttf-dejavu font file, depend on ttf-dejavu. + Patch by Jeremy Bobbio. Closes: #323975. + * README.Debian: Add link to upstream contrib directory (closes: #323969). + * NEWS: Install into librrd2{,-dev} as well (closes: #325708). + * librrd[ps]-perl: Add README to locate the example files (closes: #323611). + + -- Matthias Klose Tue, 13 Sep 2005 11:03:47 +0000 + +rrdtool (1.2.11-0.2) unstable; urgency=low + + * librrd2-dev: Add conflict/replaces to librrd0 (.la) file. + Closes: #323355. + + -- Matthias Klose Tue, 16 Aug 2005 11:42:00 +0200 + +rrdtool (1.2.11-0.1) unstable; urgency=low + + * NMU. + * New upstream version. + - Fix FTBFS on amd64 (closes: #294623). + - Fix rrdcgi not handling quotes (closes: #243794). + - Fix rrdcgi concatenation problem (closes: #232556). + - New soname for the librrd library (closes: #309346). + * Use debhelper V4. + * Build-depend on libart2.0-dev, libfreetype6-dev. + * Remove build dependencies on gd2 libs. (closes: #261752, #289003). + * Build python bindings from this source, add Matthias Urlichs as uploader. + * debian/copyright: Remove the paragraph "Modifications to upstream source", + no modifications with this upload. + * Remove empty files from examples directory (closes: #281194). + * Build-depend on fixed cgilib (>= 0.5-4.1). + + -- Matthias Klose Sun, 14 Aug 2005 17:30:00 +0200 + +rrdtool (1.0.49-1) unstable; urgency=low + + * New upstream release + * librrd0 conflicts with older rrdtool, librrds-perl due to libpng + incompatibility (Closes: #252271) + * Change depends on librrd0-dev to -noxpm variant as well + * Update depends on rrdtool-tcl to tcl8.4 + + -- Matt Zimmerman Thu, 4 Nov 2004 17:48:45 -0800 + +rrdtool (1.0.48-3) unstable; urgency=low + + * Placate disk space fascists by building with the -noxpm variant of libgd2 + (Closes: #261752) + * Require a version of libgd which has GIF support restored (2.0.28) + (Closes: #265660) + + -- Matt Zimmerman Sat, 9 Oct 2004 11:43:06 -0700 + +rrdtool (1.0.48-2) unstable; urgency=low + + * Build against libgd2, since it now provides gif support as libgd-gif1 + did, and avoids a conflict with programs which link against both + librrd and libgd2, such as php4-rrdtool (Closes: #261323) + - Build-Depends: s/libgd-gif1-dev/libgd2-xpm-dev/ + - librrd0-dev Depends: likewise + * Add libc-dev as an alternative in librrd0-dev's libc6-dev dependency + + -- Matt Zimmerman Sat, 24 Jul 2004 23:57:17 -0700 + +rrdtool (1.0.48-1) unstable; urgency=low + + * New upstream release (Closes: #256795) + + -- Matt Zimmerman Sun, 4 Jul 2004 01:40:30 -0700 + +rrdtool (1.0.46-3) unstable; urgency=low + + * Add dependencies to librrd0-dev to ensure that static linking is + possible: libgd-gif1-dev, zlib1g-dev + * #include in rrd.h (Closes: #238849) + * Only link rrdcgi with -lcgi, not librrd + + -- Matt Zimmerman Fri, 19 Mar 2004 11:38:39 -0800 + +rrdtool (1.0.46-2) unstable; urgency=medium + + * Fix tcl module installation (Closes: #231171) + + -- Matt Zimmerman Wed, 4 Feb 2004 15:35:46 -0800 + +rrdtool (1.0.46-1) unstable; urgency=low + + * New upstream release + + -- Matt Zimmerman Mon, 12 Jan 2004 23:22:09 -0800 + +rrdtool (1.0.45-1) unstable; urgency=low + + * New upstream release + * Deal with changed tclrrd naming scheme + * Build with tcl8.4 + * Remove old dpkg-dev build-dependency; even woody is new enough + + -- Matt Zimmerman Wed, 17 Dec 2003 14:09:11 -0800 + +rrdtool (1.0.42-2) unstable; urgency=low + + * Build-Depends: libpng12-dev instead of libpng3-dev (when will the madness end?) + (Closes: #195224 + I hope this will also fix weird version mismatch problems (Closes: #194900) + + -- Matt Zimmerman Sat, 31 May 2003 15:06:42 -0400 + +rrdtool (1.0.42-1) unstable; urgency=low + + * New upstream release + * librrd0-dev Section: libdevel + * librrd[sp]-perl Section: perl + * Build with libpng3 (Closes: #189493) + + -- Matt Zimmerman Thu, 15 May 2003 19:44:37 -0400 + +rrdtool (1.0.40-2) unstable; urgency=low + + * Correctly suppress non-image output when writing image to stdout + (Closes: #182217) + + -- Matt Zimmerman Sat, 1 Mar 2003 16:59:39 -0500 + +rrdtool (1.0.40-1) unstable; urgency=low + + * New upstream release + * Remove unnecessary rrd_free to avoid crash on invalid option + (Closes: #166156) + * Clean example source code; some libtool cruft was getting installed in + /usr/share/doc/examples + + -- Matt Zimmerman Tue, 17 Dec 2002 22:11:46 -0500 + +rrdtool (1.0.39-2) unstable; urgency=low + + * Rebuild for perl 5.8 (Closes: #158728) + + -- Matt Zimmerman Sun, 25 Aug 2002 17:29:41 -0400 + +rrdtool (1.0.39-1) unstable; urgency=low + + * New upstream release + + -- Matt Zimmerman Wed, 31 Jul 2002 00:40:00 -0400 + +rrdtool (1.0.38-1) unstable; urgency=low + + * New upstream release (Closes: #148486) + + -- Matt Zimmerman Wed, 29 May 2002 12:28:28 -0400 + +rrdtool (1.0.35-2) unstable; urgency=low + + * Remove CVS directories with rm -rf. This broke autobuilds entirely. + (Closes: #140075) + + -- Matt Zimmerman Tue, 26 Mar 2002 17:15:01 -0500 + +rrdtool (1.0.35-1) unstable; urgency=low + + * New upstream release. + + -- Matt Zimmerman Sun, 24 Mar 2002 11:29:10 -0500 + +rrdtool (1.0.33-9) unstable; urgency=low + + * Call dh_shlibdeps with -l to allow it to find dependencies correctly + (Closes: #118629) + * Add call to ldconfig in postrm of librrd0 + * Remove .cvsignore files from installed examples + + -- Matt Zimmerman Sat, 10 Nov 2001 14:14:51 -0500 + +rrdtool (1.0.33-8) unstable; urgency=low + + * Use AM_MAINTAINER_MODE to keep the makefiles from trying to rebuild + autoconf/automake stuff during the build (Closes: #117599) + * Regenerated everything AGAIN. + * Use DESTDIR instead of prefix= during "make install" + + -- Matt Zimmerman Mon, 29 Oct 2001 22:22:07 -0500 + +rrdtool (1.0.33-7) unstable; urgency=low + + * Add an example to the rrddump documentation showing what is necessary + to transfer an RRD from one architecture to another. (Closes: #117147) + * Regenerated autoconf/automake configs + + -- Matt Zimmerman Mon, 29 Oct 2001 02:28:16 -0500 + +rrdtool (1.0.33-6) unstable; urgency=low + + * Spelling corrections from Martin Schulze (Closes: #110784) + + -- Matt Zimmerman Sat, 8 Sep 2001 13:13:22 -0400 + +rrdtool (1.0.33-5) unstable; urgency=low + + * Ship with pre-generated files from autoconf2.50/automake, rather than + pulling them in at build-time, in order to work around the current + libtool mess. This makes the diff less manageable, but should make + the build more stable. + * debian/control: remove build-dependencies on autoconf/automake/libtool + * debian/rules: don't call autoconf/automake + * Fix shlibs file (it was trying to use a substitution) + * configure.in: remove makefiles that no longer exist from AC_OUTPUT. + Apparently this is an error in autoconf 2.50. + * configure.in: Remove wacky logic to pull PIC flags out of libtool, and + let libtool do the right thing. + * debian/rules: shlibs.local hackery is no longer necessary, removed + + -- Matt Zimmerman Fri, 3 Aug 2001 17:36:43 -0400 + +rrdtool (1.0.33-4) unstable; urgency=low + + * Add build-dependencies on libtool and autoconf (Closes: #105655) + + -- Matt Zimmerman Tue, 17 Jul 2001 15:44:25 -0400 + +rrdtool (1.0.33-3) unstable; urgency=low + + * Update config.{sub,guess} from autotools-dev 20010702.1 + (Closes: #105037) + * Update ltmain.sh for good measure, from libtool 1.4-1 + * Build-Depend on autoconf, and run autoconf and aclocal from + debian/rules (in addition to automake) + + -- Matt Zimmerman Sat, 14 Jul 2001 03:19:22 -0400 + +rrdtool (1.0.33-2) unstable; urgency=low + + * Rebuild with latest tcl8.3-dev, to fix shared object extension + + -- Matt Zimmerman Sat, 3 Mar 2001 17:28:24 -0500 + +rrdtool (1.0.33-1) unstable; urgency=low + + * New upstream version. + * This is yet another patch release to fix some distribution/compilation + problems. There should be no visible changes for Debian users from + 1.0.32-3. + + -- Matt Zimmerman Thu, 1 Mar 2001 02:27:53 -0500 + +rrdtool (1.0.32-3) unstable; urgency=low + + * Fix the tcl extension module to build against tcl8.3, rather than + tcl8.0 (Closes: #87357) + * debian/control: Build-depend on tcl8.3-dev + * debian/rules: tclconfigdir = /usr/lib/tcl8.3 + * tcl/Makefile.am: (upstream) -I/usr/include/tcl@TCL_VERSION@ + * configure.in: (upstream) AC_SUBST(TCL_VERSION) + + -- Matt Zimmerman Sat, 24 Feb 2001 02:25:46 -0500 + +rrdtool (1.0.32-2) unstable; urgency=low + + * List changes to upstream source in the copyright file (as well as the + changelog) + * Link against libgd-gif instead of libgd, to restore GIF support + + -- Matt Zimmerman Fri, 23 Feb 2001 15:27:37 -0500 + +rrdtool (1.0.32-1) unstable; urgency=low + + * New upstream version. Hopefully this one will last more than 24 + hours (Closes: #75771) + + -- Matt Zimmerman Wed, 21 Feb 2001 20:13:09 -0500 + +rrdtool (1.0.27-7) unstable; urgency=low + + * debian/rules: Updated for new Perl policy + * debian/rules: Don't use install-stamp; it causes more problems than it + prevents + * debian/rules: Don't call dh_suidregister; we didn't use it anyway + * debian/control: Build-depend on the new debhelper for dh_perl + * debian/control: rrdtool-tcl only seems to work with 8.0, so depend on + tcl8.0 + * debian/control: Build-depend on perl 5.6.0+ + * debian/librrd?-perl: Updated for new Perl filesystem layout + + -- Matt Zimmerman Thu, 15 Feb 2001 19:04:11 -0500 + +rrdtool (1.0.27-6) unstable; urgency=low + + * debian/rules: Handle DEB_BUILD_OPTIONS debug, nostrip + * debian/rules: Separate out "configure" target + * debian/rules: Miscellaneous cleanup + * Recompile librrds-perl against perl-5.6 + + -- Matt Zimmerman Tue, 19 Dec 2000 21:23:55 -0500 + +rrdtool (1.0.27-5) unstable; urgency=low + + * Fix Build-Depends to reflect our dependency on dpkg-dev >= 1.7.0 | + librrd0. The old dpkg can only calculate our dependencies correctly + if the runtime library is installed on the system, so potato users + must either install the potato librrd0 or the new dpkg-dev + (Closes: #77479) + + -- Matt Zimmerman Mon, 20 Nov 2000 20:39:55 -0500 + +rrdtool (1.0.27-4) unstable; urgency=low + + * Updated to comply with policy 3.2.1.0: + - Don't build with -g by default + * Build-Depend on tcl8.0-dev (not tcl-dev), since that is the only + version we currently work with. + * Added automake to Build-Depends (oops) + + -- Matt Zimmerman Sat, 18 Nov 2000 22:29:02 -0500 + +rrdtool (1.0.27-3) unstable; urgency=low + + * Big packaging cleanup release. + * Fixed perl module compilation to link with the shared library, rather + than including a copy of the static library inside the .so (also fixes + a lintian error, shlib-with-non-pic-code in librrds-perl) + * Fixed tcl module compilation to link with the shared library, rather + than including a copy of the static library inside the .so (also fixes + a lintian error, shlib-with-non-pic-code in rrdtool-tcl) + * The above shrunk the size of the perl and tcl library packages from + 60k each to about 20k (perl) and 16k (tcl) + * We can now use shlibdeps to calculate the dependencies for + librrds-perl, so those will be more correct now + * Rather than include Makefile.in changes in the .diff.gz, just keep our + modifications to Makefile.am and run automake in debian/rules. This + makes the .diff.gz much smaller and cleaner + * Fixed shared library dependencies all around to be smarter + * rrdtool package now Suggests librrds-perl (rather than depending on + perl), as it is only needed for an auxiliary script for converting + mrtg data + + -- Matt Zimmerman Fri, 10 Nov 2000 19:34:05 -0500 + +rrdtool (1.0.27-2) unstable; urgency=low + + * Updated maintainer email address (now official maintainer) + + -- Matt Zimmerman Wed, 1 Nov 2000 22:44:41 -0500 + +rrdtool (1.0.27-1) unstable; urgency=low + + * New upstream version. + + -- Matt Zimmerman Wed, 13 Sep 2000 13:10:14 -0400 + +rrdtool (1.0.26-1) unstable; urgency=low + + * New upstream version. + + -- Matt Zimmerman Sun, 10 Sep 2000 16:34:08 -0400 + +rrdtool (1.0.25-1) unstable; urgency=low + + * New upstream version. + + -- Matt Zimmerman Sun, 23 Jul 2000 02:23:53 -0400 + +rrdtool (1.0.24-2) unstable; urgency=low + + * Updated for libgd 1.8.3 (build depends, recompile) + + -- Matt Zimmerman Fri, 7 Jul 2000 19:33:29 -0400 + +rrdtool (1.0.24-1) unstable; urgency=low + + * New upstream version (Closes: #61997). + + -- Matt Zimmerman Fri, 30 Jun 2000 13:53:27 -0400 + +rrdtool (1.0.17-1) unstable; urgency=low + + * New upstream version. + * Now creates rrdtool-tcl, containing tcl bindings. + + -- Matt Zimmerman Wed, 26 Apr 2000 13:16:24 -0700 + +rrdtool (1.0.16-1) unstable; urgency=low + + * New upstream version. + * Not released. + + -- Matt Zimmerman Wed, 26 Apr 2000 10:53:36 -0700 + +rrdtool (1.0.13-2) unstable; urgency=low + + * Build-Depends: cgilib, zlib1g-dev, libpng2-dev, libgd1g-dev, groff, + debhelper. Hopefully that's everything. + + -- Matt Zimmerman Fri, 7 Apr 2000 14:16:55 -0700 + +rrdtool (1.0.13-1) unstable; urgency=low + + * New upstream version (Closes: #58583) + * Added Build-Depends for cgilib (Closes: #55270) + + -- Matt Zimmerman Thu, 23 Mar 2000 15:55:37 -0800 + +rrdtool (1.0.10-1) unstable; urgency=low + + * New upstream version. + + -- Matt Zimmerman Mon, 10 Jan 2000 16:46:33 -0800 + +rrdtool (1.0.7-3) unstable; urgency=low + + * Non-i386 fixes, thanks to Christopher C Chimelis : + * Changed 'clean' target in debian/rules to remove the auto-generated + Makefiles for the Perl modules + * Changed Depends: for librrds-perl to use shlibdeps + + -- Matt Zimmerman Mon, 22 Nov 1999 10:47:13 -0800 + +rrdtool (1.0.7-2) unstable; urgency=low + + * Linked RRDs.so against libpng, closes: #49701 + + -- Matt Zimmerman Tue, 9 Nov 1999 15:02:40 -0800 + +rrdtool (1.0.7-1) unstable; urgency=low + + * Initial Release. + * Upstream source ships with cgilib-0.4, gd-1.3, libpng-1.0.3, and + zlib-1.3.3 (!). Build process is modified to skip building these, and + instead link with the Debian versions. + * Modifications for gd 1.6.1 included removal of GIF support (no longer + included with gd as of 1.6) + + -- Matt Zimmerman Sat, 11 Sep 1999 13:29:29 -0700 + + --- rrdtool-1.4.7.orig/debian/README.source +++ rrdtool-1.4.7/debian/README.source @@ -0,0 +1,4 @@ +This package uses quilt to manage all modifications to the upstream source. +See /usr/share/doc/quilt/README.source for instructions how to generate the +patched source, add a new modification, and remove an existing one. + --- rrdtool-1.4.7.orig/debian/rrdcached.default +++ rrdtool-1.4.7/debian/rrdcached.default @@ -0,0 +1,21 @@ +# /etc/default/rrdcached + +# 0: start rrdcached on boot, 1: do not start rrdcached on boot +# default: 0 +DISABLE=0 + +# options to be passed to rrdcached +# (do not specify -p - this is handled by the init script) +# default: see /etc/init.d/rrdcached +#OPTS="" + +# number of seconds to wait for rrdcached to shut down +# (writing the data to disk may take some time; +# tune this according to your setup) +# default: 30 +MAXWAIT=30 + +# 0: do not enable core-files, 1: enable core-files ... if rrdcached crashes +# default: 0 +ENABLE_COREFILES=0 + --- rrdtool-1.4.7.orig/debian/liblua5.1-rrd-dev.install +++ rrdtool-1.4.7/debian/liblua5.1-rrd-dev.install @@ -0,0 +1,3 @@ +usr/lib/lua/5.1/rrd.a +usr/lib/lua/5.1/rrd.so +../lua-rrd.h usr/include/lua5.1 --- rrdtool-1.4.7.orig/debian/liblua5.1-rrd0.install +++ rrdtool-1.4.7/debian/liblua5.1-rrd0.install @@ -0,0 +1,2 @@ +usr/lib/lua/5.1/rrd.so.0 +usr/lib/lua/5.1/rrd.so.0.0.0 --- rrdtool-1.4.7.orig/debian/rrdtool.examples +++ rrdtool-1.4.7/debian/rrdtool.examples @@ -0,0 +1 @@ +bindings/ruby/test.rb --- rrdtool-1.4.7.orig/debian/rrdcached.init.d +++ rrdtool-1.4.7/debian/rrdcached.init.d @@ -0,0 +1,149 @@ +#! /bin/bash +# +# rrdcached - start and stop the RRDtool data caching daemon +# http://oss.oetiker.ch/rrdtool/ +# +# Based on the collectd init script. +# +# Copyright (C) 2005-2006 Florian Forster +# Copyright (C) 2006-2009 Sebastian Harl +# + +### BEGIN INIT INFO +# Provides: rrdcached +# Required-Start: $local_fs $remote_fs +# Required-Stop: $local_fs $remote_fs +# Should-Start: $network +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: start the RRDtool data caching daemon +### END INIT INFO + +set -e + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +DISABLE=0 + +DESC="RRDtool data caching daemon" +NAME=rrdcached +DAEMON=/usr/bin/rrdcached + +OPTS="-l unix:/var/run/rrdcached.sock" +OPTS="$OPTS -j /var/lib/rrdcached/journal/ -F" +OPTS="$OPTS -b /var/lib/rrdcached/db/ -B" + +PIDFILE=/var/run/rrdcached.pid + +MAXWAIT=30 + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +if [ -r /etc/default/$NAME ]; then + . /etc/default/$NAME +fi + +if test "$DISABLE" != 0 -a "$1" == "start"; then + echo "$NAME has been disabled - see /etc/default/$NAME." + exit 0 +fi + +if test "$ENABLE_COREFILES" == 1; then + ulimit -c unlimited +fi + +d_start() { + if test "$DISABLE" != 0; then + # we get here during restart + echo -n " - disabled by /etc/default/$NAME" + return 0 + fi + + # make sure we have the needed directories + mkdir -p /var/lib/rrdcached/journal/ + mkdir -p /var/lib/rrdcached/db/ + + start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" \ + --exec $DAEMON -- $OPTS -p "$PIDFILE" +} + +still_running_warning=" +WARNING: $NAME might still be running. +In large setups it might take some time to write all pending data to +the disk. You can adjust the waiting time in /etc/default/$NAME." + +d_stop() { + PID=$( cat "$PIDFILE" 2> /dev/null ) || true + + start-stop-daemon --stop --quiet --oknodo --pidfile "$PIDFILE" + + sleep 1 + if test -n "$PID" && kill -0 $PID 2> /dev/null; then + i=0 + while kill -0 $PID 2> /dev/null; do + i=$(( $i + 2 )) + echo -n " ." + + if test $i -gt $MAXWAIT; then + echo "$still_running_warning" >&2 + return 1 + fi + + sleep 2 + done + return 0 + fi +} + +d_status() { + PID=$( cat "$PIDFILE" 2> /dev/null ) || true + + if test -n "$PID" && kill -0 $PID 2> /dev/null; then + echo "$NAME ($PID) is running." + exit 0 + else + PID=$( pidof $NAME ) || true + + if test -n "$PID"; then + echo "$NAME ($PID) is running." + exit 0 + else + echo "$NAME is stopped." + fi + fi + exit 1 +} + +case "$1" in + start) + echo -n "Starting $DESC: $NAME" + d_start + echo "." + ;; + stop) + echo -n "Stopping $DESC: $NAME" + d_stop + echo "." + ;; + status) + d_status + ;; + restart|force-reload) + echo -n "Restarting $DESC: $NAME" + d_stop + sleep 1 + d_start + echo "." + ;; + *) + echo "Usage: $0 {start|stop|restart|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 + +# vim: syntax=sh noexpandtab sw=4 ts=4 : + --- rrdtool-1.4.7.orig/debian/rrdcached.doc-base +++ rrdtool-1.4.7/debian/rrdcached.doc-base @@ -0,0 +1,14 @@ +Document: rrdcached +Title: The RRDCacheD Manual +Author: Florian Forster +Abstract: This is the manual for RRDCacheD, a daemon that receives updates to + existing RRD files, accumulates them and, if enough have been received or a + defined time has passed, writes the updates to the RRD file. The daemon was + written with big setups in mind. Those setups usually run into I/O related + problems. RRDCacheD's goal is to alleviate these problems. +Section: Science/Data Analysis + +Format: HTML +Index: /usr/share/doc/rrdcached/html/rrdcached.html +Files: /usr/share/doc/rrdcached/html/*.html + --- rrdtool-1.4.7.orig/debian/source/format +++ rrdtool-1.4.7/debian/source/format @@ -0,0 +1 @@ +1.0 --- rrdtool-1.4.7.orig/debian/patches/implicit-decl-fix +++ rrdtool-1.4.7/debian/patches/implicit-decl-fix @@ -0,0 +1,12 @@ +diff a/src/rrd_tool.c b/src/rrd_tool.c +--- a/src/rrd_tool.c ++++ b/src/rrd_tool.c +@@ -16,6 +16,8 @@ + #endif + #endif + ++#include ++ + #include "rrd_tool.h" + #include "rrd_xport.h" + #include "rrd_i18n.h" --- rrdtool-1.4.7.orig/debian/patches/no-rpath-for-perl +++ rrdtool-1.4.7/debian/patches/no-rpath-for-perl @@ -0,0 +1,30 @@ +diff a/bindings/perl-shared/Makefile.PL b/bindings/perl-shared/Makefile.PL +--- a/bindings/perl-shared/Makefile.PL ++++ b/bindings/perl-shared/Makefile.PL +@@ -20,26 +20,7 @@ if (($Config{'osname'} eq 'MSWin32' && $ + ) : () + ); + }else{ +- # if the last argument when calling Makefile.PL is RPATH=/... and ... is the +- # path to librrd.so then the Makefile will be written such that RRDs.so knows +- # where to find librrd.so later on ... + my $R=""; +- if ($ARGV[-1] =~ /RPATH=(\S+)/){ +- pop @ARGV; +- my $rp = $1; +- for ($^O){ +- /linux/ && do{ $R = "-Wl,--rpath -Wl,$rp"}; +- /hpux/ && do{ $R = "+b$rp"}; +- /solaris/ && do{ $R = "-R$rp"}; +- /bsd/ && do{ $R = "-R$rp"}; +- /aix/ && do{ $R = "-blibpath:$rp"}; +- } +- } +- +- # darwin works without this because librrd contains its +- # install_name which will includes the final location of the +- # library after it is installed. This install_name gets transfered +- # to the perl shared object. + my $librrd; + if ($^O eq 'darwin'){ + $librrd = '-lrrd'; --- rrdtool-1.4.7.orig/debian/patches/bts664724-rrdcached-j-segfault +++ rrdtool-1.4.7/debian/patches/bts664724-rrdcached-j-segfault @@ -0,0 +1,31 @@ +diff a/src/rrd_daemon.c b/src/rrd_daemon.c +--- a/src/rrd_daemon.c ++++ b/src/rrd_daemon.c +@@ -3090,8 +3090,7 @@ static int read_options (int argc, char **argv) /* {{{ */ + case 'j': + { + char journal_dir_actual[PATH_MAX]; +- const char *dir; +- dir = journal_dir = strdup(realpath((const char *)optarg, journal_dir_actual)); ++ const char *dir = (const char *)optarg; + + status = rrd_mkdir_p(dir, 0777); + if (status != 0) +@@ -3100,8 +3099,16 @@ static int read_options (int argc, char **argv) /* {{{ */ + dir, rrd_strerror(errno)); + return 6; + } ++ journal_dir = realpath((const char *)dir, journal_dir_actual); ++ if (! journal_dir) { ++ fprintf(stderr, "Failed to canonicalize journal directory '%s': %s\n", ++ dir, rrd_strerror(errno)); ++ return 6; ++ } ++ ++ journal_dir = strdup(journal_dir); + +- if (access(dir, R_OK|W_OK|X_OK) != 0) ++ if (access(journal_dir, R_OK|W_OK|X_OK) != 0) + { + fprintf(stderr, "Must specify a writable directory with -j! (%s)\n", + errno ? rrd_strerror(errno) : ""); --- rrdtool-1.4.7.orig/debian/patches/no-rpath-for-ruby +++ rrdtool-1.4.7/debian/patches/no-rpath-for-ruby @@ -0,0 +1,15 @@ +--- a/bindings/ruby/extconf.rb ++++ b/bindings/ruby/extconf.rb +@@ -3,9 +3,9 @@ + + require 'mkmf' + +-if /linux/ =~ RUBY_PLATFORM +- $LDFLAGS += ' -Wl,--rpath -Wl,$(EPREFIX)/lib' +-elsif /solaris/ =~ RUBY_PLATFORM ++#if /linux/ =~ RUBY_PLATFORM ++# $LDFLAGS += ' -Wl,--rpath -Wl,$(EPREFIX)/lib' ++if /solaris/ =~ RUBY_PLATFORM + $LDFLAGS += ' -R$(EPREFIX)/lib' + elsif /hpux/ =~ RUBY_PLATFORM + $LDFLAGS += ' +b$(EPREFIX)/lib' --- rrdtool-1.4.7.orig/debian/patches/tcl-8.5 +++ rrdtool-1.4.7/debian/patches/tcl-8.5 @@ -0,0 +1,12 @@ +diff a/bindings/tcl/tclrrd.c b/bindings/tcl/tclrrd.c +--- a/bindings/tcl/tclrrd.c ++++ b/bindings/tcl/tclrrd.c +@@ -678,7 +678,7 @@ static int init( + if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) + return TCL_ERROR; + +- if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 1) == NULL) { ++ if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) { + return TCL_ERROR; + } + --- rrdtool-1.4.7.orig/debian/patches/bts530814-hurd +++ rrdtool-1.4.7/debian/patches/bts530814-hurd @@ -0,0 +1,67 @@ +diff a/src/rrd_graph.c /src/rrd_graph.c +--- a/src/rrd_graph.c ++++ b/src/rrd_graph.c +@@ -3958,6 +3958,7 @@ rrd_info_t *rrd_graph_v( + rrd_info_t *grinfo; + char *old_locale; + rrd_graph_init(&im); ++ size_t graphfile_len; + /* a dummy surface so that we can measure text sizes for placements */ + old_locale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); +@@ -3975,7 +3976,9 @@ rrd_info_t *rrd_graph_v( + return NULL; + } + +- if (strlen(argv[optind]) >= MAXPATH) { ++ graphfile_len = strlen(argv[optind]); ++#ifdef MAXPATH ++ if (graphfile_len >= MAXPATH) { + rrd_set_error("filename (including path) too long"); + rrd_info_free(im.grinfo); + im_free(&im); +@@ -3984,6 +3987,16 @@ rrd_info_t *rrd_graph_v( + + strncpy(im.graphfile, argv[optind], MAXPATH - 1); + im.graphfile[MAXPATH - 1] = '\0'; ++#else ++ im.graphfile = malloc(graphfile_len + 1); ++ if (im.graphfile == NULL) { ++ rrd_set_error("cannot allocate sufficient memory for filename length"); ++ rrd_info_free(im.grinfo); ++ im_free(&im); ++ return NULL; ++ } ++ strncpy(im.graphfile, argv[optind], graphfile_len + 1); ++#endif + + if (strcmp(im.graphfile, "-") == 0) { + im.graphfile[0] = '\0'; +--- a/src/rrd_graph.h ++++ b/src/rrd_graph.h +@@ -206,7 +206,11 @@ typedef struct image_desc_t { + + /* configuration of graph */ + ++#ifdef MAXPATH + char graphfile[MAXPATH]; /* filename for graphic */ ++#else ++ char *graphfile; /* filename for graphic */ ++#endif + long xsize, ysize; /* graph area size in pixels */ + struct gfx_color_t graph_col[__GRC_END__]; /* real colors for the graph */ + text_prop_t text_prop[TEXT_PROP_LAST]; /* text properties */ +--- a/src/rrd_tool.c ++++ b/src/rrd_tool.c +@@ -576,7 +576,11 @@ int HandleInputLine( + printf("ERROR: invalid parameter count for pwd\n"); + return (1); + } ++#ifdef __GLIBC__ ++ cwd = get_current_dir_name(); ++#else + cwd = getcwd(NULL, MAXPATH); ++#endif + if (cwd == NULL) { + printf("ERROR: getcwd %s\n", rrd_strerror(errno)); + return (1); --- rrdtool-1.4.7.orig/debian/patches/bts428778-floating-point-exception +++ rrdtool-1.4.7/debian/patches/bts428778-floating-point-exception @@ -0,0 +1,19 @@ +diff a/src/rrd_create.c b/src/rrd_create.c +--- a/src/rrd_create.c ++++ b/src/rrd_create.c +@@ -771,6 +771,15 @@ int rrd_create_fn( + default: + /* can not be zero because we don't know anything ... */ + rrd->cdp_prep->scratch[CDP_val].u_val = DNAN; ++ /* If the step is 0, we're going to have a BIG Floating Point Exception (i.e. SIGFPE). */ ++ /* Example: (( 1202705167 - 67 ) % ( 300 * 0 )) / 300 */ ++ if (rrd->rra_def[i].pdp_cnt == 0) ++ { ++ rrd_set_error("Invalid step: must be greater than 0."); ++ rrd_free2(rrd); ++ rrd_close(rrd_file_dn); ++ return(-1); ++ } + /* startup missing pdp count */ + rrd->cdp_prep->scratch[CDP_unkn_pdp_cnt].u_cnt = + ((rrd->live_head->last_up - --- rrdtool-1.4.7.orig/debian/patches/setup.py-module-name +++ rrdtool-1.4.7/debian/patches/setup.py-module-name @@ -0,0 +1,13 @@ +Index: rrdtool/bindings/python/setup.py +=================================================================== +--- rrdtool.orig/bindings/python/setup.py 2008-02-09 22:23:06.000000000 +0100 ++++ rrdtool/bindings/python/setup.py 2008-02-09 22:23:47.000000000 +0100 +@@ -45,7 +45,7 @@ + #packages = ['rrdtool'], + ext_modules = [ + Extension( +- "rrdtoolmodule", ++ "rrdtool", + ["rrdtoolmodule.c"], + libraries=['rrd'], + library_dirs=[library_dir], --- rrdtool-1.4.7.orig/debian/patches/ruby_bindings_format_string.patch +++ rrdtool-1.4.7/debian/patches/ruby_bindings_format_string.patch @@ -0,0 +1,28 @@ +Subject: fix format string in Ruby binding +Author: Johannes Brandstätter +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676081 +Forwarded: no +Last-Update: 2012-07-01 + +--- rrdtool-1.4.7.orig/bindings/ruby/main.c ++++ rrdtool-1.4.7/bindings/ruby/main.c +@@ -27,7 +27,7 @@ + + #define RRD_CHECK_ERROR \ + if (rrd_test_error()) \ +- rb_raise(rb_eRRDError, rrd_get_error()); \ ++ rb_raise(rb_eRRDError, "%s", rrd_get_error()); \ + rrd_clear_error(); + + string_arr string_arr_new( +@@ -56,8 +56,8 @@ + break; + default: + rb_raise(rb_eTypeError, +- "invalid argument - %s, expected T_STRING or T_FIXNUM on index %ld", +- (long)rb_class2name(CLASS_OF(v)), i); ++ "invalid argument - %s, expected T_STRING or T_FIXNUM on index %d", ++ rb_class2name(CLASS_OF(v)), i); + break; + } + } --- rrdtool-1.4.7.orig/debian/patches/series +++ rrdtool-1.4.7/debian/patches/series @@ -0,0 +1,9 @@ +bts428778-floating-point-exception +setup.py-module-name +no-rpath-for-ruby +no-rpath-for-perl +implicit-decl-fix +bts530814-hurd +tcl-8.5 +ruby_bindings_format_string.patch +bts664724-rrdcached-j-segfault