[SCM] gmerlin/master: Ready for release

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0adce1d38771eba5a96744aacad3c65ad360e4cb
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Jul 2 18:08:47 2014 +0200

    Ready for release

diff --git a/debian/changelog b/debian/changelog
index 7cde5d9..cfb1721 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+gmerlin (1.2.0~dfsg+1-2) unstable; urgency=medium
+
+  [ Jonas Smedegaard ]
+  * Added README.source
+
+  [ IOhannes m zmölnig ]
+  * Fixed Build-Depends on libtiff-dev (Closes: #736008)
+  * manpages
+    * Added manpages for album2pls/album2m3u
+    * Fixed more manpage errors
+  * debian/copyright
+    * Clarified Bitzi's "Public Domain" license
+    * Removed license info for stripped doc/ folder
+  * Applied more hardening flags
+  * Removed deprecated DEB_DH_STRIP_ARGS
+  * Added lintian-override for adobe-license in font.
+  * Multi-Archified the gmerlin package.
+  * Bumped standards version to 3.9.5
+
+ -- IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>  Wed, 02 Jul 2014 14:49:54 +0200
+
 gmerlin (1.2.0~dfsg+1-1) unstable; urgency=low
 
   * Repack tarball to exclude the doc/ directory from upstream sources to

-- 
gmerlin packaging