From a5525d21600e0d3354eef378f9a5113c9c08d079 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sun, 29 Oct 2006 11:24:39 -0700 Subject: [PATCH] Imported Debian patch 2.5.1p1-2 --- client-src/clientconf.c | 2 +- debian/changelog | 9 +++++++++ debian/po/ar.po | 2 +- debian/po/cs.po | 2 +- debian/po/da.po | 2 +- debian/po/de.po | 10 ++++------ debian/po/es.po | 2 +- debian/po/fr.po | 2 +- debian/po/it.po | 2 +- debian/po/ja.po | 2 +- debian/po/nl.po | 2 +- debian/po/pt.po | 2 +- debian/po/pt_BR.po | 2 +- debian/po/ru.po | 2 +- debian/po/sv.po | 2 +- debian/po/templates.pot | 2 +- debian/po/vi.po | 2 +- 17 files changed, 28 insertions(+), 21 deletions(-) diff --git a/client-src/clientconf.c b/client-src/clientconf.c index e2a2246..51f28eb 100644 --- a/client-src/clientconf.c +++ b/client-src/clientconf.c @@ -295,7 +295,7 @@ init_defaults(void) #else conf_init_string(&client_conf[CLN_GNUTAR_LIST_DIR], NULL); #endif - conf_init_string(&client_conf[CLN_AMANDATES], "/etc/amandates"); + conf_init_string(&client_conf[CLN_AMANDATES], AMANDATES_FILE); /* defaults for internal variables */ conf_line_num = got_parserror = 0; diff --git a/debian/changelog b/debian/changelog index 073e4f6..0bed6fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +amanda (1:2.5.1p1-2) unstable; urgency=medium + + * fix broken way of setting default CLN_AMANDATES in client-src/clientconf.c + so that the file ends up where we expect it, closes: #394796 + * make this medium priority because of the amandates location problem + * updated German translation, closes: #396029 + + -- Bdale Garbee Sun, 29 Oct 2006 11:24:39 -0700 + amanda (1:2.5.1p1-1) unstable; urgency=low * new upstream version, closes: #395319 diff --git a/debian/po/ar.po b/debian/po/ar.po index 4af15e3..29bd18f 100644 --- a/debian/po/ar.po +++ b/debian/po/ar.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda_1:2.4.5-1\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: 2005-07-19 18:48+0300\n" "Last-Translator: Ossama M. Khayat \n" "Language-Team: Arabic \n" diff --git a/debian/po/cs.po b/debian/po/cs.po index d7ccaaf..55faeba 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: 2006-06-04 17:06+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" diff --git a/debian/po/da.po b/debian/po/da.po index 25e9eca..ffc6e5e 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/de.po b/debian/po/de.po index a8ea00d..875512d 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -11,15 +11,14 @@ # # Developers do not need to manually edit POT or PO files. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" "POT-Creation-Date: 2006-10-26 16:19-0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"PO-Revision-Date: 2006-10-29 15:05+0100\n" +"Last-Translator: Helge Kreutzmann \n" +"Language-Team: de \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-15\n" "Content-Transfer-Encoding: 8bit\n" @@ -27,10 +26,9 @@ msgstr "" #. Type: error #. Description #: ../templates:1001 -#, fuzzy msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates" msgstr "" -"Bitte fügen Sie /var/lib/amandates und /var/lib/amanda/amandates zusammen." +"Bitte vereinigen Sie /var/lib/amandates und /var/lib/amanda/amandates." #. Type: error #. Description diff --git a/debian/po/es.po b/debian/po/es.po index 9d8acb2..07be95e 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/fr.po b/debian/po/fr.po index fbbb1ff..dde32c7 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: 2006-05-28 17:13+0200\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" diff --git a/debian/po/it.po b/debian/po/it.po index 504e301..8ea5d02 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 1:2.5.0p2 italian debconf templates\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: 2006-05-30 10:30+0200\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" diff --git a/debian/po/ja.po b/debian/po/ja.po index 44d58f8..4f56aea 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 2.5.0p2-2.1\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: 2006-10-11 00:08+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" diff --git a/debian/po/nl.po b/debian/po/nl.po index 4825ff4..07a25f9 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 1:2.5.0p2-1\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: 2006-06-18 20:45+0100\n" "Last-Translator: Kurt De Bree \n" "Language-Team: Debian l10n Dutch \n" diff --git a/debian/po/pt.po b/debian/po/pt.po index b72124e..5145168 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda_1%3A2.4.4p1-1_pt\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: 2003-10-18 13:47+0100\n" "Last-Translator: Bruno Rodrigues \n" "Language-Team: Portuguese \n" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 8687089..84a00bb 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/ru.po b/debian/po/ru.po index 83094d4..07c579d 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/sv.po b/debian/po/sv.po index a8b1dcf..c4165df 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 1:2.5.0p2-1\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: 2006-06-27 23:05+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index b3985bf..d2f6df8 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: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/vi.po b/debian/po/vi.po index 671e86d..cf8576d 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: amanda 1/2.4.4p3-2\n" "Report-Msgid-Bugs-To: bdale@gag.com\n" -"POT-Creation-Date: 2006-10-26 16:19-0600\n" +"POT-Creation-Date: 2006-10-29 11:41-0700\n" "PO-Revision-Date: 2005-05-05 13:29+0930\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" -- 2.30.2