[SCM] gmtk/master: Merge branch 'experimental'

[sramacher at users.alioth.debian.org]

Apply some patches from upstream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 28b85d4fd006be5b65bd3c56c25c1c9b5c61952c
X-Git-Newrev: 017ab0df5ae24ed26040883fb2430c184b050513

The following commit has been merged in the master branch:
commit 017ab0df5ae24ed26040883fb2430c184b050513
Merge: 0b8ce92d67c71056da531f7854b5fb3d3fb6d7b9 1420b46f120b116d79350ddb997e311ef7b9c71d
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Jun 7 00:47:18 2013 +0200

    Merge branch 'experimental'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index d295f07,fd4317a..2c8665c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,14 +1,20 @@@
 -gmtk (1.0.8-2) UNRELEASED; urgency=low
++gmtk (1.0.8-3) UNRELEASED; urgency=low
+ 
+   * debian/patches:
+     - locale-agnostic.patch: Apply patch from upstream to pass floats in a
+       locale agnostic way to mplayer. (LP: #1182874)
+     - metadata-handling.patch: Apply patch from upstream to improve handling
+       of metadata reported by mplayer.
+     - input.conf-error.patch: Apply patch from upstream to not display an
+       error message if input.conf could not be found.
+ 
 - -- Sebastian Ramacher <sramacher at debian.org>  Sun, 26 May 2013 14:34:19 +0200
++ -- Sebastian Ramacher <sramacher at debian.org>  Fri, 07 Jun 2013 00:57:59 +0200
++
 +gmtk (1.0.8-2) unstable; urgency=low
 +
 +  * Upload to unstable.
 +
 + -- Sebastian Ramacher <sramacher at debian.org>  Thu, 06 Jun 2013 22:32:33 +0200
  
  gmtk (1.0.8-1) experimental; urgency=low
  

-- 
gmtk packaging