From 5cb5dbed0874ea345b2ad8a3357a3f635c65c693 Mon Sep 17 00:00:00 2001 From: Michael Shuler Date: Sat, 17 Sep 2011 17:32:05 -0500 Subject: [PATCH] Import Debian version 20090814+nmu1 --- debian/changelog | 8 ++++++++ debian/po/ca.po | 1 + debian/po/cs.po | 1 + debian/po/da.po | 1 + debian/po/de.po | 1 + debian/po/es.po | 5 +++-- debian/po/eu.po | 1 + debian/po/fi.po | 1 + debian/po/fr.po | 1 + debian/po/gl.po | 1 + debian/po/it.po | 1 + debian/po/ja.po | 1 + debian/po/nl.po | 1 + debian/po/pt.po | 1 + debian/po/pt_BR.po | 1 + debian/po/ru.po | 1 + debian/po/sv.po | 1 + debian/po/vi.po | 5 +++-- debian/postinst | 6 ++++++ 19 files changed, 35 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f5b0e05..3d2606c 100644 --- 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 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 564ba0a..e362eeb 100644 --- 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 \n" "Language-Team: Catalan \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 69879e3..9d52b52 100644 --- 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 \n" "Language-Team: Czech \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 ebc8cac..9af6b3e 100644 --- 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 \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 21f46fc..135f46b 100644 --- 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 \n" "Language-Team: German \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 c25d9ba..4f5da42 100644 --- 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 \n" "Language-Team: Debian l10n spanish \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 4def037..d9fde48 100644 --- 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 \n" "Language-Team: Euskara \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 c96fda0..0ef573b 100644 --- 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 \n" "Language-Team: Finnish \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 80f1de2..e6bbc8f 100644 --- 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 \n" "Language-Team: French \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 9d4c7b2..da6eb52 100644 --- 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 \n" "Language-Team: Galician \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 762f0eb..3effc09 100644 --- 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 \n" "Language-Team: Italian \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 a6f8a79..dbede14 100644 --- 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 \n" "Language-Team: Japanese \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 d05b876..9745cd5 100644 --- 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 \n" "Language-Team: Dutch \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 306e8a2..6e62437 100644 --- 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 \n" "Language-Team: Portuguese \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 dbd2741..c686e55 100644 --- 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 \n" "Language-Team: Debian-BR Project \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 3faf9ae..e4d1371 100644 --- 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 \n" "Language-Team: Russian l10n Team \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 55f8880..21a94fa 100644 --- 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 \n" "Language-Team: Swedish \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 036f6fc..4f1329f 100644 --- 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 \n" "Language-Team: Vietnamese \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 ca6aab0..35e1ef3 100644 --- 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 -- 2.39.2