From 12f6f4493471f9a393dd7dd273da4117c0fd6de8 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sun, 13 Dec 2009 21:01:47 +0100 Subject: [PATCH] Split the "collectd" binary package into "collectd-core" and "collectd". The former provides the main program file and the plugins while the latter provides the configuration. This allows for much more flexible setups (e.g. providing customizations on top of "collectd-core" without modifying the "collectd" package) and, amongst others, removes the hard dependency on librrd. Closes: #495936, #544311 --- debian/bin/gen_plugin_deps.pl | 2 +- debian/changelog | 11 ++++ ...default => collectd-core.collectd.default} | 0 ...d.init.d => collectd-core.collectd.init.d} | 0 .../{collectd.config => collectd-core.config} | 0 debian/collectd-core.install | 19 +++++++ debian/collectd-core.overrides | 13 +++++ ...llectd.postinst => collectd-core.postinst} | 0 .../{collectd.postrm => collectd-core.postrm} | 0 ...ectd.templates => collectd-core.templates} | 8 +-- debian/collectd.install | 19 ------- debian/collectd.overrides | 13 ----- debian/control | 41 +++++++++++---- debian/po/POTFILES.in | 2 +- debian/po/cs.po | 33 ++++++------ debian/po/de.po | 28 +++++----- debian/po/es.po | 51 ++++++++++++------- debian/po/fr.po | 36 +++++++------ debian/po/gl.po | 24 ++++----- debian/po/ja.po | 38 +++++++------- debian/po/nl.po | 51 ++++++++++++------- debian/po/pt.po | 26 +++++----- debian/po/ru.po | 34 ++++++------- debian/po/sv.po | 22 ++++---- debian/po/templates.pot | 18 +++---- debian/po/vi.po | 32 ++++++------ debian/rules | 25 +++++---- 27 files changed, 306 insertions(+), 240 deletions(-) rename debian/{collectd.default => collectd-core.collectd.default} (100%) rename debian/{collectd.init.d => collectd-core.collectd.init.d} (100%) rename debian/{collectd.config => collectd-core.config} (100%) create mode 100644 debian/collectd-core.install create mode 100644 debian/collectd-core.overrides rename debian/{collectd.postinst => collectd-core.postinst} (100%) rename debian/{collectd.postrm => collectd-core.postrm} (100%) rename debian/{collectd.templates => collectd-core.templates} (76%) delete mode 100644 debian/collectd.overrides diff --git a/debian/bin/gen_plugin_deps.pl b/debian/bin/gen_plugin_deps.pl index bda5c85..a4c73a0 100755 --- a/debian/bin/gen_plugin_deps.pl +++ b/debian/bin/gen_plugin_deps.pl @@ -59,7 +59,7 @@ sub print_plugin_deps my $pdir = undef; my $i = 0; - my $plugindir = "debian/collectd/usr/lib/collectd/"; + my $plugindir = "debian/collectd-core/usr/lib/collectd/"; if (! opendir($pdir, $plugindir)) { print STDERR "Could not open directory '$plugindir': $!\n"; diff --git a/debian/changelog b/debian/changelog index 2fd4c28..107656d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +collectd (4.8.1-3) unstable; urgency=low + + * Split the "collectd" binary package into "collectd-core" and "collectd". + The former provides the main program file and the plugins while the latter + provides the configuration. This allows for much more flexible setups + (e.g. providing customizations on top of "collectd-core" without modifying + the "collectd" package) and, amongst others, removes the hard dependency + on librrd (Closes: #495936, #544311). + + -- Sebastian Harl Sun, 13 Dec 2009 20:54:52 +0100 + collectd (4.8.1-2) unstable; urgency=low * debian/rules: diff --git a/debian/collectd.default b/debian/collectd-core.collectd.default similarity index 100% rename from debian/collectd.default rename to debian/collectd-core.collectd.default diff --git a/debian/collectd.init.d b/debian/collectd-core.collectd.init.d similarity index 100% rename from debian/collectd.init.d rename to debian/collectd-core.collectd.init.d diff --git a/debian/collectd.config b/debian/collectd-core.config similarity index 100% rename from debian/collectd.config rename to debian/collectd-core.config diff --git a/debian/collectd-core.install b/debian/collectd-core.install new file mode 100644 index 0000000..1ea08c9 --- /dev/null +++ b/debian/collectd-core.install @@ -0,0 +1,19 @@ +../../contrib/migrate-3-4.px usr/lib/collectd/utils +../../contrib/rrd_filter.px usr/lib/collectd/utils +usr/lib/collectd/*.so +usr/sbin +usr/share/collectd +usr/share/man/man1/collectdmon.1 +usr/share/man/man1/collectd.1 +usr/share/man/man3/Collectd::Unixsock.3pm +usr/share/man/man5/collectd-unixsock.5 +usr/share/man/man5/collectd-email.5 +usr/share/man/man5/collectd-exec.5 +usr/share/man/man5/collectd-java.5 +usr/share/man/man5/collectd.conf.5 +usr/share/man/man5/collectd-snmp.5 +usr/share/man/man5/collectd-perl.5 +usr/share/man/man5/types.db.5 +usr/share/perl5 +var + diff --git a/debian/collectd-core.overrides b/debian/collectd-core.overrides new file mode 100644 index 0000000..519ce29 --- /dev/null +++ b/debian/collectd-core.overrides @@ -0,0 +1,13 @@ +# This is only done on architectures that support it. +collectd-core: shlib-with-non-pic-code usr/lib/collectd/netlink.so + +# All plugin names are spelled in lower-case. +collectd-core: spelling-error-in-description apache Apache +collectd-core: spelling-error-in-description mysql MySQL +collectd-core: spelling-error-in-description postgresql PostgreSQL + +# The "java" plugin uses libjvm.so which can only be found in a non-standard +# directory. According to the Java guys the path name and the ABI is stable +# though ... +collectd-core: binary-or-shlib-defines-rpath ./usr/lib/collectd/java.so /usr/lib/jvm/java-6-openjdk/jre/lib/* + diff --git a/debian/collectd.postinst b/debian/collectd-core.postinst similarity index 100% rename from debian/collectd.postinst rename to debian/collectd-core.postinst diff --git a/debian/collectd.postrm b/debian/collectd-core.postrm similarity index 100% rename from debian/collectd.postrm rename to debian/collectd-core.postrm diff --git a/debian/collectd.templates b/debian/collectd-core.templates similarity index 76% rename from debian/collectd.templates rename to debian/collectd-core.templates index 88815d6..089e18f 100644 --- a/debian/collectd.templates +++ b/debian/collectd-core.templates @@ -3,12 +3,12 @@ Type: note _Description: Layout of RRD files has changed The layout of the RRD files created by collectd has changed significantly since version 3.x. In order to keep your old data you have to migrate it. - This can be done by using /usr/lib/collectd/utils/migrate-3-4.px. + This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px. . This step requires both the perl and the rrdtool packages to be installed, which is currently not the case. You need to perform the migration manually. . - See /usr/share/doc/collectd/NEWS.Debian for details. + See /usr/share/doc/collectd-core/NEWS.Debian for details. Template: collectd/auto-migrate-3-4 Type: boolean @@ -16,11 +16,11 @@ Default: false _Description: Automatically try to migrate your RRD files? The layout of the RRD files created by collectd has changed significantly since version 3.x. In order to keep your old data you have to migrate it. - This can be done by using /usr/lib/collectd/utils/migrate-3-4.px. + This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px. . This step can be done automatically. In this case a backup of /var/lib/collectd/ is made in /var/backups/. This script is still experimental, though. Do not expect it to work in all cases. . - See /usr/share/doc/collectd/NEWS.Debian for details. + See /usr/share/doc/collectd-core/NEWS.Debian for details. diff --git a/debian/collectd.install b/debian/collectd.install index 877c815..9b9d239 100644 --- a/debian/collectd.install +++ b/debian/collectd.install @@ -1,21 +1,2 @@ -../../contrib/migrate-3-4.px usr/lib/collectd/utils -../../contrib/rrd_filter.px usr/lib/collectd/utils ../collectd.conf ../collection.conf etc/collectd/ ../thresholds.conf ../filters.conf etc/collectd/ -usr/lib/collectd/*.so -usr/sbin -usr/share/collectd -usr/share/man/man1/collectdmon.1 -usr/share/man/man1/collectd.1 -usr/share/man/man3/Collectd::Unixsock.3pm -usr/share/man/man5/collectd-unixsock.5 -usr/share/man/man5/collectd-email.5 -usr/share/man/man5/collectd-exec.5 -usr/share/man/man5/collectd-java.5 -usr/share/man/man5/collectd.conf.5 -usr/share/man/man5/collectd-snmp.5 -usr/share/man/man5/collectd-perl.5 -usr/share/man/man5/types.db.5 -usr/share/perl5 -var - diff --git a/debian/collectd.overrides b/debian/collectd.overrides deleted file mode 100644 index 2267504..0000000 --- a/debian/collectd.overrides +++ /dev/null @@ -1,13 +0,0 @@ -# This is only done on architectures that support it. -collectd: shlib-with-non-pic-code usr/lib/collectd/netlink.so - -# All plugin names are spelled in lower-case. -collectd: spelling-error-in-description apache Apache -collectd: spelling-error-in-description mysql MySQL -collectd: spelling-error-in-description postgresql PostgreSQL - -# The "java" plugin uses libjvm.so which can only be found in a non-standard -# directory. According to the Java guys the path name and the ABI is stable -# though ... -collectd: binary-or-shlib-defines-rpath ./usr/lib/collectd/java.so /usr/lib/jvm/java-6-openjdk/jre/lib/* - diff --git a/debian/control b/debian/control index 3088c45..e6ae753 100644 --- a/debian/control +++ b/debian/control @@ -9,19 +9,20 @@ Homepage: http://collectd.org/ Vcs-Git: git://git.tokkee.org/pkg-collectd.git Vcs-Browser: http://git.tokkee.org/?p=pkg-collectd.git -Package: collectd +Package: collectd-core Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: perl, rrdtool, lm-sensors, ${shlibs:Recommends} +Recommends: perl, rrdtool, lm-sensors Suggests: collectd-dev, librrds-perl, liburi-perl, libhtml-parser-perl, - libregexp-common-perl, libconfig-general-perl, httpd-cgi, hddtemp, mbmon + libregexp-common-perl, libconfig-general-perl, httpd-cgi, hddtemp, mbmon, + ${shlibs:Suggests} Conflicts: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql, collectd-perl, collectd-ping, collectd-sensors Provides: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql, collectd-perl, collectd-ping, collectd-sensors Replaces: collectd-apache, collectd-dns, collectd-hddtemp, collectd-mysql, - collectd-perl, collectd-ping, collectd-sensors -Description: statistics collection and monitoring daemon + collectd-perl, collectd-ping, collectd-sensors, collectd (<< 4.8.1-2~) +Description: statistics collection and monitoring daemon (core system) collectd is a small daemon which collects system information periodically and provides mechanisms to monitor and store the values in a variety of ways. Since the daemon doesn't need to startup every time it wants to update the @@ -31,9 +32,12 @@ Description: statistics collection and monitoring daemon The collected information can be used to find current performance bottlenecks (performance analysis) and predict future system load (capacity planning). . - This package contains the main program file and the following plugins (some + This package contains the main program file and the plugins listed below (some of those plugins require additional libraries - for more details see - /usr/share/doc/collectd/README.Debian.plugins): + /usr/share/doc/collectd/README.Debian.plugins) but no configuration. For a + full installation (including configuration), see the "collectd" package. This + package allows sites to, e.g., provide customizations (like a custom default + configuration) on top of it without having to modify the "collectd" package. . * Apache and lighttpd statistics provided by mod_status: apache * APC UPS's charge, load, input/output/battery voltage, etc.: apcups @@ -111,6 +115,25 @@ Description: statistics collection and monitoring daemon * wireless network stats: wireless * send collected values to a web-server: write_http +Package: collectd +Architecture: any +Depends: collectd-core, ${misc:Depends} +Recommends: ${shlibs:Recommends} +Description: statistics collection and monitoring daemon + collectd is a small daemon which collects system information periodically and + provides mechanisms to monitor and store the values in a variety of ways. + Since the daemon doesn't need to startup every time it wants to update the + values it's very fast and easy on the system. Also, the statistics are very + fine grained since the files are updated every 10 seconds by default. + . + The collected information can be used to find current performance bottlenecks + (performance analysis) and predict future system load (capacity planning). + . + This package provides a full installation of the daemon, including the + configuration. For the core system, see the "collectd-core" package, which + allows sites to, e.g., provide customizations (like a custom default + configuration) on top of it without having to modify the "collectd" package. + Package: collectd-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -132,7 +155,7 @@ Package: collectd-dbg Section: debug Architecture: any Priority: extra -Depends: collectd (= ${binary:Version}), ${misc:Depends} +Depends: collectd-core (= ${binary:Version}), ${misc:Depends} Recommends: collectd-utils (= ${binary:Version}), libcollectdclient0 (= ${binary:Version}) Description: statistics collection and monitoring daemon (debugging symbols) @@ -146,7 +169,7 @@ Description: statistics collection and monitoring daemon (debugging symbols) Package: collectd-dev Architecture: all -Depends: collectd (>= ${source:Version}), collectd (<< 4.9~), ${misc:Depends} +Depends: collectd-core (>= ${source:Version}), collectd-core (<< 4.9~), ${misc:Depends} Description: statistics collection and monitoring daemon (development files) collectd is a small daemon which collects system information periodically and provides mechanisms to monitor and store the values in a variety of ways. diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in index f201e9d..22069f7 100644 --- a/debian/po/POTFILES.in +++ b/debian/po/POTFILES.in @@ -1,2 +1,2 @@ -[type: gettext/rfc822deb] collectd.templates +[type: gettext/rfc822deb] collectd-core.templates diff --git a/debian/po/cs.po b/debian/po/cs.po index ff7daba..6c0fc08 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd 4.6.3-1\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2009-06-22 16:07+0200\n" "Last-Translator: Martin Sin \n" "Language-Team: Czech \n" @@ -16,7 +16,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "Uspořádání souborů RRD se změnilo" @@ -24,19 +24,19 @@ msgstr "Uspořádání souborů RRD se změnilo" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "" "The layout of the RRD files created by collectd has changed significantly " "since version 3.x. In order to keep your old data you have to migrate it. " -"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." msgstr "" -"Ve struktuře souborů RRD vytvořených collectd počínaje verzí 3.x došlo " -"k výrazné změně. Pro uchování vašich dat je nutná jejich migrace. " -"Tu můžete provést pomocí /usr/lib/collectd/utils/migrate-3-4.px." +"Ve struktuře souborů RRD vytvořených collectd počínaje verzí 3.x došlo k " +"výrazné změně. Pro uchování vašich dat je nutná jejich migrace. Tu můžete " +"provést pomocí /usr/lib/collectd-core/utils/migrate-3-4.px." #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "" "This step requires both the perl and the rrdtool packages to be installed, " "which is currently not the case. You need to perform the migration manually." @@ -48,24 +48,25 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." -msgstr "Pro více informací se podívejte na /usr/share/doc/collectd/NEWS.Debian." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." +msgstr "" +"Pro více informací se podívejte na /usr/share/doc/collectd-core/NEWS.Debian." #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "Pokusit se o automatickou migraci souborů RRD?" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "" "This step can be done automatically. In this case a backup of /var/lib/" "collectd/ is made in /var/backups/. This script is still experimental, " "though. Do not expect it to work in all cases." msgstr "" -"Tento krok je možno provést automaticky. Pokud se pro to rozhodnete, bude ve " -"/var/backups/ provedena záloha /var/lib/collectd. Tento skript je stále ve " -"stavu testování, takže nečekejte že bude ve všech případech zcela funkční." +"Tento krok je možno provést automaticky. Pokud se pro to rozhodnete, bude " +"ve /var/backups/ provedena záloha /var/lib/collectd. Tento skript je stále " +"ve stavu testování, takže nečekejte že bude ve všech případech zcela funkční." diff --git a/debian/po/de.po b/debian/po/de.po index 2b29580..ba79956 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd 4.3.0-1\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2008-03-12 23:33+0100\n" "Last-Translator: Kai Wasserbäch \n" "Language-Team: German \n" @@ -17,7 +17,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "Das Layout der RRD-Dateien hat sich geändert." @@ -25,20 +25,20 @@ msgstr "Das Layout der RRD-Dateien hat sich geändert." #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "" "The layout of the RRD files created by collectd has changed significantly " "since version 3.x. In order to keep your old data you have to migrate it. " -"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." msgstr "" "Das Layout der von collectd erstellten RRD-Dateien hat sich seit Version 3.x " "grundlegend geändert. Um Ihre alten Daten beizubehalten, müssen Sie diese " -"migrieren. Dies kann unter Verwendung von »/usr/lib/collectd/utils/migrate-3-" -"4.px« erreicht werden." +"migrieren. Dies kann unter Verwendung von »/usr/lib/collectd-core/utils/" +"migrate-3-4.px« erreicht werden." #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "" "This step requires both the perl and the rrdtool packages to be installed, " "which is currently not the case. You need to perform the migration manually." @@ -51,19 +51,19 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." -msgstr "Siehe »/usr/share/doc/collectd/NEWS.Debian« für Details." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." +msgstr "Siehe »/usr/share/doc/collectd-core/NEWS.Debian« für Details." #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "Soll eine automatische Migration Ihrer RRD-Dateien versucht werden?" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "" "This step can be done automatically. In this case a backup of /var/lib/" "collectd/ is made in /var/backups/. This script is still experimental, " @@ -71,5 +71,5 @@ msgid "" msgstr "" "Dieser Schritt kann automatisch ausgeführt werden. Sollten Sie sich hierfür " "entscheiden, wird eine Sicherungskopie von »/var/lib/collectd/« unter »/var/" -"backups/« erstellt. Dieses Skript ist aber noch experimentell. Erwarten " -"Sie nicht, dass es in allen Fällen problemlos funktioniert." +"backups/« erstellt. Dieses Skript ist aber noch experimentell. Erwarten Sie " +"nicht, dass es in allen Fällen problemlos funktioniert." diff --git a/debian/po/es.po b/debian/po/es.po index 9a0ec03..4937fd0 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -31,7 +31,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd 4.4.2-3\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2009-03-21 23:09+0100\n" "Last-Translator: Francisco Javier Cuadrado \n" "Language-Team: Debian l10n Spanish \n" @@ -42,7 +42,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "Ha cambiado la distribución de los archivos RRD" @@ -50,35 +50,50 @@ msgstr "Ha cambiado la distribución de los archivos RRD" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 -#: ../collectd.templates:2001 -msgid "The layout of the RRD files created by collectd has changed significantly since version 3.x. In order to keep your old data you have to migrate it. This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." -msgstr "La distribución de los archivos RRD creados por collectd ha cambiado significativamente desde la versión 3.x. Los datos antiguos se deben migrar para que se puedan seguir utilizando. Puede hacer esto utilizando el programa «/usr/lib/collectd/utils/migrate-3-4.px». " +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "" +"The layout of the RRD files created by collectd has changed significantly " +"since version 3.x. In order to keep your old data you have to migrate it. " +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." +msgstr "" +"La distribución de los archivos RRD creados por collectd ha cambiado " +"significativamente desde la versión 3.x. Los datos antiguos se deben migrar " +"para que se puedan seguir utilizando. Puede hacer esto utilizando el " +"programa «/usr/lib/collectd-core/utils/migrate-3-4.px». " #. Type: note #. Description -#: ../collectd.templates:1001 -msgid "This step requires both the perl and the rrdtool packages to be installed, which is currently not the case. You need to perform the migration manually." -msgstr "Actualmente no tiene instalados los paquetes perl y rrdtool, que son necesarios para poder llevar a cabo este paso. Tendrá que realizar la migración manualmente." +#: ../collectd-core.templates:1001 +msgid "" +"This step requires both the perl and the rrdtool packages to be installed, " +"which is currently not the case. You need to perform the migration manually." +msgstr "" +"Actualmente no tiene instalados los paquetes perl y rrdtool, que son " +"necesarios para poder llevar a cabo este paso. Tendrá que realizar la " +"migración manualmente." #. Type: note #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 -#: ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." -msgstr "Vea el archivo «/usr/share/doc/collectd/NEWS.Debian» para más detalles." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." +msgstr "Vea el archivo «/usr/share/doc/collectd-core/NEWS.Debian» para más detalles." #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "¿Desea migrar automáticamente los archivos RRD?" #. Type: boolean #. Description -#: ../collectd.templates:2001 -msgid "This step can be done automatically. In this case a backup of /var/lib/collectd/ is made in /var/backups/. This script is still experimental, though. Do not expect it to work in all cases." -msgstr "Este paso se puede realizar automáticamente. En este caso se genera una copia de seguridad de «/var/lib/collectd/» en «/var/backups/». El script que hace esto es aún experimental. No se espera que funcione en todos los casos." - +#: ../collectd-core.templates:2001 +msgid "" +"This step can be done automatically. In this case a backup of /var/lib/" +"collectd/ is made in /var/backups/. This script is still experimental, " +"though. Do not expect it to work in all cases." +msgstr "" +"Este paso se puede realizar automáticamente. En este caso se genera una " +"copia de seguridad de «/var/lib/collectd/» en «/var/backups/». El script que " +"hace esto es aún experimental. No se espera que funcione en todos los casos." diff --git a/debian/po/fr.po b/debian/po/fr.po index a3738d9..852868d 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2008-03-14 01:00+0100\n" "Last-Translator: Florent USSEIL \n" "Language-Team: French \n" @@ -18,7 +18,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "Changement du format des fichiers RRD" @@ -26,21 +26,20 @@ msgstr "Changement du format des fichiers RRD" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "" "The layout of the RRD files created by collectd has changed significantly " "since version 3.x. In order to keep your old data you have to migrate it. " -"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." msgstr "" "Le format des fichiers RRD créés par collectd a changé de façon " -"significative depuis la version 3.x. Afin de conserver les " -"données, il est nécessaire de les convertir." -"Cette opération peut être réalisée avec la commande " -"« /usr/lib/collectd/utils/migrate-3-4.px »." +"significative depuis la version 3.x. Afin de conserver les données, il est " +"nécessaire de les convertir.Cette opération peut être réalisée avec la " +"commande « /usr/lib/collectd-core/utils/migrate-3-4.px »." #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "" "This step requires both the perl and the rrdtool packages to be installed, " "which is currently not the case. You need to perform the migration manually." @@ -52,28 +51,27 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." msgstr "" -"Veuillez lire le fichier /usr/share/doc/collectd/NEWS.Debian pour plus d'informations." +"Veuillez lire le fichier /usr/share/doc/collectd-core/NEWS.Debian pour plus " +"d'informations." #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "Faut-il tenter de convertir automatiquement les fichiers RRD ?" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "" "This step can be done automatically. In this case a backup of /var/lib/" "collectd/ is made in /var/backups/. This script is still experimental, " "though. Do not expect it to work in all cases." msgstr "" -"La conversion des fichiers RRD peut être effectuée automatiquement. Pour cela, " -"une sauvegarde de /var/lib/collectd/ aura lieu " -"dans /var/backups/. Veuillez noter que cette " -"conversion est expérimentale : il est recommandé de " +"La conversion des fichiers RRD peut être effectuée automatiquement. Pour " +"cela, une sauvegarde de /var/lib/collectd/ aura lieu dans /var/backups/. " +"Veuillez noter que cette conversion est expérimentale : il est recommandé de " "contrôler sa bonne exécution." - diff --git a/debian/po/gl.po b/debian/po/gl.po index 61c64cb..64cbced 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2008-05-24 11:24+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" @@ -16,7 +16,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "A organización dos ficheiros RRD cambiou" @@ -24,20 +24,20 @@ msgstr "A organización dos ficheiros RRD cambiou" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "" "The layout of the RRD files created by collectd has changed significantly " "since version 3.x. In order to keep your old data you have to migrate it. " -"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." msgstr "" "A organización dos ficheiros RRD creados por collectd cambiou " "significativamente desde a versión 3.x. Para conservar os seus datos antigos " -"ten que migralos. Pódese facer empregando /usr/lib/collectd/utils/migrate-3-" -"4.px." +"ten que migralos. Pódese facer empregando /usr/lib/collectd-core/utils/" +"migrate-3-4.px." #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "" "This step requires both the perl and the rrdtool packages to be installed, " "which is currently not the case. You need to perform the migration manually." @@ -49,19 +49,19 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." -msgstr "Consulte /usr/share/doc/collectd/NEWS.Debian para máis detalles." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." +msgstr "Consulte /usr/share/doc/collectd-core/NEWS.Debian para máis detalles." #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "¿Migrar automaticamente os ficheiros RRD?" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "" "This step can be done automatically. In this case a backup of /var/lib/" "collectd/ is made in /var/backups/. This script is still experimental, " diff --git a/debian/po/ja.po b/debian/po/ja.po index 075c2ea..20fe2fe 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd 4.7.2-1\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2009-10-06 17:32+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" @@ -15,7 +15,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "RRD ファイルの配置位置が変更されました" @@ -23,50 +23,50 @@ msgstr "RRD ファイルの配置位置が変更されました" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "" "The layout of the RRD files created by collectd has changed significantly " "since version 3.x. In order to keep your old data you have to migrate it. " -"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." msgstr "" "collectd によって作成された RRD ファイルの配置位置はバージョン 3.x から大きく" -"変わりました。移行を行うために古いデータを保存します。これは /usr/lib/collectd/utils/migrate-3-4.px " -"を使って行われます。" +"変わりました。移行を行うために古いデータを保存します。これは /usr/lib/" +"collectd-core/utils/migrate-3-4.px を使って行われます。" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "" "This step requires both the perl and the rrdtool packages to be installed, " "which is currently not the case. You need to perform the migration manually." msgstr "" -"この作業には perl パッケージと rrdtool パッケージの両方がインストールされている" -"必要がありますが、現在そうなっていないようです。手動で移行作業を実行する必要が" -"あります。" +"この作業には perl パッケージと rrdtool パッケージの両方がインストールされてい" +"る必要がありますが、現在そうなっていないようです。手動で移行作業を実行する必" +"要があります。" #. Type: note #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." -msgstr "詳細については /usr/share/doc/collectd/NEWS.Debian を参照してください。" +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." +msgstr "" +"詳細については /usr/share/doc/collectd-core/NEWS.Debian を参照してください。" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "RRD ファイルの自動変換を試みますか?" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "" "This step can be done automatically. In this case a backup of /var/lib/" "collectd/ is made in /var/backups/. This script is still experimental, " "though. Do not expect it to work in all cases." msgstr "" -"この作業は自動的に行われます。今回の場合 /var/lib/collectd/ のバックアップは " -"/var/backups/ に作成されます。しかし、このスクリプトはまだ実験的なものです。" -"あらゆる状況で動作するのは期待しないでください。" - +"この作業は自動的に行われます。今回の場合 /var/lib/collectd/ のバックアップ" +"は /var/backups/ に作成されます。しかし、このスクリプトはまだ実験的なもので" +"す。あらゆる状況で動作するのは期待しないでください。" diff --git a/debian/po/nl.po b/debian/po/nl.po index de5f4ad..cc88f2e 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd_4.4.2-2_nl\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2008-09-28 15:22+0100\n" "Last-Translator: Eric Spreen \n" "Language-Team: Dutch \n" @@ -16,7 +16,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "De lay-out van RRD-bestanden is gewijzigd." @@ -24,35 +24,50 @@ msgstr "De lay-out van RRD-bestanden is gewijzigd." #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 -#: ../collectd.templates:2001 -msgid "The layout of the RRD files created by collectd has changed significantly since version 3.x. In order to keep your old data you have to migrate it. This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." -msgstr "De lay-out van de RRD-bestanden, die zijn gemaakt door collectd, is sterk gewijzigd sinds versie 3.x. Om uw oude gegevens te behouden zult u deze moeten migreren. Dit kunt u doen door /usr/lib/collectd/utils/migrate-3-4.px te gebruiken." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "" +"The layout of the RRD files created by collectd has changed significantly " +"since version 3.x. In order to keep your old data you have to migrate it. " +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." +msgstr "" +"De lay-out van de RRD-bestanden, die zijn gemaakt door collectd, is sterk " +"gewijzigd sinds versie 3.x. Om uw oude gegevens te behouden zult u deze " +"moeten migreren. Dit kunt u doen door /usr/lib/collectd-core/utils/migrate-3" +"-4.px te gebruiken." #. Type: note #. Description -#: ../collectd.templates:1001 -msgid "This step requires both the perl and the rrdtool packages to be installed, which is currently not the case. You need to perform the migration manually." -msgstr "Deze stap vereist dat zowel de perl als de rrdtool pakketten worden geïnstalleerd, wat op dit moment niet het geval is. U zult de migratie handmatig moeten verrichten." +#: ../collectd-core.templates:1001 +msgid "" +"This step requires both the perl and the rrdtool packages to be installed, " +"which is currently not the case. You need to perform the migration manually." +msgstr "" +"Deze stap vereist dat zowel de perl als de rrdtool pakketten worden " +"geïnstalleerd, wat op dit moment niet het geval is. U zult de migratie " +"handmatig moeten verrichten." #. Type: note #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 -#: ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." -msgstr "Zie /usr/share/doc/collectd/NEWS.Debian voor meer informatie." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." +msgstr "Zie /usr/share/doc/collectd-core/NEWS.Debian voor meer informatie." #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "Proberen om uw RRD-bestanden automatisch te migreren?" #. Type: boolean #. Description -#: ../collectd.templates:2001 -msgid "This step can be done automatically. In this case a backup of /var/lib/collectd/ is made in /var/backups/. This script is still experimental, though. Do not expect it to work in all cases." -msgstr "Deze stap kan automatisch verricht worden. In dat geval wordt er in /var/backups/ een back-up gemaakt van /var/lib/collectd/. Dit script is echter nog experimenteel. Verwacht u niet dat het in alle gevallen werkt." - +#: ../collectd-core.templates:2001 +msgid "" +"This step can be done automatically. In this case a backup of /var/lib/" +"collectd/ is made in /var/backups/. This script is still experimental, " +"though. Do not expect it to work in all cases." +msgstr "" +"Deze stap kan automatisch verricht worden. In dat geval wordt er in /var/" +"backups/ een back-up gemaakt van /var/lib/collectd/. Dit script is echter " +"nog experimenteel. Verwacht u niet dat het in alle gevallen werkt." diff --git a/debian/po/pt.po b/debian/po/pt.po index 20fd808..3a8d6e5 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd 4.3.0-2\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2008-03-22 00:49+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -18,7 +18,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "A disposição dos ficheiros RRD foi alterada" @@ -26,44 +26,45 @@ msgstr "A disposição dos ficheiros RRD foi alterada" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "" "The layout of the RRD files created by collectd has changed significantly " "since version 3.x. In order to keep your old data you have to migrate it. " -"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." msgstr "" "A disposição dos ficheiros RRD criada pelo collectd foi alterada " "significativamente desde a versão 3.x. De forma a manter os seus dados " "antigos você terá que migrá-los. Isto pode ser feito usando /usr/lib/" -"collectd/utils/migrate-3-4.px." +"collectd-core/utils/migrate-3-4.px." #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "" "This step requires both the perl and the rrdtool packages to be installed, " "which is currently not the case. You need to perform the migration manually." msgstr "" "Este passo necessita que ambos os pacotes perl e rrdtool estejam instalados, " -"o que não é correntemente o caso. Você precisa executar manualmente a migração." +"o que não é correntemente o caso. Você precisa executar manualmente a " +"migração." #. Type: note #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." -msgstr "Veja /usr/share/doc/collectd/NEWS.Debian para mais detalhes." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." +msgstr "Veja /usr/share/doc/collectd-core/NEWS.Debian para mais detalhes." #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "Tentar migrar automaticamente os seus ficheiros RRD?" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "" "This step can be done automatically. In this case a backup of /var/lib/" "collectd/ is made in /var/backups/. This script is still experimental, " @@ -72,4 +73,3 @@ msgstr "" "Este passo pode ser feito automaticamente. Neste caso uma cópia de segurança " "de /var/lib/collectd/ é criada em /var/backups/. Este script ainda é " "experimental. Não espere que ele funcione em todos os casos." - diff --git a/debian/po/ru.po b/debian/po/ru.po index e6ee274..81e0370 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd 4.6.3-1\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2009-07-26 16:00+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -13,11 +13,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "Изменилось расположение файлов RRD" @@ -25,19 +26,19 @@ msgstr "Изменилось расположение файлов RRD" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "" "The layout of the RRD files created by collectd has changed significantly " "since version 3.x. In order to keep your old data you have to migrate it. " -"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." msgstr "" "Начиная с версий 3.x изменилось расположение файлов RRD, создаваемых " -"collectd. Чтобы сохранить старые данные, вы должны их переместить. " -"Это можно сделать с помощью /usr/lib/collectd/utils/migrate-3-4.px." +"collectd. Чтобы сохранить старые данные, вы должны их переместить. Это можно " +"сделать с помощью /usr/lib/collectd-core/utils/migrate-3-4.px." #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "" "This step requires both the perl and the rrdtool packages to be installed, " "which is currently not the case. You need to perform the migration manually." @@ -49,25 +50,24 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." -msgstr "Подробней см. /usr/share/doc/collectd/NEWS.Debian." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." +msgstr "Подробней см. /usr/share/doc/collectd-core/NEWS.Debian." #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "Попытаться выполнить перенос файлов RRD автоматически?" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "" "This step can be done automatically. In this case a backup of /var/lib/" "collectd/ is made in /var/backups/. This script is still experimental, " "though. Do not expect it to work in all cases." msgstr "" -"Этот шаг может быть выполнен автоматически. В этом случае создаётся резервная " -"копия /var/lib/collectd/ в /var/backups/. Учтите, что это пока экспериментальный " -"сценарий. Возможно, он не сработает в вашем случае." - +"Этот шаг может быть выполнен автоматически. В этом случае создаётся " +"резервная копия /var/lib/collectd/ в /var/backups/. Учтите, что это пока " +"экспериментальный сценарий. Возможно, он не сработает в вашем случае." diff --git a/debian/po/sv.po b/debian/po/sv.po index 8d478eb..0d37732 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2008-11-02 05:17+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: swedish \n" @@ -18,7 +18,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "Strukturen för RRD-filen har ändrats." @@ -26,19 +26,19 @@ msgstr "Strukturen för RRD-filen har ändrats." #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "" "The layout of the RRD files created by collectd has changed significantly " "since version 3.x. In order to keep your old data you have to migrate it. " -"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." msgstr "" "Strukturen för RRD-filen som collectd skapar har ändrats mycket sedan " "version 3.x. För att behålla dina gamla data måste dessa migreras, detta kan " -"göras genom att köra '/usr/lib/collectd/utils/migrate-3-4.px'." +"göras genom att köra '/usr/lib/collectd-core/utils/migrate-3-4.px'." #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "" "This step requires both the perl and the rrdtool packages to be installed, " "which is currently not the case. You need to perform the migration manually." @@ -50,20 +50,20 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." msgstr "" -"Läs även /usr/share/doc/collectd/NEWS.Debian för ytterligare information." +"Läs även /usr/share/doc/collectd-core/NEWS.Debian för ytterligare information." #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "Vill du försöka migrera RRD-filerna automatiskt?" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "" "This step can be done automatically. In this case a backup of /var/lib/" "collectd/ is made in /var/backups/. This script is still experimental, " diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 4273b61..7c6efbd 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "" @@ -26,16 +26,16 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "" "The layout of the RRD files created by collectd has changed significantly " "since version 3.x. In order to keep your old data you have to migrate it. " -"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "" "This step requires both the perl and the rrdtool packages to be installed, " "which is currently not the case. You need to perform the migration manually." @@ -45,19 +45,19 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." msgstr "" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "" "This step can be done automatically. In this case a backup of /var/lib/" "collectd/ is made in /var/backups/. This script is still experimental, " diff --git a/debian/po/vi.po b/debian/po/vi.po index ec11058..7db0c66 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: collectd 4.4.2-3\n" "Report-Msgid-Bugs-To: collectd@packages.debian.org\n" -"POT-Creation-Date: 2008-03-12 17:35+0100\n" +"POT-Creation-Date: 2009-12-13 16:24+0100\n" "PO-Revision-Date: 2009-02-18 15:36+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -18,7 +18,7 @@ msgstr "" #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "Layout of RRD files has changed" msgstr "Bố trí tập tin RRD đã thay đổi" @@ -26,19 +26,19 @@ msgstr "Bố trí tập tin RRD đã thay đổi" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 msgid "" "The layout of the RRD files created by collectd has changed significantly " "since version 3.x. In order to keep your old data you have to migrate it. " -"This can be done by using /usr/lib/collectd/utils/migrate-3-4.px." +"This can be done by using /usr/lib/collectd-core/utils/migrate-3-4.px." msgstr "" "Bố trí của tập tin RRD được collectd thu thập đã thay đổi nhiều kể từ phiên " -"bản 3.x. Muốn giữ lại dữ liệu cũ thì bạn cần phải nâng cấp, dùng « " -"/usr/lib/collectd/utils/migrate-3-4.px »." +"bản 3.x. Muốn giữ lại dữ liệu cũ thì bạn cần phải nâng cấp, dùng « /usr/lib/" +"collectd-core/utils/migrate-3-4.px »." #. Type: note #. Description -#: ../collectd.templates:1001 +#: ../collectd-core.templates:1001 msgid "" "This step requires both the perl and the rrdtool packages to be installed, " "which is currently not the case. You need to perform the migration manually." @@ -50,27 +50,25 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../collectd.templates:1001 ../collectd.templates:2001 -msgid "See /usr/share/doc/collectd/NEWS.Debian for details." +#: ../collectd-core.templates:1001 ../collectd-core.templates:2001 +msgid "See /usr/share/doc/collectd-core/NEWS.Debian for details." msgstr "" -"Xem tài liệu Tin Tức « /usr/share/doc/collectd/NEWS.Debian » để tìm chi " -"tiết." +"Xem tài liệu Tin Tức « /usr/share/doc/collectd-core/NEWS.Debian » để tìm chi tiết." #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "Automatically try to migrate your RRD files?" msgstr "Tự động thử nâng cấp các tập tin RRD của bạn ?" #. Type: boolean #. Description -#: ../collectd.templates:2001 +#: ../collectd-core.templates:2001 msgid "" "This step can be done automatically. In this case a backup of /var/lib/" "collectd/ is made in /var/backups/. This script is still experimental, " "though. Do not expect it to work in all cases." msgstr "" -"Bước này có thể được tự động làm. Trong trường hợp này, một bản sao của « " -"/var/lib/collectd/ » được tạo trong thư mục « /var/backups/ ». Tuy nhiên, " -"văn lệnh này vẫn còn dựa vào thí nghiệm. Không nên nhờ nó trong mọi trường " -"hợp." +"Bước này có thể được tự động làm. Trong trường hợp này, một bản sao của « /" +"var/lib/collectd/ » được tạo trong thư mục « /var/backups/ ». Tuy nhiên, văn " +"lệnh này vẫn còn dựa vào thí nghiệm. Không nên nhờ nó trong mọi trường hợp." diff --git a/debian/rules b/debian/rules index 3296096..1f902de 100755 --- a/debian/rules +++ b/debian/rules @@ -150,9 +150,9 @@ install-arch: build perl ./debian/bin/gen_plugin_deps.pl - mkdir -p debian/collectd/usr/share/lintian/overrides/ - cp debian/collectd.overrides \ - debian/collectd/usr/share/lintian/overrides/collectd + mkdir -p debian/collectd-core/usr/share/lintian/overrides/ + cp debian/collectd-core.overrides \ + debian/collectd-core/usr/share/lintian/overrides/collectd-core binary-indep: install-indep dh_testdir @@ -183,24 +183,29 @@ binary-arch: build install-arch contrib/collectd-network.py contrib/collectd-unixsock.py \ contrib/snmp-probe-host.px contrib/GenericJMX.conf # some upstream tarballs have been built inside a dirty working dir - ( cd debian/collectd/usr/share/doc/collectd/examples/collection3/ \ + ( cd debian/collectd-core/ \ + && cd usr/share/doc/collectd-core/examples/collection3/ \ && rm -f bin/foo bin/test_config.px etc/collection4.conf \ && rm -f lib/Collectd/Graph.pm lib/Collectd/Graph/Data.pm \ && rm -f lib/Collectd/Graph/File.pm lib/Collectd/Graph/Filter.pm \ && rm -f lib/Collectd/Graph/MetaData.pm ) dh_installdebconf -a - dh_installinit -a -- defaults 95 + dh_installinit -pcollectd-core --name=collectd -- defaults 95 dh_link -a dh_strip -a --dbg-package=collectd-dbg dh_compress -a -Xexamples/ dh_fixperms -a dh_makeshlibs -a dh_installdeb -a - dpkg-shlibdeps -Tdebian/collectd.substvars \ - -dDepends debian/collectd/usr/sbin/* \ - debian/collectd/usr/lib/collectd/rrdtool.so \ - -dRecommends debian/collectd/usr/lib/collectd/*.so - dh_shlibdeps -a -Ncollectd + dh_shlibdeps -a -Ncollectd-core -Ncollectd + dh_shlibdeps -pcollectd \ + -- -edebian/collectd-core/usr/lib/collectd/rrdtool.so + dpkg-shlibdeps -Tdebian/collectd-core.substvars \ + -dDepends debian/collectd-core/usr/sbin/* \ + -dSuggests debian/collectd-core/usr/lib/collectd/*.so + grep shlibs:Suggests debian/collectd-core.substvars \ + | sed -e 's/shlibs:Suggests/shlibs:Recommends/' \ + >> debian/collectd.substvars dh_gencontrol -a dh_md5sums -a dh_builddeb -a -- 2.30.2