From: Michael Shuler <michael@pbandjelly.org>
Date: Sat, 21 Jul 2012 19:01:49 +0000 (-0500)
Subject: Correct piuparts package remove/purge behavior  Closes: #682125
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c210eaafbe64185a2bf258681889984becbd8141;p=ca-certificates.git

Correct piuparts package remove/purge behavior  Closes: #682125

- Remove deletes of /etc/ssl{,/certs} from debian/postrm
- Add etc/ssl to debian/dirs
---

diff --git a/debian/changelog b/debian/changelog
index 7736538..89d7d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ca-certificates (20120710) UNRELEASED; urgency=low
+ca-certificates (20120721) UNRELEASED; urgency=low
 
   * Update mozilla/certdata.txt to version 1.85
     Certificates added (+) (none removed):
@@ -8,8 +8,11 @@ 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
+    - Add etc/ssl to debian/dirs
 
- -- Michael Shuler <michael@pbandjelly.org>  Tue, 10 Jul 2012 14:05:27 -0500
+ -- Michael Shuler <michael@pbandjelly.org>  Sat, 21 Jul 2012 09:54:25 -0500
 
 ca-certificates (20120623) unstable; urgency=low
 
diff --git a/debian/dirs b/debian/dirs
index b64bbd3..840b840 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,3 +1,4 @@
+etc/ssl
 etc/ssl/certs
 usr/sbin
 usr/share/ca-certificates/
diff --git a/debian/postrm b/debian/postrm
index 9b3c29c..11759fe 100644
--- 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*
         ;;