summaryrefslogtreecommitdiff
diff options
authorMarc Deslauriers <marc.deslauriers@ubuntu.com>2014-05-02 16:46:24 +0200
committerMarco Trevisan (TreviƱo) <mail@3v1n0.net>2014-05-02 16:46:24 +0200
commit06671de6ad076a8978d990f3436cca4539388909 (patch)
tree69f295d6f2ded9bb53bc35a00b921a14b795551c
parenta733acf065a0332626dd22eff58fb189716d5949 (diff)
debian/changelog: sync with distro
(bzr r3794)
-rw-r--r--debian/changelog21
1 files changed, 21 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f7ad1616f..27977c2b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+unity (7.2.0+14.04.20140423-0ubuntu1.2) trusty-security; urgency=medium
+
+ * SECURITY UPDATE: more lock screen bypass issues, and regression with
+ shutdown dialog (LP: #1314247)
+ - debian/patches/lp1314247.patch: improve popup menu handling in
+ lockscreen/LockScreenShield.cpp, lockscreen/LockScreenPanel.cpp,
+ services/panel-service.c, plugins/unityshell/src/unityshell.cpp,
+ lockscreen/LockScreenController.*, shutdown/SessionController.cpp,
+ tests/test_session_controller.cpp.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Wed, 30 Apr 2014 11:11:18 -0400
+
+unity (7.2.0+14.04.20140423-0ubuntu1.1) trusty-security; urgency=medium
+
+ * SECURITY UPDATE: lock screen bypass (LP: #1313885)
+ - debian/patches/lp1313885.patch: improve lockscreen logic in
+ lockscreen/LockScreenController.cpp, lockscreen/LockScreenShield.*,
+ plugins/unityshell/src/unityshell.*.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Mon, 28 Apr 2014 22:29:13 -0400
+
unity (7.2.0+14.04.20140423-0ubuntu1) trusty; urgency=low
[ Chris Townsend ]