[rbdoom3bfg] 04/06: Refreshing patches, remove 70-ffmpeg_2.9.patch, update 20-reproducible.patch (additional __DATE__)

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository rbdoom3bfg.

commit d6e95bb16aa86d5f596bb86fd301eae9f564992e
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Sun Oct 9 16:37:06 2016 +0200

    Refreshing patches, remove 70-ffmpeg_2.9.patch, update 20-reproducible.patch (additional __DATE__)
---
 debian/changelog                                     |  3 +++
 debian/patches/10-lowercase-executeable.patch        |  4 ++--
 debian/patches/20-reproducible.patch                 | 13 ++++++++++++-
 debian/patches/70-ffmpeg_2.9.patch                   |  1 +
 debian/patches/{libpng16.patch => 80-libpng16.patch} |  0
 debian/patches/series                                |  4 ++--
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6de1d72..6472a40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 rbdoom3bfg (1.1.0~preview3+repack1+git20160807-1) UNRELEASED; urgency=medium
 
   * New upstream git snapshot.
+    - Refreshed patches to remove fuzz
+    - 70-ffmpeg_2.9.patch is obsolete, upstream fixed issue, so rm from series.
+    - 20-reproducible.patch updated to remove one additional __DATE__.
   * Fix typo in d/README.source -- the var is UPSVER not USVER.
 
  -- Tobias Frost <tobi at debian.org>  Sun, 09 Oct 2016 16:14:19 +0200
diff --git a/debian/patches/10-lowercase-executeable.patch b/debian/patches/10-lowercase-executeable.patch
index 0255ac0..ffae957 100644
--- a/debian/patches/10-lowercase-executeable.patch
+++ b/debian/patches/10-lowercase-executeable.patch
@@ -5,7 +5,7 @@ Forwarded: no, Debian specific
 Last-Update: 2014-10-07
 --- a/neo/CMakeLists.txt
 +++ b/neo/CMakeLists.txt
-@@ -1569,14 +1569,14 @@
+@@ -1492,14 +1492,14 @@
  		add_dependencies(precomp_header_rbdoom3bfg idlib)
  	endif()
  	
@@ -23,7 +23,7 @@ Last-Update: 2014-10-07
  	endif()	
  
  	if(NOT WIN32)
-@@ -1584,7 +1584,7 @@
+@@ -1507,7 +1507,7 @@
  			set(RT_LIBRARY rt)
  		endif()
  
diff --git a/debian/patches/20-reproducible.patch b/debian/patches/20-reproducible.patch
index f8d80ee..aefe0c6 100644
--- a/debian/patches/20-reproducible.patch
+++ b/debian/patches/20-reproducible.patch
@@ -18,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  } version;
 --- a/neo/d3xp/Game_local.cpp
 +++ b/neo/d3xp/Game_local.cpp
-@@ -315,7 +315,7 @@
+@@ -317,7 +317,7 @@
  	
  	Printf( "--------- Initializing Game ----------\n" );
  	Printf( "gamename: %s\n", GAME_VERSION );
@@ -59,3 +59,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  }
  
  /*
+--- a/neo/framework/Console.cpp
++++ b/neo/framework/Console.cpp
+@@ -1189,7 +1189,7 @@
+ 	
+ 	// RB begin
+ 	//idStr version = va( "%s.%i.%i", ENGINE_VERSION, BUILD_NUMBER, BUILD_NUMBER_MINOR );
+-	idStr version = va( "%s %s %s %s", ENGINE_VERSION, BUILD_STRING, __DATE__, __TIME__ );
++	idStr version = va( "%s %s (Debian package)", ENGINE_VERSION, BUILD_STRING);
+ 	//idStr version = com_version.GetString();
+ 	// RB end
+ 	
diff --git a/debian/patches/70-ffmpeg_2.9.patch b/debian/patches/70-ffmpeg_2.9.patch
index d70b329..09d7e99 100644
--- a/debian/patches/70-ffmpeg_2.9.patch
+++ b/debian/patches/70-ffmpeg_2.9.patch
@@ -2,6 +2,7 @@ Description: Replace deprecated FFmpeg API
 Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
 Bug-Debian: https://bugs.debian.org/803857
 Forwarded: https://github.com/RobertBeckebans/RBDOOM-3-BFG/issues/249
+Applied-Upstream: Yes, but different solution.
 Last-Update: 2015-11-02
 
 --- rbdoom3bfg-1.0.3+repack1+git20150806.orig/neo/renderer/Cinematic.cpp
diff --git a/debian/patches/libpng16.patch b/debian/patches/80-libpng16.patch
similarity index 100%
rename from debian/patches/libpng16.patch
rename to debian/patches/80-libpng16.patch
diff --git a/debian/patches/series b/debian/patches/series
index 2473607..acd8f43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 10-lowercase-executeable.patch
 20-reproducible.patch
 #65-init-sdl2.patch
-70-ffmpeg_2.9.patch
-libpng16.patch
+#70-ffmpeg_2.9.patch
+80-libpng16.patch

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