Import Debian version 20090814+nmu1

diff --git a/debian/changelog b/debian/changelog
index f5b0e05a7c5c4c7913810f13ee95b59e70adcd4c..3d2606c9ac40c2e4c57a683b31cad613d599b90d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ca-certificates (20090814+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Preserve user changes to the /etc/ca-certificates.conf.
+    (Closes: #514220)
+
+ -- Maximiliano Curia <maxy@debian.org>  Fri, 30 Jul 2010 12:55:28 -0400
+
 ca-certificates (20090814) unstable; urgency=low
 
   * Call Debconf and its db_purge as early as possible in postrm.

diff --git a/debian/po/ca.po b/debian/po/ca.po
index 564ba0aafa56ab4c97eb451141d35b1915632de0..e362eeb39d3a97942c77925338faa13c1076b205 100644 (file)
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2004-03-05 01:14+0100\n"
 "Last-Translator: Josep Monés i Teixidor <jmones@puntbarra.com>\n"
 "Language-Team: Catalan <debian-l10n-catalanLL@lists.debian.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/cs.po b/debian/po/cs.po
index 69879e3f3da18d086b8b058520df7f9c6a8c981b..9d52b521d1ae7b7d39558b7baeca5cdd08571c98 100644 (file)
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -19,6 +19,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-29 11:13+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/da.po b/debian/po/da.po
index ebc8cacb056230faaf5b99aebc039ebcd64d80c0..9af6b3e335052a7482cc93c0a18c43827e8db6f1 100644 (file)
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -20,6 +20,7 @@ msgstr ""
 "PO-Revision-Date: 2006-09-18 08:00+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/de.po b/debian/po/de.po
index 21f46fcebb6573f6acc56f6b5461e617d761391f..135f46b6d17b0346ca895d4c0c21eff987e6e920 100644 (file)
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-27 20:21+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/es.po b/debian/po/es.po
index c25d9ba8bc445239ccc5adfe725b25118382edcf..4f5da4218c17b72d5fbbd394c03a1a9a87fb2bf6 100644 (file)
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -33,6 +33,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-27 19:01+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -119,8 +120,8 @@ msgid ""
 "single /etc/ssl/certs/ca-certificates.crt file."
 msgstr ""
 "Escoja las autoridades de certificación en las que confía para instalarlas "
-"en «/etc/ssl/certs». Se incluirán todas en un único archivo «/etc/ssl/certs/ca-"
-"certificates.crt»."
+"en «/etc/ssl/certs». Se incluirán todas en un único archivo «/etc/ssl/certs/"
+"ca-certificates.crt»."
 
 #~ msgid "${new_crts}"
 #~ msgstr "${new_crts}"

diff --git a/debian/po/eu.po b/debian/po/eu.po
index 4def0379622a56ac0f692daed378f2cb9a632a4a..d9fde489ebc9df39281374538b5190dfb0fb7d6e 100644 (file)
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-27 11:55+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <Librezale@librezale.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/fi.po b/debian/po/fi.po
index c96fda0f0ae486c1b439eab95fdbb941258fcbe2..0ef573b66eb445f4cdebf79ef8019d1fc8570c77 100644 (file)
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -6,6 +6,7 @@ msgstr ""
 "PO-Revision-Date: 2007-11-01 11:21+0200\n"
 "Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/fr.po b/debian/po/fr.po
index 80f1de2465d9ce05dc3fdc5970f463dbec480a08..e6bbc8f9edb02309be79ab6ad4bb1969f09112c1 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-27 08:40+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/gl.po b/debian/po/gl.po
index 9d4c7b209c16b306451fae190fcca880f4fc68d2..da6eb52bea730e52a668b72dc1012f956a57fbc0 100644 (file)
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-31 09:52+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/it.po b/debian/po/it.po
index 762f0eb082c0320fee89c49aa7bf407fd318ff21..3effc09420864f48e488a9325dc5d6a838a24ff0 100644 (file)
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -11,6 +11,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-28 20:50+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/ja.po b/debian/po/ja.po
index a6f8a792147e870890077e92f9863c5e05cbd0fa..dbede14a0474a857791c2429fbda1c3ec6bb377f 100644 (file)
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -19,6 +19,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-30 14:08+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/nl.po b/debian/po/nl.po
index d05b876684a1fae8d966385f941bac1dc671eaa3..9745cd59f9daee99bef57c823eb75e586b32f43e 100644 (file)
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -20,6 +20,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-27 09:44+0200\n"
 "Last-Translator: Frans Pop <elendil@planet.nl>\n"
 "Language-Team: Dutch <debian-l10n-dutch@lists.debian.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/pt.po b/debian/po/pt.po
index 306e8a2524ef32a017ac19432e12793eea6147ad..6e624376db62428f1c3465fb0e1d87d991ab3f09 100644 (file)
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -12,6 +12,7 @@ msgstr ""
 "PO-Revision-Date: 2007-08-01 08:34+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index dbd27417abb5dc58c43401781062019c62968b59..c686e5524e5e6f5635d3b5f2a5eb4331d8a74a13 100644 (file)
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -19,6 +19,7 @@ msgstr ""
 "PO-Revision-Date: 2006-12-19 21:01-0200\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/ru.po b/debian/po/ru.po
index 3faf9aefcac8569eece0b6623844e37cd7cf692f..e4d1371d536bcbd23bbe30ea2a5ad3a382002f25 100644 (file)
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -13,6 +13,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-27 17:45+0700\n"
 "Last-Translator: Mikhail Gusarov <dottedmag@dottedmag.net>\n"
 "Language-Team: Russian l10n Team <debian-l10n-russian@lists.debian.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/sv.po b/debian/po/sv.po
index 55f8880643bade6a12fdebdfa04d09c941aff841..21a94fa17d0ba1fff7f86682ea355444a7b7156f 100644 (file)
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -18,6 +18,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-27 11:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/debian/po/vi.po b/debian/po/vi.po
index 036f6fcd6b3e5471e78ee22409380ea463c95370..4f1329f120213a107fc54ea5b317ad6e7f96a3ca 100644 (file)
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2007-07-30 18:25+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-bugs@googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -81,8 +82,8 @@ msgid ""
 "This package installs common CA (Certificate Authority) certificates in /usr/"
 "share/ca-certificates."
 msgstr ""
-"Gói này sẽ tạo các chứng nhận CA (nhà cầm quyền chứng nhận) vào «  /usr/share/"
-"ca-certificates »."
+"Gói này sẽ tạo các chứng nhận CA (nhà cầm quyền chứng nhận) vào «  /usr/"
+"share/ca-certificates »."
 
 #. Type: multiselect
 #. Description

diff --git a/debian/postinst b/debian/postinst
index ca6aab06b1c7de96b7f0212efcb2babe46bf5741..35e1ef35c8c8c2b6ff8ae41c359673c88fae0577 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -74,6 +74,12 @@ case "$1" in
             if memberp "$ca" "$CERTS_ENABLED"; then
               echo "$ca"
               # CERTS_ENABLED=$(delca "$ca" "$CERTS_ENABLED")
+         elif memberp "$ca" "$CERTS_AVAILABLE" ||
+              echo "$line" | grep -q '^!'; then
+           echo "!$ca"
+         elif [ -f /usr/share/ca-certificates/"$ca" ] || \
+              [ -f /usr/local/share/ca-certificates/"$ca" ]; then
+           echo "$ca"
             else
               echo "!$ca"
             fi