Control: tags 1002964 + pending
Dear maintainer,
I've prepared an NMU for netpanzer (versioned as 0.8.7+ds-4.1) and
uploaded it to DELAYED/14. Please feel free to tell me if I should
cancel it.
cu
Adrian
diff -Nru netpanzer-0.8.7+ds/debian/changelog netpanzer-0.8.7+ds/debian/changelog
--- netpanzer-0.8.7+ds/debian/changelog 2021-10-22 00:16:42.000000000 +0300
+++ netpanzer-0.8.7+ds/debian/changelog 2022-11-20 00:32:24.000000000 +0200
@@ -1,3 +1,11 @@
+netpanzer (0.8.7+ds-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch from László Böszörményi to fix FTBFS with SCons >= 4.2.0.
+ (Closes: #1002964)
+
+ -- Adrian Bunk <b...@debian.org> Sun, 20 Nov 2022 00:32:24 +0200
+
netpanzer (0.8.7+ds-4) unstable; urgency=medium
* Team upload.
diff -Nru netpanzer-0.8.7+ds/debian/patches/netpanzer_SCons_fix.patch netpanzer-0.8.7+ds/debian/patches/netpanzer_SCons_fix.patch
--- netpanzer-0.8.7+ds/debian/patches/netpanzer_SCons_fix.patch 1970-01-01 02:00:00.000000000 +0200
+++ netpanzer-0.8.7+ds/debian/patches/netpanzer_SCons_fix.patch 2022-11-20 00:31:50.000000000 +0200
@@ -0,0 +1,19 @@
+Description: SCons 4.2.0 no longer has env.has_key()
+ Check env as an array.
+Author: Laszlo Boszormenyi (GCS) <g...@debian.org>
+Forwarded: no
+Last-Update: 2022-01-01
+
+---
+
+--- netpanzer-0.8.7+ds.orig/SConstruct
++++ netpanzer-0.8.7+ds/SConstruct
+@@ -237,7 +237,7 @@ npdirs = """
+ """
+
+ env.Append( NPSOURCES = globSources(env, 'src/NetPanzer', npdirs, "*.cpp") )
+-if env.has_key('WINICON'):
++if 'WINICON' in env:
+ env.Append( NPSOURCES = env['WINICON'] )
+
+ env.Prepend( LIBS = ['np2d','lua5.1','npnetwork','nplibs','physfs'] )
diff -Nru netpanzer-0.8.7+ds/debian/patches/series netpanzer-0.8.7+ds/debian/patches/series
--- netpanzer-0.8.7+ds/debian/patches/series 2021-10-22 00:16:42.000000000 +0300
+++ netpanzer-0.8.7+ds/debian/patches/series 2022-11-20 00:32:20.000000000 +0200
@@ -6,3 +6,4 @@
reproducible-build.patch
scons.patch
gcc11.patch
+netpanzer_SCons_fix.patch
