Control: tags -1 pending

On Tue, 19 Jan 2016 16:42:40 -0800 Martin Michlmayr <t...@hpe.com> wrote:
> Package: open-invaders
> Version: 0.3-4.1
> Severity: important
> User: debian-...@lists.debian.org
> Usertags: ftbfs-gcc-6 gcc-6-cannot-convert
> 
> This package fails to build with GCC 6.  GCC 6 has not been released
> yet, but it's expected that GCC 6 will become the default compiler for
> stretch.
> 
> Note that only the first error is reported; there might be more.  You
> can find a snapshot of GCC 6 in experimental.  To build with GCC 6,
> you can set CC=gcc-6 CXX=g++-6 explicitly.

[...]

Dear maintainer,

I've uploaded a NMU versioned as 0.3-4.2. It fixes the FTBFS with GCC-6
and changes the compat level to 10 which also resolves #727477.

Please find attached the debdiff.

Regards,

Markus
diff -Nru open-invaders-0.3/debian/changelog open-invaders-0.3/debian/changelog
--- open-invaders-0.3/debian/changelog  2014-10-16 16:16:26.000000000 +0200
+++ open-invaders-0.3/debian/changelog  2016-09-27 21:31:32.000000000 +0200
@@ -1,3 +1,13 @@
+open-invaders (0.3-4.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add gcc6.patch and fix FTBFS with GCC-6. (Closes: #811654)
+  * Switch to compat level 10. (Closes: #727477)
+  * Update Homepage field and point to tracker.debian.org because the old
+    homepage is blacklisted in Firefox.
+
+ -- Markus Koschany <a...@debian.org>  Tue, 27 Sep 2016 21:31:32 +0200
+
 open-invaders (0.3-4.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru open-invaders-0.3/debian/compat open-invaders-0.3/debian/compat
--- open-invaders-0.3/debian/compat     2011-09-03 21:58:26.000000000 +0200
+++ open-invaders-0.3/debian/compat     2016-09-27 21:31:32.000000000 +0200
@@ -1 +1 @@
-5
+10
diff -Nru open-invaders-0.3/debian/control open-invaders-0.3/debian/control
--- open-invaders-0.3/debian/control    2012-09-10 15:12:16.000000000 +0200
+++ open-invaders-0.3/debian/control    2016-09-27 21:31:32.000000000 +0200
@@ -2,8 +2,8 @@
 Section: games
 Priority: optional
 Maintainer: Siegfried-Angel Gevatter Pujals <rai...@ubuntu.com>
-Homepage: http://www.jamyskis.net/invaders.php
-Build-Depends: debhelper (>= 7.0.50),
+Homepage: https://tracker.debian.org/pkg/open-invaders
+Build-Depends: debhelper (>= 10),
  autotools-dev,
  libaldmb1-dev (>= 1:0.9.3),
  liballegro4-dev,
diff -Nru open-invaders-0.3/debian/patches/gcc6.patch 
open-invaders-0.3/debian/patches/gcc6.patch
--- open-invaders-0.3/debian/patches/gcc6.patch 1970-01-01 01:00:00.000000000 
+0100
+++ open-invaders-0.3/debian/patches/gcc6.patch 2016-09-27 21:31:32.000000000 
+0200
@@ -0,0 +1,44 @@
+From: Markus Koschany <a...@debian.org>
+Date: Tue, 27 Sep 2016 21:23:50 +0200
+Subject: gcc6
+
+Fix FTBFS with GCC-6.
+
+Debian-Bug: https://bugs.debian.org/811654
+Forwarded: no
+---
+ src/init.cc | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/init.cc b/src/init.cc
+index 29d24f5..f7427ac 100644
+--- a/src/init.cc
++++ b/src/init.cc
+@@ -349,7 +349,8 @@ void load_config()
+       
+       do
+       {
+-              success_check=configfile >> string_to_compare;
++              if(configfile >> string_to_compare)
++                      success_check=true;
+               if(success_check)
+               {
+                       position_of_equals=string_to_compare.find("=");
+@@ -635,7 +636,7 @@ BITMAP *oi_load_graphic(std::string filename, std::string 
defsymbol)
+       if(!loaded_graphic)
+       {
+               cout << "Fatal error: Could not load file " << filename << "\n";
+-              return false;
++              return 0;
+       }
+       
+       return loaded_graphic;
+@@ -661,7 +662,7 @@ SAMPLE *oi_load_sfx(std::string filename, std::string 
defsymbol)
+       if(!loaded_sound)
+       {
+               cout << "Fatal error: Could not load file " << filename << "\n";
+-              return false;
++              return 0;
+       }
+       
+       return loaded_sound;
diff -Nru open-invaders-0.3/debian/patches/series 
open-invaders-0.3/debian/patches/series
--- open-invaders-0.3/debian/patches/series     2012-06-06 11:58:07.000000000 
+0200
+++ open-invaders-0.3/debian/patches/series     2016-09-27 21:31:32.000000000 
+0200
@@ -1,3 +1,4 @@
 fix_ftbfs_gcc45.patch
 fix_pmask_amd64.patch
 format_security.patch
+gcc6.patch

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to