fix up lintian warnings, merge updated translations

diff --git a/debian/amanda-client.lintian b/debian/amanda-client.lintian
index 509140a0c9f84485f31d1b3a3ecebbcb0cf47e6a..1a8106733045db85ed1aa292c1c8c556426e9c32 100644 (file)
--- a/debian/amanda-client.lintian
+++ b/debian/amanda-client.lintian
@@ -8,3 +8,4 @@ amanda-client: non-standard-dir-perm var/lib/amanda/ 0770 != 0755
 amanda-client: non-standard-dir-perm var/lib/amanda/gnutar-lists/ 0770 != 0755
 amanda-client: maintainer-script-needs-depends-on-update-inetd prerm
 amanda-client: maintainer-script-needs-depends-on-update-inetd postinst
+amanda-client: possible-gpl-code-linked-with-openssl

diff --git a/debian/amanda-common.lintian b/debian/amanda-common.lintian
new file mode 100644 (file)
index 0000000..ba9cb12
--- /dev/null
+++ b/debian/amanda-common.lintian
@@ -0,0 +1 @@
+amanda-common: possible-gpl-code-linked-with-openssl

diff --git a/debian/amanda-server.lintian b/debian/amanda-server.lintian
index e765b7d2a98dc50ee7585fd4fea326b8caa811a1..07d7f99f9070a6b2ef1f87bd612f6513ef544897 100644 (file)
--- a/debian/amanda-server.lintian
+++ b/debian/amanda-server.lintian
@@ -6,3 +6,4 @@ amanda-server: non-standard-dir-perm var/lib/amanda/ 0770 != 0755
 amanda-server: non-standard-dir-perm var/log/amanda/ 0770 != 0755
 amanda-server: maintainer-script-needs-depends-on-update-inetd prerm
 amanda-server: maintainer-script-needs-depends-on-update-inetd postinst
+amanda-server: possible-gpl-code-linked-with-openssl

diff --git a/debian/changelog b/debian/changelog
index e20521ca541f73346bdeed535e53041d88db8fcb..567a6a40b0f8475ea2c9401f9756d4fa2e7cebae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 amanda (1:3.2.1-1) UNRELEASED; urgency=low
 
-  * new upstream version
+  * new upstream version, closes: #613178
   * enable support for Amazon S3 storage on request from Christopher McCrory
   * fix for dh_perl usage to include private library, closes: #582220
+  * merge updated Vietnamese debconf translation, closes: #601919
+  * merge updated Danish debconf translation, closes: #608435
 
  -- Bdale Garbee <bdale@gag.com>  Sun, 27 Feb 2011 10:56:28 -0700
 

diff --git a/debian/po/da.po b/debian/po/da.po
index f6986c822d5bb6ee8385cade1d595ee35d5afbdd..4364cc429073fc3332bd68a0c57194d249e23be5 100644 (file)
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -1,35 +1,25 @@
+# Danish translation for amanda.
+# Copyright (C) 2010 amanda og nedenstående oversættere.
+# This file is distributed under the same license as the amanda package.
+# Joe Hansen (joedalton2@yahoo.dk), 2010.
 #
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: amanda\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
 "POT-Creation-Date: 2008-04-16 01:13-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: 2010-12-30 19:25+0200\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: error
 #. Description
 #: ../templates:1001
-#, fuzzy
 msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
-msgstr "Venligst flet /var/lib/amandates og /var/lib/amanda/amandates."
+msgstr "Venligst flet /var/lib/amandates og /var/lib/amanda/amandates"
 
 #. Type: error
 #. Description
@@ -39,6 +29,6 @@ msgid ""
 "review the files, and merge the contents you care about to the /var/lib/"
 "amanda/amandates location, and remove the old file /var/lib/amandates."
 msgstr ""
-"Du har både /var/lib/amandates og /var/lib/amanda/amandates. Du rådes til at "
+"Du har både /var/lib/amandates og /var/lib/amanda/amandates. Du rådes til at "
 "gennemse filerne, og flette indholdet der interesserer dig til den nye "
 "lokation /var/lib/amanda/amandates og fjern den gamle fil /var/lib/amandates."

diff --git a/debian/po/vi.po b/debian/po/vi.po
index 10472214721b60f5101ebf907ca78618358f3409..e6e9363c0899f0507b1d02f44e5d39ca76288da9 100644 (file)
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1,35 +1,33 @@
-# Vietnamese Translation for amanda-1/2.4.4p3-2.
-# Copyright © 2005 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2005.
+# Vietnamese Translation for Amanda.
+# Copyright © 2010 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2005-2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: amanda 1/2.4.4p3-2\n"
+"Project-Id-Version: amanda 1/3.1.0-1\n"
 "Report-Msgid-Bugs-To: amanda@packages.debian.org\n"
 "POT-Creation-Date: 2008-04-16 01:13-0600\n"
-"PO-Revision-Date: 2005-05-05 13:29+0930\n"
+"PO-Revision-Date: 2010-10-31 13:45+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.8\n"
 
+#: ../templates:1001
 #. Type: error
 #. Description
-#: ../templates:1001
-#, fuzzy
 msgid "Please merge /var/lib/amandates and /var/lib/amanda/amandates"
-msgstr "Hãy kết hợp /var/lib/amandates và /var/lib/amanda/amandates"
+msgstr "Hòa trá»\99n « /var/lib/amandates » và  « /var/lib/amanda/amandates »"
 
+#: ../templates:1001
 #. Type: error
 #. Description
-#: ../templates:1001
 msgid ""
 "You have both /var/lib/amandates and /var/lib/amanda/amandates. Please "
 "review the files, and merge the contents you care about to the /var/lib/"
 "amanda/amandates location, and remove the old file /var/lib/amandates."
 msgstr ""
-"Bạn có cả hai tập tin /var/lib/amandates và /var/lib/amanda/amandates đều. "
-"Hãy xem lại hai tập tin ấy, rồi kết hợp các nội dung ấy được muốn vào vị trí "
-"amanda/amandates, và xóa bỏ tập tin cũ /var/lib/amandates."
+"Đồng thời có cả hai tập tin « /var/lib/amandates » và « /var/lib/amanda/amandates ». Hãy xem lại hai tập tin đó, sau đó hoà trộn nội dung muốn giữ lại vào vị trí « /var/lib/amanda/amandates », và gỡ bỏ tập tin cũ « /var/lib/amandates »."