Merge branch '682125-piuparts_fix'

Correct piuparts package remove/purge behavior  Closes: #682125
- Remove deletes of /etc/ssl{,/certs} from debian/postrm

diff --git a/debian/changelog b/debian/changelog
index 7736538f447d593e1d9517b5d10c8ef8e4774e1e..c036152f203438b6b3b6f692a0799f1f78f9ddd7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ca-certificates (20120710) UNRELEASED; urgency=low
+ca-certificates (20120722) UNRELEASED; urgency=low
 
   * Update mozilla/certdata.txt to version 1.85
     Certificates added (+) (none removed):
@@ -8,8 +8,10 @@ ca-certificates (20120710) UNRELEASED; urgency=low
     + "StartCom Certification Authority G2"
     + "Buypass Class 2 Root CA"
     + "Buypass Class 3 Root CA"
+  * Correct piuparts package remove/purge behavior  Closes: #682125
+    - Remove deletes of /etc/ssl{,/certs} from debian/postrm
 
- -- Michael Shuler <michael@pbandjelly.org>  Tue, 10 Jul 2012 14:05:27 -0500
+ -- Michael Shuler <michael@pbandjelly.org>  Sun, 22 Jul 2012 09:39:26 -0500
 
 ca-certificates (20120623) unstable; urgency=low
 

diff --git a/debian/postrm b/debian/postrm
index 9b3c29c7809c5acb039f88466de2c8cb79be9500..11759fea4e21b4f4b9a43679833b458cd02c47ce 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -46,12 +46,6 @@ case "$1" in
     purge)
         rm -f /etc/ssl/certs/ca-certificates.crt
         remove_dangling_symlinks
-
-        # Clean up even if openssl is removed before ca-certificates.
-        # (Which is what piuparts does.)
-        [ -d /etc/ssl/certs ] && rmdir --ignore-fail-on-non-empty /etc/ssl/certs
-        [ -d /etc/ssl ] && rmdir --ignore-fail-on-non-empty /etc/ssl
-
         rm -f /etc/ca-certificates.conf*
         ;;