From 516ad142c7e09222e5e23b086656928f2879682b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= <otto@seravo.fi>
Date: Mon, 8 Feb 2016 11:24:35 +0200
Subject: [PATCH] Import update changelog as released by Steve Beattie

---
 debian/changelog | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7726626e..6aa24ed4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,17 @@
-mariadb-5.5 (5.5.47-1ubuntu0.14.04.2) trusty-updates; urgency=low
-
-  * New upstream release
+mariadb-5.5 (5.5.47-1ubuntu0.14.04.1) trusty-security; urgency=low
+
+  * SECURITY UPDATE: New upstream release 5.5.47
+    - CVE-2016-0546
+    - CVE-2016-0505
+    - CVE-2016-0596
+    - CVE-2016-0597
+    - CVE-2016-0616
+    - CVE-2016-0598
+    - CVE-2016-0600
+    - CVE-2016-0606
+    - CVE-2016-0608
+    - CVE-2016-0609
+    - CVE-2016-2047
     - Adds the mariadb-slow.log into the logrotate file, as the file
       name mariadb-slow.log is the log name in the default config file.
 
-- 
GitLab