--- debian/changelog	2013-10-28 11:30:00.000000000 +0000
+++ debian/changelog	2013-12-13 07:13:06.000000000 +0000
@@ -1,3 +1,13 @@
+scsitools (0.12-2.2ubuntu1) trusty; urgency=low
+
+  * Merge from Debian testing.  Remaining changes:
+    - debian/control, debian/rules: Split out tk_scsiformat into its own
+      package so we dont pull in X server on the server.
+    - add debian/patches/01_ubuntu-toolchain.diff, fix FTBFS caused by
+      -D_FORTIFY_SOURCE=2 compiler flag enabled in Ubuntu.
+
+ -- Mahyuddin Susanto <udienz@ubuntu.com>  Mon, 28 Oct 2013 15:41:36 +0000
+
 scsitools (0.12-2.2) unstable; urgency=low
 
   * Non-maintainer upload.
