[oolite] 02/02: Update status of some patches.

Tue Sep 8 21:58:21 UTC 2015

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

nicobou-guest pushed a commit to branch master
in repository oolite.

commit f87ea738a51f36c61bd0bb022e2e2cb58deb7b81
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date:   Tue Sep 8 23:43:16 2015 +0200

    Update status of some patches.
---
 .../avoid_infinite_recursion_in_verify_descriptions.diff      |  1 +
 debian/patches/generate_planet_data.diff                      |  2 +-
 debian/patches/gnustep_app_builder.diff                       | 11 +++++++++++
 debian/patches/secure-format-log-string.diff                  | 10 ++++++++--
 debian/patches/typo.diff                                      |  1 +
 debian/rules                                                  |  1 +
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/patches/avoid_infinite_recursion_in_verify_descriptions.diff b/debian/patches/avoid_infinite_recursion_in_verify_descriptions.diff
index b9826d9..67853fa 100644
--- a/debian/patches/avoid_infinite_recursion_in_verify_descriptions.diff
+++ b/debian/patches/avoid_infinite_recursion_in_verify_descriptions.diff
@@ -1,5 +1,6 @@
 Description: avoid an infinite recursion between VerifyDesc and descriptions.
 Author: Nicolas Boulenguez <nicolas at debian.org>
+Applied-Upstream: https://github.com/OoliteProject/oolite/commit/134b07bc091ec2415fcfed195d479b7f12eda018
 
 --- a/src/Core/Universe.m
 +++ b/src/Core/Universe.m
diff --git a/debian/patches/generate_planet_data.diff b/debian/patches/generate_planet_data.diff
index 3b77735..46ceb51 100644
--- a/debian/patches/generate_planet_data.diff
+++ b/debian/patches/generate_planet_data.diff
@@ -2,7 +2,7 @@ Description: GNUmakefile compiling tools/icosmesh
  Whatever the locale, use a dot as decimal separator
  in the produced C code.
 Author: Nicolas Boulenguez <nicolas at debian.org>
-Forwarded: Michael Werle <micha at michaelwerle.com>
+Applied-Upstream: https://github.com/OoliteProject/oolite/commit/d8b75e912031a901e1c9cb5362f05dbc7c256f49
 
 --- a/tools/icosmesh/main.m
 +++ b/tools/icosmesh/main.m
diff --git a/debian/patches/gnustep_app_builder.diff b/debian/patches/gnustep_app_builder.diff
index 7291065..110f061 100644
--- a/debian/patches/gnustep_app_builder.diff
+++ b/debian/patches/gnustep_app_builder.diff
@@ -17,13 +17,24 @@ Description: use GNUstep application builder
  to ooliteInfo.plist will allow to remove more lines from
  GNUmakefile.postamble.
  .
+ Answer from Chris Morris <cim at oolite.org>:
+ Moving to application.make is a good thing - but this unfortunately makes
+ the file less useful for developing Oolite. The old file you could
+ separately build debug and release targets, and they'd save compiled objects
+ to different subfolders, so you didn't have to do a "make clean" before
+ switching between release and debug builds, and building a debug build
+ wouldn't wipe the release executable.
+ .
  Even if these changes are refused, please consider replacing
  "ifeq ($(debug),no) $(STRIP)..." with "ifneq ($(debug),yes) $(STRIP)..."
  as an unset debug variable means no.
  Or even better by "ifeq ($(strip),yes) $(STRIP)..." to conform
  to the GNUstep conventions and allow selecting independently
  the stripping policy and the debug level.
+ .
+ Done, see Applied-Upstream field. Should allow to simplify debian/rules.
 Forwarded: Michael Werle <micha at michaelwerle.com>
+Applied-Upstream: https://github.com/OoliteProject/oolite/commit/622b05a99073c374d4fc93bab82fcead5ecbb069
 
 --- a/GNUmakefile
 +++ b/GNUmakefile
diff --git a/debian/patches/secure-format-log-string.diff b/debian/patches/secure-format-log-string.diff
index f0f5741..95d3ad9 100644
--- a/debian/patches/secure-format-log-string.diff
+++ b/debian/patches/secure-format-log-string.diff
@@ -1,11 +1,17 @@
 Description: compile with -Werror=format-security, default with gcc-5
  There is probably no security problem in most cases,
  but as @"foo" cannot depend on user input even if non static.
+ .
+ The Origin and Applied-Upstream commits are both needed to fix the issue.
+ .
+ Chris Morris <cim at oolite.org>:
+ I think this is probably a GCC5 bug, since these are static objc strings,
+ and GCC4.9 with the warning option enabled doesn't warn about any of them.
 Origin: https://github.com/OoliteProject/oolite/commit/80835961e0d0fad8c9dd1bfbd26706808360c66f
-Applied-Upstream: https://github.com/OoliteProject/oolite/commit/80835961e0d0fad8c9dd1bfbd26706808360c66f
+Applied-Upstream: https://github.com/OoliteProject/oolite/commit/a439f3de41c0ee967c11a5728db54b79fdd3ec55
 Author: Chris Morris <cim at oolite.org>
+Author: Nicolas Boulenguez <nicolas at debian.org>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778039
-Forwarded: not-needed
 
 --- a/src/Core/Entities/PlayerEntityLegacyScriptEngine.m
 +++ b/src/Core/Entities/PlayerEntityLegacyScriptEngine.m
diff --git a/debian/patches/typo.diff b/debian/patches/typo.diff
index 5066209..47bf26d 100644
--- a/debian/patches/typo.diff
+++ b/debian/patches/typo.diff
@@ -1,5 +1,6 @@
 Description : typo
 Author: Nicolas Boulenguez <nicolas at debian.org>
+Applied-Upstream: https://github.com/OoliteProject/oolite/commit/36931199ed50c6cf6cbf8d2995cfe3bc3886d821
 
 --- a/src/Core/OOCacheManager.m
 +++ b/src/Core/OOCacheManager.m
diff --git a/debian/rules b/debian/rules
index 68b5283..f1a9d3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,7 @@ GSMAKE += messages=yes
 # Usually, "debug=yes strip=no" would be enough, but upstream uses
 # "debug" to toggle many unrelated settings, for example libmozjs
 # debugging and stripping of the binary.
+# Upstream has fixed this: https://github.com/OoliteProject/oolite/commit/622b05a99073c374d4fc93bab82fcead5ecbb069
 GSMAKE += STRIP=/bin/true
 
 DEB_LDFLAGS_MAINT_PREPEND := -Wl,-z,defs -Wl,--as-needed

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

