]> git.donarmstrong.com Git - ca-certificates.git/commitdiff
* Breaks ca-certificates-java (<<20121112+nmu1); partially fixing #537051. bugs-537051
authorDon Armstrong <don@debian.org>
Tue, 13 Nov 2012 21:04:01 +0000 (13:04 -0800)
committerDon Armstrong <don@debian.org>
Tue, 13 Nov 2012 21:04:01 +0000 (13:04 -0800)
* Provide update-ca-certificates and update-ca-certificates-fresh
  triggers.
* Call the triggers using no-await so that the configuration files from
  the newer version of ca-certificates-java are in places before the
  upgrade. Closes: #537051.

debian/ca-certificates.triggers [new file with mode: 0644]
debian/changelog
debian/control
debian/postinst

diff --git a/debian/ca-certificates.triggers b/debian/ca-certificates.triggers
new file mode 100644 (file)
index 0000000..14dec6e
--- /dev/null
@@ -0,0 +1,4 @@
+interest-noawait update-ca-certificates
+interest-noawait update-ca-certificates-fresh
+interest update-ca-certificates
+interest update-ca-certificates-fresh
index 861abedaf7e8ae7cb3ca3862d4462e626fb323ec..a59fed5604ec3310cee45f422ffc877fd806737a 100644 (file)
@@ -1,3 +1,15 @@
+ca-certificates (20121112+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Breaks ca-certificates-java (<<20121112+nmu1); partially fixing #537051.
+  * Provide update-ca-certificates and update-ca-certificates-fresh
+    triggers.
+  * Call the triggers using no-await so that the configuration files from
+    the newer version of ca-certificates-java are in places before the
+    upgrade. Closes: #537051.
+
+ -- Don Armstrong <don@debian.org>  Mon, 12 Nov 2012 15:58:11 -0800
+
 ca-certificates (20121105) unstable; urgency=low
 
   * Update mozilla/certdata.txt to version 1.86  Closes: #683728
index 5ef776e20ef4f7797678d4d8e7939c76215920fe..8f84573652027ec0984e54a48c59b3a2fb98cf06 100644 (file)
@@ -13,9 +13,11 @@ Vcs-Browser: http://git.debian.org/?p=collab-maint/ca-certificates.git
 
 Package: ca-certificates
 Architecture: all
+Pre-Depends: dpkg (>= 1.16.1)
 Depends: openssl (>= 1.0.0), ${misc:Depends}
 Enhances: openssl
 Multi-Arch: foreign
+Breaks: ca-certificates-java (<<20121112+nmu1)
 Description: Common CA certificates
  This package includes PEM files of CA certificates to allow SSL-based
  applications to check for the authenticity of SSL connections.
index 198c57e0bc245aedc61c54dbcc17d1ee34ab1c33..9964e27873eac84088543faa4283f4a8530003ff 100644 (file)
@@ -142,12 +142,29 @@ EOF
        # fix bogus symlink to ca-certificates.crt on upgrades; see
        # Debian #643667; drop after wheezy
        if dpkg --compare-versions "$2" lt-nl 20111025; then
-           update-ca-certificates --fresh
+           dpkg-trigger --no-await update-ca-certificates-fresh
        else
-           update-ca-certificates
+           dpkg-trigger --no-await update-ca-certificates
        fi
     ;;
 
+    triggered)
+       for trigger in $2; do
+           case "$trigger" in
+               update-ca-certificates)
+                   update-ca-certificates
+                   ;;
+               update-ca-certificates-fresh)
+                   update-ca-certificates --fresh
+                   ;;
+               *)
+                   echo "postinst called with unknown trigger \`$2'">&2
+                   exit 1
+                   ;;
+           esac;
+       done;
+       ;;
+           
     abort-upgrade|abort-remove|abort-deconfigure)
 
     ;;