[SCM] gmerlin/master: New entry

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 01c217d7c7be43592f26149364fd663a374b1e12
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 13:22:29 2012 +0200

    New entry

diff --git a/debian/changelog b/debian/changelog
index 9017d45..276f1d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gmerlin (1.2.0~dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+  * Drop png_set_gray.patch, fixed upstream.
+  * Drop function_param_type.patch, applied upstream.
+  * Drop underlinking.patch, applied upstream.
+  * Drop fix_ftbfs_gtk_2.24.patch, applied upstream.
+
+ -- Alessio Treglia <alessio at debian.org>  Mon, 11 Jun 2012 13:22:11 +0200
+
 gmerlin (1.0.0~dfsg-13) unstable; urgency=low
 
   * Move /usr/share/gmerlin/plugin.sym back into libgmerlin-dev. (LP: #935120)

-- 
gmerlin packaging