lp:~blkperl/ubuntu/raring/collectd/merge-from-debian

AUTHORS (+28/-0)
ChangeLog (+414/-0)
Makefile.in (+14/-2)
README (+56/-3)
aclocal.m4 (+4/-4)
bindings/Makefile.in (+9/-0)
bindings/java/Makefile.in (+9/-0)
bindings/java/org/collectd/api/CollectdFlushInterface.java (+1/-1)
bindings/java/org/collectd/api/ValueList.java (+6/-0)
bindings/java/org/collectd/java/GenericJMXConfConnection.java (+10/-2)
bindings/java/org/collectd/java/GenericJMXConfMBean.java (+20/-26)
bindings/java/org/collectd/java/GenericJMXConfValue.java (+8/-1)
bindings/perl/lib/Collectd.pm (+0/-29)
compile (+0/-143)
config.guess (+0/-1502)
config.sub (+0/-1714)
configure (+2604/-666)
configure.in (+672/-129)
contrib/aix/collectd.spec (+75/-0)
contrib/aix/init.d-collectd (+79/-0)
contrib/collectd_unixsock.py (+12/-10)
contrib/collection3/bin/graph.cgi (+297/-179)
contrib/collection3/bin/index.cgi (+112/-25)
contrib/collection3/etc/collection.conf (+10/-0)
contrib/collection3/lib/Collectd/Graph/Common.pm (+132/-33)
contrib/collection3/lib/Collectd/Graph/TypeLoader.pm (+2/-1)
contrib/exec-ksm.sh (+53/-0)
contrib/exec-munin.px (+8/-4)
contrib/exec-nagios.conf (+2/-0)
contrib/exec-nagios.px (+138/-18)
contrib/exec-smartctl (+6/-8)
contrib/migrate-4-5.px (+241/-0)
contrib/php-collection/definitions.php (+10/-10)
contrib/redhat/collectd.spec (+15/-4)
contrib/redhat/init.d-collectd (+4/-3)
debian/NEWS.Debian (+32/-0)
debian/README.Debian (+42/-0)
debian/changelog (+271/-0)
debian/collectd-core.collectd.init.d (+89/-60)
debian/collectd-core.config (+12/-0)
debian/collectd-core.install (+1/-0)
debian/collectd-core.overrides (+2/-2)
debian/collectd-core.postinst (+9/-0)
debian/collectd-core.postrm (+7/-2)
debian/collectd-core.templates (+40/-0)
debian/collectd-utils.install (+2/-0)
debian/collectd.conf (+90/-3)
debian/control (+21/-11)
debian/copyright (+114/-16)
debian/filters.conf (+2/-0)
debian/libcollectdclient0.symbols (+1/-0)
debian/patches/00list (+2/-9)
debian/patches/CVE-2010-4336.dpatch (+0/-18)
debian/patches/bts559801_plugin_find_fix.dpatch (+17/-1)
debian/patches/bts592623-curl_json-file.dpatch (+0/-22)
debian/patches/bts595756-notify_email-segfault.dpatch (+0/-140)
debian/patches/bts596128-reheap-fix.dpatch (+0/-46)
debian/patches/fix-detection-libiptc-1.4.10.dpatch (+0/-40)
debian/patches/gcc-4.6-fixes.dpatch (+0/-299)
debian/patches/iproute_porting.dpatch (+0/-30)
debian/patches/libperl-linkage.dpatch (+187962/-96)
debian/patches/migrate-4-5-df.dpatch (+66/-0)
debian/patches/notify-desktop.dpatch (+0/-20)
debian/patches/rtnl_dump_filter.dpatch (+30/-0)
debian/patches/yajl2_porting.dpatch (+0/-59)
debian/po/cs.po (+74/-5)
debian/po/da.po (+142/-0)
debian/po/de.po (+77/-7)
debian/po/es.po (+88/-14)
debian/po/fr.po (+89/-15)
debian/po/gl.po (+81/-8)
debian/po/it.po (+150/-0)
debian/po/ja.po (+71/-4)
debian/po/nl.po (+86/-11)
debian/po/pl.po (+147/-0)
debian/po/pt.po (+80/-11)
debian/po/pt_BR.po (+149/-0)
debian/po/ru.po (+80/-10)
debian/po/sk.po (+112/-0)
debian/po/sv.po (+82/-11)
debian/po/templates.pot (+63/-5)
debian/po/vi.po (+71/-4)
debian/rules (+33/-18)
debian/source/format (+1/-0)
debian/thresholds.conf (+3/-7)
depcomp (+0/-630)
install-sh (+0/-520)
libltdl/config/ylwrap (+222/-0)
ltmain.sh (+0/-8413)
missing (+0/-376)
src/Makefile.am (+132/-12)
src/Makefile.in (+919/-601)
src/amqp.c (+993/-0)
src/apache.c (+19/-49)
src/ascent.c (+1/-0)
src/bind.c (+40/-28)
src/collectd-email.5 (+1/-1)
src/collectd-exec.5 (+7/-1)
src/collectd-exec.pod (+8/-0)
src/collectd-java.5 (+8/-1)
src/collectd-java.pod (+8/-0)
src/collectd-nagios.1 (+6/-1)
src/collectd-nagios.c (+138/-36)
src/collectd-nagios.pod (+6/-0)
src/collectd-perl.5 (+13/-25)
src/collectd-perl.pod (+11/-25)
src/collectd-python.5 (+3/-7)
src/collectd-python.pod (+12/-8)
src/collectd-snmp.5 (+1/-1)
src/collectd-threshold.5 (+320/-0)
src/collectd-threshold.pod (+201/-0)
src/collectd-unixsock.5 (+1/-1)
src/collectd.1 (+1/-1)
src/collectd.c (+36/-40)
src/collectd.conf.5 (+605/-126)
src/collectd.conf.in (+170/-14)
src/collectd.conf.pod (+666/-120)
src/collectd.h (+12/-22)
src/collectdctl.1 (+255/-0)
src/collectdctl.c (+608/-0)
src/collectdctl.pod (+160/-0)
src/collectdmon.1 (+1/-1)
src/common.c (+157/-17)
src/common.h (+9/-4)
src/config.h.in (+110/-8)
src/configfile.c (+166/-28)
src/configfile.h (+21/-5)
src/conntrack.c (+17/-10)
src/contextswitch.c (+35/-1)
src/cpu.c (+25/-25)
src/cpython.h (+1/-1)
src/csv.c (+7/-4)
src/curl.c (+1/-2)
src/curl_json.c (+185/-164)
src/curl_xml.c (+3/-1)
src/dbi.c (+2/-2)
src/df.c (+45/-71)
src/disk.c (+39/-41)
src/dns.c (+25/-35)
src/ethstat.c (+336/-0)
src/exec.c (+56/-54)
src/filter_chain.c (+14/-1)
src/fscache.c (+7/-12)
src/gmond.c (+19/-21)
src/hddtemp.c (+4/-225)
src/interface.c (+27/-14)
src/ipmi.c (+6/-5)
src/iptables.c (+14/-23)
src/ipvs.c (+8/-10)
src/irq.c (+84/-99)
src/java.c (+27/-14)
src/libcollectdclient/Makefile.in (+9/-0)
src/libcollectdclient/client.c (+69/-20)
src/libcollectdclient/client.h (+4/-1)
src/libcollectdclient/lcc_features.h (+4/-4)
src/liboconfig/Makefile.in (+10/-1)
src/libvirt.c (+219/-179)
src/logfile.c (+8/-21)
src/lpar.c (+273/-0)
src/madwifi.c (+13/-13)
src/match_empty_counter.c (+0/-2)
src/match_timediff.c (+6/-22)
src/match_value.c (+9/-0)
src/md.c (+218/-0)
src/memcachec.c (+0/-1)
src/memcached.c (+24/-25)
src/memory.c (+52/-3)
src/meta_data.c (+38/-1)
src/meta_data.h (+2/-1)
src/modbus.c (+156/-30)
src/mysql.c (+136/-270)
src/netapp.c (+119/-116)
src/netlink.c (+7/-7)
src/network.c (+159/-76)
src/network.h (+2/-0)
src/nfs.c (+163/-138)
src/nginx.c (+13/-11)
src/notify_desktop.c (+10/-1)
src/notify_email.c (+46/-10)
src/ntpd.c (+10/-9)
src/numa.c (+168/-0)
src/onewire.c (+8/-9)
src/openvpn.c (+16/-16)
src/oracle.c (+54/-32)
src/owniptc/Makefile.am (+0/-14)
src/owniptc/Makefile.in (+0/-572)
src/owniptc/README.collectd (+0/-25)
src/owniptc/ipt_kernel_headers.h (+0/-45)
src/owniptc/libip4tc.c (+0/-517)
src/owniptc/libip6tc.c (+0/-456)
src/owniptc/libip6tc.h (+0/-175)
src/owniptc/libiptc.c (+0/-2716)
src/owniptc/libiptc.h (+0/-187)
src/owniptc/libxtc.h (+0/-53)
src/owniptc/linux_list.h (+0/-741)
src/owniptc/xtables.h (+0/-239)
src/perl.c (+100/-60)
src/pinba.c (+1/-1)
src/plugin.c (+213/-50)
src/plugin.h (+26/-10)
src/postgresql.c (+17/-53)
src/powerdns.c (+10/-6)
src/processes.c (+219/-167)
src/protocols.c (+5/-9)
src/python.c (+31/-21)
src/pyvalues.c (+59/-39)
src/redis.c (+311/-0)
src/routeros.c (+14/-14)
src/rrdcached.c (+129/-59)
src/rrdtool.c (+89/-59)
src/sensors.c (+43/-41)
src/serial.c (+5/-5)
src/snmp.c (+50/-48)
src/swap.c (+412/-126)
src/syslog.c (+79/-21)
src/tape.c (+3/-3)
src/target_notification.c (+1/-1)
src/target_scale.c (+97/-11)
src/target_v5upgrade.c (+472/-0)
src/tcpconns.c (+118/-5)
src/teamspeak2.c (+15/-8)
src/ted.c (+0/-1)
src/thermal.c (+27/-42)
src/threshold.c (+1030/-0)
src/types.db (+117/-100)
src/types.db.5 (+1/-1)
src/types_list.c (+4/-0)
src/unixsock.c (+28/-7)
src/utils_avltree.c (+11/-0)
src/utils_avltree.h (+15/-0)
src/utils_cache.c (+122/-241)
src/utils_cache.h (+1/-1)
src/utils_cmd_flush.c (+10/-6)
src/utils_cmd_getthreshold.c (+0/-178)
src/utils_cmd_getthreshold.h (+0/-31)
src/utils_cmd_listval.c (+3/-2)
src/utils_cmd_putval.c (+32/-4)
src/utils_cmd_putval.h (+5/-0)
src/utils_db_query.c (+4/-244)
src/utils_db_query.h (+2/-2)
src/utils_dns.c (+45/-23)
src/utils_dns.h (+2/-0)
src/utils_format_json.c (+2/-2)
src/utils_heap.c (+6/-3)
src/utils_match.c (+5/-5)
src/utils_match.h (+4/-4)
src/utils_rrdcreate.c (+22/-8)
src/utils_rrdcreate.h (+1/-1)
src/utils_tail.c (+9/-0)
src/utils_threshold.c (+0/-1054)
src/utils_threshold.h (+0/-87)
src/utils_time.c (+64/-0)
src/utils_time.h (+70/-0)
src/varnish.c (+661/-0)
src/vmem.c (+20/-20)
src/vserver.c (+17/-10)
src/write_graphite.c (+695/-0)
src/write_http.c (+21/-86)
src/write_mongodb.c (+328/-0)
src/write_redis.c (+238/-0)
src/zfs_arc.c (+100/-82)
version-gen.sh (+3/-3)
ylwrap (+0/-222)

debian/changelog (+100/-0)
debian/control (+4/-4)
debian/patches/00list (+1/-0)
debian/patches/libperl-linkage.dpatch (+188180/-0)
debian/patches/migrate-4-5-df.dpatch (+0/-66)
debian/rules (+3/-1)