summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog26
1 files changed, 17 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index 07286132..8dc7b8ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,18 @@
-shim (0.9+1474479173.6c180c6-1) unstable; urgency=medium
+shim (0.9+1474479173.6c180c6-1ubuntu1) zesty; urgency=medium
[ Steve Langasek ]
+ * Merge (not yet NEW cleared) changes from Debian branch.
+
+ [ Mathieu Trudel-Lapierre ]
+ * debian/patches/0001-shim-fix-the-mirroring-MokSBState-fail.patch: guard
+ against errors in mirroring MokSBState to MokSBStateRT. Thanks to Ivan Hu
+ for the patch. This will fix issues updating MokSBStateRT if the variable
+ already exists with different attributes. (LP: #1644806)
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Thu, 01 Dec 2016 16:55:50 -0500
+
+shim (0.9+1474479173.6c180c6-1) unstable; urgency=medium
+
* Initial Debian upload. Closes: #820052.
* Update Standards-Version.
* Embed the newly-minted Debian CA certificate.
@@ -13,19 +25,15 @@ shim (0.9+1474479173.6c180c6-1) unstable; urgency=medium
* Update Vcs-Bzr.
* Resync with Ubuntu, including patch to fix debian/copyright.
- [ Julien Cristau ]
- * Add some missing copyright holders in d/copyright, update
- Upstream-Contact. Thanks to Helen Koike for the help.
+ -- Steve Langasek <vorlon@debian.org> Sat, 01 Oct 2016 14:18:53 -0700
- -- Julien Cristau <jcristau@debian.org> Sat, 15 Oct 2016 15:17:34 +0200
-
-shim (0.9+1474479173.6c180c6-0ubuntu1) UNRELEASED; urgency=medium
+shim (0.9+1474479173.6c180c6-0ubuntu1) yakkety; urgency=medium
[ Helen Koike ]
* debian/copyright: add OpenSSL license
[ Mathieu Trudel-Lapierre ]
- * New upstream release.
+ * New upstream release. (LP: #1624096)
* debian/copyright: patches should be BSD, like the rest of the upstream
code.
* debian/patches/unused-variable: dropped; applied upstream.
@@ -34,7 +42,7 @@ shim (0.9+1474479173.6c180c6-0ubuntu1) UNRELEASED; urgency=medium
file to properly pick up shim (shim$arch), MokManager (mm$arch), and
fallback (fb$arch).
- -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Wed, 21 Sep 2016 20:29:44 -0400
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Thu, 22 Sep 2016 15:02:20 -0400
shim (0.9+1465500757.14a5905-0ubuntu1) yakkety; urgency=medium