[corsix-th] 01/03: Merge branch 'master' into debian/experimental

[Phil Morrell]

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

emorrp1-guest pushed a commit to branch debian/experimental
in repository corsix-th.

commit 70fc891432b9a053d18b88aaf3b7e2329b752862
Merge: a015dc1 6b36ccd
Author: Phil Morrell <debian at emorrp1.name>
Date:   Mon Apr 18 20:05:39 2016 +0100

    Merge branch 'master' into debian/experimental
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   | 10 +++-
 debian/patches/series                              |  1 +
 debian/patches/use-AVPixelFormat-and-related.patch | 65 ++++++++++++++++++++++
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 65d02c7,7ea15f1..c968df7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,11 +1,20 @@@
 +corsix-th (0.60~beta1-1) UNRELEASED; urgency=medium
 +
-   * wrap-and-sort -satb
-   * use v4 watch file to include pre-releases
 +  * rebase lua.patch onto 0.60~beta1, forwarded
 +  * drop fix-parameters-to-sws_scale.patch
 +  * drop obsolete lintian-overrides
 +  * bump Standards-Version
 +
 + -- Phil Morrell <debian at emorrp1.name>  Sun, 17 Apr 2016 10:21:34 +0100
 +
+ corsix-th (0.50-2) UNRELEASED; urgency=medium
+ 
+   * backport upstream patch to build with ffmpeg 3.0 (Closes: #821415)
+   * use v4 watch file to include pre-releases
+   * wrap-and-sort -satb
+ 
+  -- Phil Morrell <debian at emorrp1.name>  Mon, 18 Apr 2016 19:20:40 +0100
+ 
  corsix-th (0.50-1) unstable; urgency=medium
  
    * Initial release. (Closes: #610087)
diff --cc debian/patches/series
index 0c8b05c,9a51f49..f52af59
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,4 +1,3 @@@
  lua.patch
 -fix-parameters-to-sws_scale.patch
  default_config.patch
+ use-AVPixelFormat-and-related.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/corsix-th.git