[dolphin-emu] 28/33: Update patch headers and renumber patches

[James Cowgill]

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

jcowgill-guest pushed a commit to branch master
in repository dolphin-emu.

commit f448840cd4300d51b8b85acdd9f363ec19f9c91e
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Wed Nov 26 10:48:21 2014 +0000

    Update patch headers and renumber patches
---
 debian/patches/02_fixes-for-libav-10.patch                        | 4 ++--
 ...6_remove-powerpcdisasm.patch => 05_remove-powerpcdisasm.patch} | 0
 ...niupnpc-warnings.patch => 06_fix-findminiupnpc-warnings.patch} | 0
 .../{08_cmake-sfml-fixes.patch => 07_cmake-sfml-fixes.patch}      | 4 +++-
 debian/patches/{09_sfml-use-2.1.patch => 08_sfml-use-2.1.patch}   | 1 +
 debian/patches/series                                             | 8 ++++----
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/patches/02_fixes-for-libav-10.patch b/debian/patches/02_fixes-for-libav-10.patch
index b9742a8..5d265f5 100644
--- a/debian/patches/02_fixes-for-libav-10.patch
+++ b/debian/patches/02_fixes-for-libav-10.patch
@@ -1,5 +1,5 @@
-Description: Copy avcodec_encode_video from libav so it compiles
- with newer versions.
+Description: Copy avcodec_encode_video from libav so it compiles with newer versions.
+ Will not be needed in next dolphin version.
 Author: Brandon Barnes <winterknight at nerdshack.com>
 Forwarded: not-needed
 
diff --git a/debian/patches/06_remove-powerpcdisasm.patch b/debian/patches/05_remove-powerpcdisasm.patch
similarity index 100%
rename from debian/patches/06_remove-powerpcdisasm.patch
rename to debian/patches/05_remove-powerpcdisasm.patch
diff --git a/debian/patches/07_fix-findminiupnpc-warnings.patch b/debian/patches/06_fix-findminiupnpc-warnings.patch
similarity index 100%
rename from debian/patches/07_fix-findminiupnpc-warnings.patch
rename to debian/patches/06_fix-findminiupnpc-warnings.patch
diff --git a/debian/patches/08_cmake-sfml-fixes.patch b/debian/patches/07_cmake-sfml-fixes.patch
similarity index 75%
rename from debian/patches/08_cmake-sfml-fixes.patch
rename to debian/patches/07_cmake-sfml-fixes.patch
index 804b9e6..3de51e7 100644
--- a/debian/patches/08_cmake-sfml-fixes.patch
+++ b/debian/patches/07_cmake-sfml-fixes.patch
@@ -1,6 +1,8 @@
 Description: Add info so that package links SFML successfully with newer gcc versions.
+ Incorporated into SFML patch submitted upstream by James Cowgill
 Author: Brandon Barnes <winterknight at nerdshack.com>
-Forwarded: no
+Forwarded: https://github.com/dolphin-emu/dolphin/pull/1522
+Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/a93f86330ec4d8fec4010074ee5a8aa2102776cd
 
 --- a/Source/Core/Core/CMakeLists.txt
 +++ b/Source/Core/Core/CMakeLists.txt
diff --git a/debian/patches/09_sfml-use-2.1.patch b/debian/patches/08_sfml-use-2.1.patch
similarity index 99%
rename from debian/patches/09_sfml-use-2.1.patch
rename to debian/patches/08_sfml-use-2.1.patch
index 3d24cd6..1b57efd 100644
--- a/debian/patches/09_sfml-use-2.1.patch
+++ b/debian/patches/08_sfml-use-2.1.patch
@@ -2,6 +2,7 @@ Description: Use SFML 2.1 instead of SFML 1.6.
  A modified version updated to use C++11 was forwarded upstream by James Cowgill.
 Author: Brandon Barnes <winterknight at nerdshack.com>
 Forwarded: https://github.com/dolphin-emu/dolphin/pull/1522
+Applied-Upstream: https://github.com/dolphin-emu/dolphin/commit/a93f86330ec4d8fec4010074ee5a8aa2102776cd
 
 --- a/Source/Core/Core/Src/NetPlayClient.cpp
 +++ b/Source/Core/Core/Src/NetPlayClient.cpp
diff --git a/debian/patches/series b/debian/patches/series
index b753643..66a9400 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@
 02_fixes-for-libav-10.patch
 03_fixes-for-polarssl-1.3.patch
 04_use-polarssl-aes.patch
-06_remove-powerpcdisasm.patch
-07_fix-findminiupnpc-warnings.patch
-08_cmake-sfml-fixes.patch
-09_sfml-use-2.1.patch
+05_remove-powerpcdisasm.patch
+06_fix-findminiupnpc-warnings.patch
+07_cmake-sfml-fixes.patch
+08_sfml-use-2.1.patch

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