diff options
| author | Michael Shuler <michael@pbandjelly.org> | 2012-07-22 09:42:20 -0500 |
|---|---|---|
| committer | Michael Shuler <michael@pbandjelly.org> | 2012-07-22 09:42:20 -0500 |
| commit | 450add0feeeaab51b1a41216f3d04e8c56447b40 (patch) | |
| tree | 0a22f8d68979e23cc5fc970edcef7fb244fae2f3 | |
| parent | 994dff4bcd0e291bd1fb39286812c48014822664 (diff) | |
| parent | ddbace3f0137e6a709184efc2feceb166fd9f464 (diff) | |
| download | ca-certificates-450add0feeeaab51b1a41216f3d04e8c56447b40.tar.gz | |
Merge branch '682125-piuparts_fix'
Correct piuparts package remove/purge behavior Closes: #682125
- Remove deletes of /etc/ssl{,/certs} from debian/postrm
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/postrm | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog index 7736538..c036152 100644 --- 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 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* ;; |