Imported Debian patch 2.5.1p1-2

diff --git a/client-src/clientconf.c b/client-src/clientconf.c
index e2a22465ca4ca297c4805ce2add45601ad14d477..51f28ebb04f30a3a408ae77aeb4acae0e164389e 100644 (file)
--- 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 073e4f676ae54629d2ae0cea89bac6f75b2f02ad..0bed6fef93df675b65e5c5865c7a71aedd9a4f56 100644 (file)
--- 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 <bdale@gag.com>  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 4af15e333c9cc2fd8bebfd26c4ba56241a07fa33..29bd18ffbc6b8f29f9fceff56d912cd113486df3 100644 (file)
--- 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 <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <debian-l10n-arabic@lists.debian.org>\n"

diff --git a/debian/po/cs.po b/debian/po/cs.po
index d7ccaaf8c125f7501b2e1974e8759c1cfe27d772..55faeba36b9a6a26744672b252bdf03240be522c 100644 (file)
--- 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 <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"

diff --git a/debian/po/da.po b/debian/po/da.po
index 25e9eca319ff10f8fff8505c585a0026ebb0db09..ffc6e5e01c728a166afb6cf8fb2607baf09f7d1c 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/debian/po/de.po b/debian/po/de.po
index a8ea00dc15139fbf85aff807f9c7f72501545227..875512d076b1470a660a99c1be99c9978d6a16ce 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2006-10-29 15:05+0100\n"
+"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
+"Language-Team: de <debian-l10n-german@lists.debian.org>\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 9d8acb2f8abe4bd5ad7fda8426d4a6ab24dc42c6..07be95e26d849c06a7e975fe26cf96297a4d77e1 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/debian/po/fr.po b/debian/po/fr.po
index fbbb1ff79fd939700299797a29fc302f5e410d06..dde32c71023fe722d8df3359a0d8e7961a6176df 100644 (file)
--- 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 <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"

diff --git a/debian/po/it.po b/debian/po/it.po
index 504e301e745e9a035ebac86c8f7daee63bdff1fd..8ea5d02f6a682702eff0957f2fdc6efd197c29e4 100644 (file)
--- 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 <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"

diff --git a/debian/po/ja.po b/debian/po/ja.po
index 44d58f87bf5a13cb0119a790792132207cea5630..4f56aeaa68dd5335628a7d804817a014efedeebd 100644 (file)
--- 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) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"

diff --git a/debian/po/nl.po b/debian/po/nl.po
index 4825ff4868dab90420175e5f373ca04054182c71..07a25f936937d5a848c45b988336529306767993 100644 (file)
--- 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 <kdebree(AT)telenet(DOT)be>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"

diff --git a/debian/po/pt.po b/debian/po/pt.po
index b72124e79c17c2861bbdb75452dd6946b6688664..5145168189a611caea770ea9e3b0ba85c4a88314 100644 (file)
--- 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 <bruno.rodrigues@litux.org>\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"

diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 8687089b6124676be29aaeffedf701086ccb6d93..84a00bb8ebb2ca51123851ff44bba75189a77e93 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/debian/po/ru.po b/debian/po/ru.po
index 83094d451ce3ae4afa7feb5992957e898126e38b..07c579dd8b4384ebd3f41da80fb34e0192fae4d2 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/debian/po/sv.po b/debian/po/sv.po
index a8b1dcf0c0d28afb296f549544eec6f933d7bd8a..c4165df3d0b5f1cfffea3d1fa3a52b078db5b761 100644 (file)
--- 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 <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index b3985bf84f291fa11b8a016b093bea422fe41057..d2f6df88cbf61ecca07ece1a4ba550b0af90c20b 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/debian/po/vi.po b/debian/po/vi.po
index 671e86d818d0a684fb2a94dd218c3ba7ffb08125..cf8576d5a2420bd7c1631ad443fe1b14162bc226 100644 (file)
--- 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 <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"