[Pkg-sdl-commits] [libsdl2] 04/04: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-sdl/packages/libsdl2

[Manuel A. Fernandez Montecelo]

This is an automated email from the git hooks/post-receive script.

mafm pushed a commit to branch master
in repository libsdl2.

commit 0540e5a95f75a49d51889ba61584c42c2ed2a256
Merge: e9ccd0d 8ccf53f
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Sun Dec 1 21:44:46 2013 +0000

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-sdl/packages/libsdl2
    
    Conflicts:
    	debian/changelog

 debian/changelog                |   3 +++
 debian/upstream-signing-key.pgp | Bin 0 -> 897 bytes
 debian/watch                    |   2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 05b2a68,5b8e453..eff321e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,13 @@@
 -libsdl2 (2.0.0+dfsg1-4) UNRELEASED; urgency=low
 +libsdl2 (2.0.1+dfsg1-1) UNRELEASED; urgency=low
  
 +  * New upstream release (Closes: #728974)
 +  * Remove patch applied upstream:
 +    bug-723797-false_positives_in_mouse_wheel_code.patch
++  
++  [ Felix Geyer ]
+   * Import upstream gpg key for uscan to verify the orig tarball.
  
 - -- Felix Geyer <fgeyer at debian.org>  Sun, 01 Dec 2013 10:53:16 +0100
 + -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Thu, 14 Nov 2013 15:10:01 +0000
  
  libsdl2 (2.0.0+dfsg1-3) unstable; urgency=low
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2.git