[SCM] gmerlin/master: Finalize

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dbbff5c7300befff40944ad8ab38f13618e2d9c8
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Nov 26 13:29:45 2012 +0000

    Finalize

diff --git a/debian/changelog b/debian/changelog
index 2b7c296..d7f3f38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gmerlin (1.2.0~dfsg-3) unstable; urgency=low
+
+  * Promote gmerlin-encoders to Recommends. (Closes: #681983)
+  * Add alternative on Build-Depends: libtiff4-dev | libtiff-dev.
+  * libgmerlin-dev must Break/Replace gmerlin-data (<< 1.0.0~dfsg-13).
+    This fixes a squeeze -> wheezy upgrade bug (Closes: #694274)
+
+ -- Alessio Treglia <alessio at debian.org>  Mon, 26 Nov 2012 13:28:56 +0000
+
 gmerlin (1.2.0~dfsg-2) unstable; urgency=low
 
   * Build with Exif support.

-- 
gmerlin packaging