diff -Nru ca-certificates-20090814/debian/changelog ca-certificates-20090814+nmu1/debian/changelog
--- ca-certificates-20090814/debian/changelog	2009-08-14 06:11:19.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/changelog	2010-07-31 14:36:56.000000000 -0300
@@ -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 -Nru ca-certificates-20090814/debian/po/ca.po ca-certificates-20090814+nmu1/debian/po/ca.po
--- ca-certificates-20090814/debian/po/ca.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/ca.po	2010-07-31 14:37:16.000000000 -0300
@@ -10,6 +10,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/cs.po ca-certificates-20090814+nmu1/debian/po/cs.po
--- ca-certificates-20090814/debian/po/cs.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/cs.po	2010-07-31 14:37:16.000000000 -0300
@@ -19,6 +19,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/da.po ca-certificates-20090814+nmu1/debian/po/da.po
--- ca-certificates-20090814/debian/po/da.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/da.po	2010-07-31 14:37:16.000000000 -0300
@@ -20,6 +20,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/de.po ca-certificates-20090814+nmu1/debian/po/de.po
--- ca-certificates-20090814/debian/po/de.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/de.po	2010-07-31 14:37:16.000000000 -0300
@@ -11,6 +11,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/es.po ca-certificates-20090814+nmu1/debian/po/es.po
--- ca-certificates-20090814/debian/po/es.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/es.po	2010-07-31 14:37:16.000000000 -0300
@@ -33,6 +33,7 @@
 "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 @@
 "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 -Nru ca-certificates-20090814/debian/po/eu.po ca-certificates-20090814+nmu1/debian/po/eu.po
--- ca-certificates-20090814/debian/po/eu.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/eu.po	2010-07-31 14:37:16.000000000 -0300
@@ -11,6 +11,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/fi.po ca-certificates-20090814+nmu1/debian/po/fi.po
--- ca-certificates-20090814/debian/po/fi.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/fi.po	2010-07-31 14:37:16.000000000 -0300
@@ -6,6 +6,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/fr.po ca-certificates-20090814+nmu1/debian/po/fr.po
--- ca-certificates-20090814/debian/po/fr.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/fr.po	2010-07-31 14:37:16.000000000 -0300
@@ -10,6 +10,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/gl.po ca-certificates-20090814+nmu1/debian/po/gl.po
--- ca-certificates-20090814/debian/po/gl.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/gl.po	2010-07-31 14:37:16.000000000 -0300
@@ -10,6 +10,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/it.po ca-certificates-20090814+nmu1/debian/po/it.po
--- ca-certificates-20090814/debian/po/it.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/it.po	2010-07-31 14:37:16.000000000 -0300
@@ -11,6 +11,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/ja.po ca-certificates-20090814+nmu1/debian/po/ja.po
--- ca-certificates-20090814/debian/po/ja.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/ja.po	2010-07-31 14:37:16.000000000 -0300
@@ -19,6 +19,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/nl.po ca-certificates-20090814+nmu1/debian/po/nl.po
--- ca-certificates-20090814/debian/po/nl.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/nl.po	2010-07-31 14:37:16.000000000 -0300
@@ -20,6 +20,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/pt_BR.po ca-certificates-20090814+nmu1/debian/po/pt_BR.po
--- ca-certificates-20090814/debian/po/pt_BR.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/pt_BR.po	2010-07-31 14:37:16.000000000 -0300
@@ -19,6 +19,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/pt.po ca-certificates-20090814+nmu1/debian/po/pt.po
--- ca-certificates-20090814/debian/po/pt.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/pt.po	2010-07-31 14:37:16.000000000 -0300
@@ -12,6 +12,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/ru.po ca-certificates-20090814+nmu1/debian/po/ru.po
--- ca-certificates-20090814/debian/po/ru.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/ru.po	2010-07-31 14:37:16.000000000 -0300
@@ -13,6 +13,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/sv.po ca-certificates-20090814+nmu1/debian/po/sv.po
--- ca-certificates-20090814/debian/po/sv.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/sv.po	2010-07-31 14:37:16.000000000 -0300
@@ -18,6 +18,7 @@
 "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 -Nru ca-certificates-20090814/debian/po/vi.po ca-certificates-20090814+nmu1/debian/po/vi.po
--- ca-certificates-20090814/debian/po/vi.po	2008-06-16 12:02:22.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/po/vi.po	2010-07-31 14:37:16.000000000 -0300
@@ -10,6 +10,7 @@
 "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 @@
 "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 -Nru ca-certificates-20090814/debian/postinst ca-certificates-20090814+nmu1/debian/postinst
--- ca-certificates-20090814/debian/postinst	2009-06-23 18:43:03.000000000 -0300
+++ ca-certificates-20090814+nmu1/debian/postinst	2010-07-31 14:36:01.000000000 -0300
@@ -74,6 +74,12 @@
 	     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
