r15769 - in packages/trunk/warzone2100/debian: . patches
Markus Koschany
apo at moszumanska.debian.org
Sun May 1 15:02:27 UTC 2016
Author: apo
Date: 2016-05-01 15:02:26 +0000 (Sun, 01 May 2016)
New Revision: 15769
Added:
packages/trunk/warzone2100/debian/patches/fix-yacc.patch
packages/trunk/warzone2100/debian/patches/redefinition-FTBFS.patch
Removed:
packages/trunk/warzone2100/debian/patches/fix-yacc.diff
Modified:
packages/trunk/warzone2100/debian/changelog
packages/trunk/warzone2100/debian/control
packages/trunk/warzone2100/debian/copyright
packages/trunk/warzone2100/debian/patches/series
packages/trunk/warzone2100/debian/rules
Log:
Release 3.1.1-3
Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog 2016-04-29 02:21:11 UTC (rev 15768)
+++ packages/trunk/warzone2100/debian/changelog 2016-05-01 15:02:26 UTC (rev 15769)
@@ -1,3 +1,21 @@
+warzone2100 (3.1.1-3) unstable; urgency=medium
+
+ * Team upload.
+ * Rebase fix-yacc patch.
+ * Add redefinition-FTBFS.patch
+ Adjust lexer files to prevent a FTBFS with newer flex versions.
+ (Closes: #818072)
+ * Declare compliance with Debian Policy 3.9.8.
+ * Vcs-Browser: Use https.
+ * debian/control: Change Recommends: warzone2100 to Suggests.
+ * Drop debug package and use the automatically provided -dbgsym package
+ instead.
+ * Fix Lintian warnings space-in-std-shortname-in-dep5-copyright,
+ unused-file-paragraph-in-dep5-copyright and
+ wildcard-matches-nothing-in-dep5-copyright in debian/copyright.
+
+ -- Markus Koschany <apo at debian.org> Sun, 01 May 2016 16:31:18 +0200
+
warzone2100 (3.1.1-2) unstable; urgency=medium
* Fix FTBFS with GLEW 1.12 using upstream patch (Closes: #790857)
Modified: packages/trunk/warzone2100/debian/control
===================================================================
--- packages/trunk/warzone2100/debian/control 2016-04-29 02:21:11 UTC (rev 15768)
+++ packages/trunk/warzone2100/debian/control 2016-05-01 15:02:26 UTC (rev 15769)
@@ -41,10 +41,10 @@
xsltproc,
xvfb,
zip
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Homepage: http://www.wz2100.net/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/warzone2100/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/warzone2100/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/warzone2100/
Package: warzone2100
Architecture: any
@@ -78,7 +78,7 @@
Architecture: all
Depends:
${misc:Depends}
-Recommends:
+Suggests:
warzone2100
Description: data files for warzone2100
This package contains data, docs and translations for the warzone2100 game.
@@ -87,25 +87,11 @@
a more advanced AI, different terrain textures, new maps and scavengers)
and documentation for the game.
-Package: warzone2100-dbg
-Section: debug
-Architecture: any
-Priority: extra
-Depends:
- warzone2100 (= ${binary:Version}),
- ${misc:Depends}
-Description: debug files for warzone2100
- This package contains debug information for the warzone2100 game.
- .
- It can be used to debug warzone2100 using GDB if the game crashes
- due to programming errors. warzone2100 also generates crash dumps
- and places them in the /tmp directory.
-
Package: warzone2100-music
Architecture: all
Depends:
${misc:Depends}
-Recommends:
+Suggests:
warzone2100
Description: official music for warzone2100
This package contains official music for the warzone2100 game.
Modified: packages/trunk/warzone2100/debian/copyright
===================================================================
--- packages/trunk/warzone2100/debian/copyright 2016-04-29 02:21:11 UTC (rev 15768)
+++ packages/trunk/warzone2100/debian/copyright 2016-05-01 15:02:26 UTC (rev 15769)
@@ -52,27 +52,32 @@
Files: 3rdparty/quesoglc/GL/glc.h
Copyright: 2002, 2004-2007, Bertrand Coconnier
1999-2001, Brian Paul
-License: LGPL-2.1+ and MIT (Brian Paul)
+License: LGPL-2.1+ and MIT-(Brian-Paul)
Files: 3rdparty/miniupnpc/*
Copyright: 2005-2010, Thomas Bernard
-License: BSD-3-clause (miniupnpc)
+License: BSD-3-clause-(miniupnpc)
Files: 3rdparty/miniupnpc/bsdqueue.h
Copyright: 1991, 1993, the Regents of the University of California
License: BSD-3-clause
-Files: */*_parser.cpp, */*_parser.h
+Files: */*_parser.cpp
+ */*_parser.h
Copyright: 1984-2006, Free Software Foundation, Inc.
-License: GPL-3+ with bison exception
+License: GPL-3+-with-bison-exception
-Files: ylwrap, missing, depcomp, config.sub, config.guess
+Files: ylwrap
+ missing
+ depcomp
+ config.sub
+ config.guess
Copyright: 1996-2009, Free Software Foundation, Inc.
-License: GPL-2+ with autoconf exception
+License: GPL-2+-with-autoconf-exception
Files: configure
Copyright: 1992-2009 Free Software Foundation, Inc.
-License: GAP configure
+License: GAP-configure
Files: aclocal.m4
Copyright: 1996-2009, Free Software Foundation, Inc.
@@ -80,7 +85,7 @@
Files: install-sh
Copyright: 1994 X Consortium
-License: MIT (X11)
+License: MIT-(X11)
Files: win32/download.pl
Copyright: 2006 OpenWrt.org
@@ -97,7 +102,8 @@
1997 José Fonseca
License: GPL-2+
-Files: lib/framework/stdio_ext.cpp, lib/framework/wzglobal.h
+Files: lib/framework/stdio_ext.cpp
+ lib/framework/wzglobal.h
Copyright: 1992-2007 Trolltech ASA., 2005-2013 Warzone 2100 Project
License: GPL-2+
@@ -111,12 +117,8 @@
Files: lib/sequence/sequence.cpp
Copyright: 2008-2013 Warzone 2100 Project
2002-2007 Xiph.org Foundation
-License: GPL-2+ and BSD-3-clause (Xiph)
+License: GPL-2+ and BSD-3-clause-(Xiph)
-Files: lib/ivis_common/jpeg_encoder.*
-Copyright: 2005-2009 Surveyor Corporation
-License: GPL-2+
-
Files: m4/*.m4
Copyright: 1995-2007, Free Software Foundation, Inc.
License: GAP
@@ -125,32 +127,33 @@
Copyright: 2004 Scott James Remnant <scott at netsplit.com>
License: GPL-2+
-Files: m4/progversion.m4, m4/strlfuncs.m4
+Files: m4/progversion.m4
+ m4/strlfuncs.m4
Copyright: 2008-2009, Giel van Schijndel
2008-2009, Warzone Resurrection Project
-License: GAP Giel
+License: GAP-Giel
Files: m4/ax_with_prog.m4
Copyright: 2008 Francesco Salvestrini
2008 Dustin J. Mitchell
-License: GAP other
+License: GAP-other
Files: m4/ax_prog_perl_version.m4
Copyright: 2008 Francesco Salvestrini
-License: GAP other
+License: GAP-other
Files: m4/ax_compare_version.m4
Copyright: 2008 Tim Toolan
-License: GAP other
+License: GAP-other
Files: m4/ax_tls.m4
Copyright: 2008 Alan Woodland
2010 Diego Elio Petteno
-License: GPL-3+ with autoconf-archive exception
+License: GPL-3+-with-autoconf-archive-exception
Files: m4/ax_c_check_flag.m4
Copyright: 2008 Francesco Salvestrini
-License: GPL-3+ with autoconf-archive exception
+License: GPL-3+-with-autoconf-archive-exception
Files: pkg/nsis/*.nsi
Copyright: 2006 Dennis Schridde, 2006-2010 Warzone 2100 Project
@@ -158,11 +161,11 @@
Files: */Makefile.in
Copyright: 1994-2009 Free Software Foundation Inc.
-License: GAP Makefile.in
+License: GAP-Makefile.in
Files: po/Makefile.in.in
Copyright: 1995-1997, 2000-2007 Ulrich Drepper
-License: GAP po/Makefile.in.in
+License: GAP-po/Makefile.in.in
Files: po/*.po
Copyright: 2007-2008, Warzone 2100 Resurrection Project
@@ -186,10 +189,6 @@
Copyright: 2007-2008 Bruce V. Edwards
License: CC-BY-SA-3.0
-Files: data/texpages/bdrops/backdrop4.png, data/texpages/bdrops/backdrop6.png
-Copyright: 2010-2011, jorzi
-License: CC0
-
Files: doc/quickstartguide.*
Copyright: Ben Latimore, Guangcong Luo
License: CC0
@@ -203,16 +202,16 @@
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
-License: GAP configure
+License: GAP-configure
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-License: GAP Giel
+License: GAP-Giel
This file is free software; I, Giel van Schijndel give unlimited
permission to copy and/or distribute it, with or without modficiations,
as long as this notice is preserved.
-License: GAP Makefile.in
+License: GAP-Makefile.in
This Makefile.in is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
@@ -222,7 +221,7 @@
even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE.
-License: GAP po/Makefile.in.in
+License: GAP-po/Makefile.in.in
This file can be copied and used freely without restrictions. It can
be used in projects which are not available under the GNU General Public
License but which still want to provide support for the GNU gettext
@@ -230,7 +229,7 @@
Please note that the actual code of GNU gettext is covered by the GNU
General Public License and is *not* in the public domain.
-License: GAP other
+License: GAP-other
Copying and distribution of this file, with or without modification, are
permitted in any medium without royalty provided the copyright notice
and this notice are preserved.
@@ -259,7 +258,7 @@
On Debian systems, the complete text of the GNU General Public License
can be found in `/usr/share/common-licenses/GPL-2'.
-License: GPL-2+ with autoconf exception
+License: GPL-2+-with-autoconf-exception
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
@@ -281,7 +280,7 @@
On Debian systems, the complete text of the GNU General Public License
can be found in `/usr/share/common-licenses/GPL-2'.
-License: GPL-3+ with autoconf-archive exception
+License: GPL-3+-with-autoconf-archive-exception
This program is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
@@ -311,7 +310,7 @@
On Debian systems, the complete text of the GNU General Public License
can be found in `/usr/share/common-licenses/GPL-3'.
-License: GPL-3+ with bison exception
+License: GPL-3+-with-bison-exception
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
@@ -381,7 +380,7 @@
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
-License: BSD-3-clause (miniupnpc)
+License: BSD-3-clause-(miniupnpc)
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
.
@@ -405,7 +404,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-License: BSD-3-clause (Xiph)
+License: BSD-3-clause-(Xiph)
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -433,7 +432,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-License: MIT (Brian Paul)
+License: MIT-(Brian-Paul)
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
@@ -451,7 +450,7 @@
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-License: MIT (X11)
+License: MIT-(X11)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
Deleted: packages/trunk/warzone2100/debian/patches/fix-yacc.diff
===================================================================
--- packages/trunk/warzone2100/debian/patches/fix-yacc.diff 2016-04-29 02:21:11 UTC (rev 15768)
+++ packages/trunk/warzone2100/debian/patches/fix-yacc.diff 2016-05-01 15:02:26 UTC (rev 15769)
@@ -1,117 +0,0 @@
-Description: fix yacc
-Author: Clint Adams <clint at debian.org>
-Forwarded: no
---- a/lib/framework/strres_parser.ypp
-+++ b/lib/framework/strres_parser.ypp
-@@ -32,19 +32,18 @@
- extern int strres_get_lineno(void);
- extern char* strres_get_text(void);
-
--void yyerror(const char* msg)
--{
-- debug(LOG_ERROR, "STRRES file parse error:\n%s at line %d\nText: '%s'", msg, strres_get_lineno(), strres_get_text());
--}
--
- // Forward declaration to allow pointers to this type
- struct STR_RES;
-
--#define YYPARSE_PARAM psStrRes
-+void yyerror(struct STR_RES *p, const char* msg)
-+{
-+ debug(LOG_ERROR, "STRRES file parse error:\n%s at line %d\nText: '%s'", msg, strres_get_lineno(), strres_get_text());
-+}
-
- %}
-
--%name-prefix="strres_"
-+%parse-param {struct STR_RES *psStrRes}
-+%name-prefix "strres_"
-
- %union {
- char *sval;
---- a/lib/framework/resource_parser.ypp
-+++ b/lib/framework/resource_parser.ypp
-@@ -47,7 +47,7 @@
-
- %}
-
--%name-prefix="res_"
-+%name-prefix "res_"
-
- %union {
- char *sval;
---- a/lib/gamelib/audp_parser.ypp
-+++ b/lib/gamelib/audp_parser.ypp
-@@ -39,7 +39,7 @@
-
- %}
-
--%name-prefix="audp_"
-+%name-prefix "audp_"
-
- %union {
- float fval;
---- a/lib/script/chat_parser.ypp
-+++ b/lib/script/chat_parser.ypp
-@@ -173,7 +173,7 @@
-
- %}
-
--%name-prefix="chat_"
-+%name-prefix "chat_"
-
- %union {
- int32_t bval;
---- a/lib/script/script_parser.ypp
-+++ b/lib/script/script_parser.ypp
-@@ -1554,7 +1554,7 @@
-
- %}
-
--%name-prefix="scr_"
-+%name-prefix "scr_"
-
- %union {
- /* Types returned by the lexer */
---- a/src/scriptvals_parser.ypp
-+++ b/src/scriptvals_parser.ypp
-@@ -113,7 +113,7 @@
-
- %}
-
--%name-prefix="scrv_"
-+%name-prefix "scrv_"
- %defines
- %error-verbose
-
---- a/lib/framework/strres_lexer.lpp
-+++ b/lib/framework/strres_lexer.lpp
-@@ -105,7 +105,7 @@
- /* Match quoted text */
- \" { BEGIN QUOTE; }
- <QUOTE>\" { BEGIN 0; }
--<QUOTE>\n { strres_error("Unexpected end of line in string"); }
-+<QUOTE>\n { strres_error(NULL, "Unexpected end of line in string"); }
- <QUOTE>[^\"\n]* {
- strres_lval.sval = strdup(yytext);
- return QTEXT_T;
---- a/lib/framework/strresly.h
-+++ b/lib/framework/strresly.h
-@@ -29,7 +29,7 @@
- extern void strres_set_extra(YY_EXTRA_TYPE user_defined);
-
- /* Call the yacc parser */
--extern int strres_parse(void* psStrRes);
-+extern int strres_parse(struct STR_RES *psStrRes);
-
- /* Destroy the lexer */
- extern int strres_lex_destroy(void);
-@@ -34,7 +34,7 @@
- /* Destroy the lexer */
- extern int strres_lex_destroy(void);
-
--void strres_error(const char* msg);
-+void strres_error(struct STR_RES *p, const char* msg);
-
- /* Store a string */
- extern bool strresStoreString(struct STR_RES *psRes, const char* pID, const char* pString);
Added: packages/trunk/warzone2100/debian/patches/fix-yacc.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/fix-yacc.patch (rev 0)
+++ packages/trunk/warzone2100/debian/patches/fix-yacc.patch 2016-05-01 15:02:26 UTC (rev 15769)
@@ -0,0 +1,143 @@
+From: Clint Adams <clint at debian.org>
+Date: Sun, 1 May 2016 14:46:49 +0200
+Subject: fix yacc
+
+Forwarded: no
+---
+ lib/framework/resource_parser.ypp | 2 +-
+ lib/framework/strres_lexer.lpp | 2 +-
+ lib/framework/strres_parser.ypp | 13 ++++++-------
+ lib/framework/strresly.h | 4 ++--
+ lib/gamelib/audp_parser.ypp | 2 +-
+ lib/script/chat_parser.ypp | 2 +-
+ lib/script/script_parser.ypp | 2 +-
+ src/scriptvals_parser.ypp | 2 +-
+ 8 files changed, 14 insertions(+), 15 deletions(-)
+
+diff --git a/lib/framework/resource_parser.ypp b/lib/framework/resource_parser.ypp
+index 0d64c01..e3ff6d7 100644
+--- a/lib/framework/resource_parser.ypp
++++ b/lib/framework/resource_parser.ypp
+@@ -47,7 +47,7 @@ void yyerror(const char* msg)
+
+ %}
+
+-%name-prefix="res_"
++%name-prefix "res_"
+
+ %union {
+ char *sval;
+diff --git a/lib/framework/strres_lexer.lpp b/lib/framework/strres_lexer.lpp
+index 79e8e6e..4e6b330 100644
+--- a/lib/framework/strres_lexer.lpp
++++ b/lib/framework/strres_lexer.lpp
+@@ -105,7 +105,7 @@ extern void strres_set_debug(int bdebug);
+ /* Match quoted text */
+ \" { BEGIN QUOTE; }
+ <QUOTE>\" { BEGIN 0; }
+-<QUOTE>\n { strres_error("Unexpected end of line in string"); }
++<QUOTE>\n { strres_error(NULL, "Unexpected end of line in string"); }
+ <QUOTE>[^\"\n]* {
+ strres_lval.sval = strdup(yytext);
+ return QTEXT_T;
+diff --git a/lib/framework/strres_parser.ypp b/lib/framework/strres_parser.ypp
+index 4a9aa02..1158420 100644
+--- a/lib/framework/strres_parser.ypp
++++ b/lib/framework/strres_parser.ypp
+@@ -32,19 +32,18 @@ extern int strres_lex(void);
+ extern int strres_get_lineno(void);
+ extern char* strres_get_text(void);
+
+-void yyerror(const char* msg)
+-{
+- debug(LOG_ERROR, "STRRES file parse error:\n%s at line %d\nText: '%s'", msg, strres_get_lineno(), strres_get_text());
+-}
+-
+ // Forward declaration to allow pointers to this type
+ struct STR_RES;
+
+-#define YYPARSE_PARAM psStrRes
++void yyerror(struct STR_RES *p, const char* msg)
++{
++ debug(LOG_ERROR, "STRRES file parse error:\n%s at line %d\nText: '%s'", msg, strres_get_lineno(), strres_get_text());
++}
+
+ %}
+
+-%name-prefix="strres_"
++%parse-param {struct STR_RES *psStrRes}
++%name-prefix "strres_"
+
+ %union {
+ char *sval;
+diff --git a/lib/framework/strresly.h b/lib/framework/strresly.h
+index 1c6065d..f97016c 100644
+--- a/lib/framework/strresly.h
++++ b/lib/framework/strresly.h
+@@ -29,12 +29,12 @@
+ extern void strres_set_extra(YY_EXTRA_TYPE user_defined);
+
+ /* Call the yacc parser */
+-extern int strres_parse(void* psStrRes);
++extern int strres_parse(struct STR_RES *psStrRes);
+
+ /* Destroy the lexer */
+ extern int strres_lex_destroy(void);
+
+-void strres_error(const char* msg);
++void strres_error(struct STR_RES *p, const char* msg);
+
+ /* Store a string */
+ extern bool strresStoreString(struct STR_RES *psRes, const char* pID, const char* pString);
+diff --git a/lib/gamelib/audp_parser.ypp b/lib/gamelib/audp_parser.ypp
+index eb11550..fcff8b5 100644
+--- a/lib/gamelib/audp_parser.ypp
++++ b/lib/gamelib/audp_parser.ypp
+@@ -39,7 +39,7 @@ void yyerror(const char* fmt);
+
+ %}
+
+-%name-prefix="audp_"
++%name-prefix "audp_"
+
+ %union {
+ float fval;
+diff --git a/lib/script/chat_parser.ypp b/lib/script/chat_parser.ypp
+index facd3f6..6d25261 100644
+--- a/lib/script/chat_parser.ypp
++++ b/lib/script/chat_parser.ypp
+@@ -173,7 +173,7 @@ static void yyerror(const char* msg);
+
+ %}
+
+-%name-prefix="chat_"
++%name-prefix "chat_"
+
+ %union {
+ int32_t bval;
+diff --git a/lib/script/script_parser.ypp b/lib/script/script_parser.ypp
+index a9a33fa..487ea0d 100644
+--- a/lib/script/script_parser.ypp
++++ b/lib/script/script_parser.ypp
+@@ -1554,7 +1554,7 @@ static CODE_ERROR scriptCodeVarRef(VAR_SYMBOL *psVariable, // The object variab
+
+ %}
+
+-%name-prefix="scr_"
++%name-prefix "scr_"
+
+ %union {
+ /* Types returned by the lexer */
+diff --git a/src/scriptvals_parser.ypp b/src/scriptvals_parser.ypp
+index 3a14a0e..5acbbe4 100644
+--- a/src/scriptvals_parser.ypp
++++ b/src/scriptvals_parser.ypp
+@@ -113,7 +113,7 @@ static bool scrvCheckArrayIndex(SDWORD base, ARRAY_INDEXES *psIndexes, UDWORD *p
+
+ %}
+
+-%name-prefix="scrv_"
++%name-prefix "scrv_"
+ %defines
+ %error-verbose
+
Added: packages/trunk/warzone2100/debian/patches/redefinition-FTBFS.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/redefinition-FTBFS.patch (rev 0)
+++ packages/trunk/warzone2100/debian/patches/redefinition-FTBFS.patch 2016-05-01 15:02:26 UTC (rev 15769)
@@ -0,0 +1,259 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 1 May 2016 14:56:56 +0200
+Subject: redefinition FTBFS
+
+Debian-Bug: https://bugs.debian.org/818072
+Forwarded: no
+---
+ lib/framework/resource_lexer.lpp | 21 ++++++---------------
+ lib/framework/strres_lexer.lpp | 21 ++-------------------
+ lib/gamelib/audp_lexer.lpp | 21 ++-------------------
+ lib/script/chat_lexer.lpp | 9 ---------
+ lib/script/script_lexer.lpp | 9 ---------
+ src/level_lexer.lpp | 21 ++-------------------
+ src/scriptvals_lexer.lpp | 21 ++-------------------
+ 7 files changed, 14 insertions(+), 109 deletions(-)
+
+diff --git a/lib/framework/resource_lexer.lpp b/lib/framework/resource_lexer.lpp
+index b9abf52..352c69d 100644
+--- a/lib/framework/resource_lexer.lpp
++++ b/lib/framework/resource_lexer.lpp
+@@ -52,21 +52,21 @@ static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return tru
+ #if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+ # define yyget_extra res_get_extra
+ # define yyset_extra res_set_extra
+-# define yyget_lineno res_get_lineno
+-# define yyget_text res_get_text
++//# define yyget_lineno res_get_lineno
++//# define yyget_text res_get_text
+ extern void yyset_extra(YY_EXTRA_TYPE user_defined);
+ extern YY_EXTRA_TYPE yyget_extra(void);
+ extern int yyget_lineno(void);
+-int yyget_lineno()
++/*int yyget_lineno()
+ {
+ return yylineno;
+-}
++}*/
+
+ extern char* yyget_text(void);
+-char* yyget_text()
++/*char* yyget_text()
+ {
+ return yytext;
+-}
++}*/
+ #elif defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33
+ extern YY_EXTRA_TYPE yyget_extra(void);
+ extern int res_get_lineno(void);
+@@ -149,12 +149,3 @@ YY_EXTRA_TYPE yyget_extra()
+ /* Older GNU Flex versions don't define yylex_destroy()
+ * (and neither define a subminor version)
+ */
+-#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+-int res_lex_destroy(void)
+-{
+- /* For non-reentrant C scanner only. */
+- yy_delete_buffer(YY_CURRENT_BUFFER);
+- yy_init = 1;
+- return 0;
+-}
+-#endif
+diff --git a/lib/framework/strres_lexer.lpp b/lib/framework/strres_lexer.lpp
+index 4e6b330..11f05e1 100644
+--- a/lib/framework/strres_lexer.lpp
++++ b/lib/framework/strres_lexer.lpp
+@@ -56,21 +56,13 @@ static inline bool no_warn_unused_result(int ignore) { if (ignore) {} return tru
+ #if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+ # define yyget_extra strres_get_extra
+ # define yyset_extra strres_set_extra
+-# define yyget_lineno strres_get_lineno
+-# define yyget_text strres_get_text
++//# define yyget_lineno strres_get_lineno
++//# define yyget_text strres_get_text
+ extern void yyset_extra(YY_EXTRA_TYPE user_defined);
+ extern YY_EXTRA_TYPE yyget_extra(void);
+ extern int yyget_lineno(void);
+-int yyget_lineno()
+-{
+- return yylineno;
+-}
+
+ extern char* yyget_text(void);
+-char* yyget_text()
+-{
+- return yytext;
+-}
+ #elif defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33
+ extern YY_EXTRA_TYPE yyget_extra(void);
+ extern int strres_get_lineno(void);
+@@ -146,12 +138,3 @@ YY_EXTRA_TYPE yyget_extra()
+ /* Older GNU Flex versions don't define yylex_destroy()
+ * (and neither define a subminor version)
+ */
+-#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+-int strres_lex_destroy(void)
+-{
+- /* For non-reentrant C scanner only. */
+- yy_delete_buffer(YY_CURRENT_BUFFER);
+- yy_init = 1;
+- return 0;
+-}
+-#endif
+diff --git a/lib/gamelib/audp_lexer.lpp b/lib/gamelib/audp_lexer.lpp
+index c60ae9e..e185e96 100644
+--- a/lib/gamelib/audp_lexer.lpp
++++ b/lib/gamelib/audp_lexer.lpp
+@@ -55,21 +55,13 @@ void audp_error(const char* fmt);
+ #if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+ # define yyget_extra audp_get_extra
+ # define yyset_extra audp_set_extra
+-# define yyget_lineno audp_get_lineno
+-# define yyget_text audp_get_text
++//# define yyget_lineno audp_get_lineno
++//# define yyget_text audp_get_text
+ extern void yyset_extra(YY_EXTRA_TYPE user_defined);
+ extern YY_EXTRA_TYPE yyget_extra(void);
+ extern int yyget_lineno(void);
+-int yyget_lineno()
+-{
+- return yylineno;
+-}
+
+ extern char* yyget_text(void);
+-char* yyget_text()
+-{
+- return yytext;
+-}
+ #elif defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33
+ extern YY_EXTRA_TYPE yyget_extra(void);
+ extern int audp_get_lineno(void);
+@@ -169,12 +161,3 @@ YY_EXTRA_TYPE yyget_extra()
+ /* Older GNU Flex versions don't define yylex_destroy()
+ * (and neither define a subminor version)
+ */
+-#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+-int audp_lex_destroy(void)
+-{
+- /* For non-reentrant C scanner only. */
+- yy_delete_buffer(YY_CURRENT_BUFFER);
+- yy_init = 1;
+- return 0;
+-}
+-#endif
+diff --git a/lib/script/chat_lexer.lpp b/lib/script/chat_lexer.lpp
+index a3bb359..5fb4289 100644
+--- a/lib/script/chat_lexer.lpp
++++ b/lib/script/chat_lexer.lpp
+@@ -227,12 +227,3 @@ int chat_wrap(void)
+ /* Older GNU Flex versions don't define yylex_destroy()
+ * (and neither define a subminor version)
+ */
+-#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+-int chat_lex_destroy(void)
+-{
+- /* For non-reentrant C scanner only. */
+- yy_delete_buffer(YY_CURRENT_BUFFER);
+- yy_init = 1;
+- return 0;
+-}
+-#endif
+diff --git a/lib/script/script_lexer.lpp b/lib/script/script_lexer.lpp
+index cd77412..ea1a8d1 100644
+--- a/lib/script/script_lexer.lpp
++++ b/lib/script/script_lexer.lpp
+@@ -857,12 +857,3 @@ int scr_wrap(void)
+ /* Older GNU Flex versions don't define yylex_destroy()
+ * (and neither define a subminor version)
+ */
+-#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+-int scr_lex_destroy(void)
+-{
+- /* For non-reentrant C scanner only. */
+- yy_delete_buffer(YY_CURRENT_BUFFER);
+- yy_init = 1;
+- return 0;
+-}
+-#endif
+diff --git a/src/level_lexer.lpp b/src/level_lexer.lpp
+index 5e5c803..fcb6650 100644
+--- a/src/level_lexer.lpp
++++ b/src/level_lexer.lpp
+@@ -54,21 +54,13 @@ static char aText[YYLMAX];
+ #if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+ # define yyget_extra lev_get_extra
+ # define yyset_extra lev_set_extra
+-# define yyget_lineno lev_get_lineno
+-# define yyget_text lev_get_text
++//# define yyget_lineno lev_get_lineno
++//# define yyget_text lev_get_text
+ extern void yyset_extra(YY_EXTRA_TYPE user_defined);
+ extern YY_EXTRA_TYPE yyget_extra(void);
+ extern int yyget_lineno(void);
+-int yyget_lineno()
+-{
+- return yylineno;
+-}
+
+ extern char* yyget_text(void);
+-char* yyget_text()
+-{
+- return yytext;
+-}
+ #elif defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33
+ extern YY_EXTRA_TYPE yyget_extra(void);
+ extern int lev_get_lineno(void);
+@@ -168,12 +160,3 @@ YY_EXTRA_TYPE yyget_extra()
+ /* Older GNU Flex versions don't define yylex_destroy()
+ * (and neither define a subminor version)
+ */
+-#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+-int lev_lex_destroy(void)
+-{
+- /* For non-reentrant C scanner only. */
+- yy_delete_buffer(YY_CURRENT_BUFFER);
+- yy_init = 1;
+- return 0;
+-}
+-#endif
+diff --git a/src/scriptvals_lexer.lpp b/src/scriptvals_lexer.lpp
+index 238ff4c..0a5838e 100644
+--- a/src/scriptvals_lexer.lpp
++++ b/src/scriptvals_lexer.lpp
+@@ -62,21 +62,13 @@ static UDWORD currText=0;
+ #if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+ # define yyget_extra scrv_get_extra
+ # define yyset_extra scrv_set_extra
+-# define yyget_lineno scrv_get_lineno
+-# define yyget_text scrv_get_text
++//# define yyget_lineno scrv_get_lineno
++//# define yyget_text scrv_get_text
+ extern void yyset_extra(YY_EXTRA_TYPE user_defined);
+ extern YY_EXTRA_TYPE yyget_extra(void);
+ extern int yyget_lineno(void);
+-int yyget_lineno()
+-{
+- return yylineno;
+-}
+
+ extern char* yyget_text(void);
+-char* yyget_text()
+-{
+- return yytext;
+-}
+ #elif defined(YY_FLEX_SUBMINOR_VERSION) && YY_FLEX_SUBMINOR_VERSION == 33
+ extern YY_EXTRA_TYPE yyget_extra(void);
+ extern int scrv_get_lineno(void);
+@@ -198,12 +190,3 @@ YY_EXTRA_TYPE yyget_extra()
+ /* Older GNU Flex versions don't define yylex_destroy()
+ * (and neither define a subminor version)
+ */
+-#if !defined(YY_FLEX_SUBMINOR_VERSION) || (YY_FLEX_SUBMINOR_VERSION < 9)
+-int scrv_lex_destroy(void)
+-{
+- /* For non-reentrant C scanner only. */
+- yy_delete_buffer(YY_CURRENT_BUFFER);
+- yy_init = 1;
+- return 0;
+-}
+-#endif
Modified: packages/trunk/warzone2100/debian/patches/series
===================================================================
--- packages/trunk/warzone2100/debian/patches/series 2016-04-29 02:21:11 UTC (rev 15768)
+++ packages/trunk/warzone2100/debian/patches/series 2016-05-01 15:02:26 UTC (rev 15769)
@@ -1,5 +1,6 @@
use-system-libraries.patch
revert-372eff6693e633e8d0d1d0b8a9ceb996a5c3f49f.patch
revert-e397b24d4724d835d6cdc39a92800e64c0551dab.patch
-fix-yacc.diff
fix-GLEW-FTBFS.patch
+fix-yacc.patch
+redefinition-FTBFS.patch
Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules 2016-04-29 02:21:11 UTC (rev 15768)
+++ packages/trunk/warzone2100/debian/rules 2016-05-01 15:02:26 UTC (rev 15769)
@@ -64,8 +64,5 @@
rm -f debian/*/usr/share/doc/warzone2100/ChangeLog*
rm -f debian/*/usr/share/doc/warzone2100/Readme*
-override_dh_strip:
- dh_strip --dbg-package=warzone2100-dbg
-
override_dh_compress:
dh_compress -X.pdf
More information about the Pkg-games-commits
mailing list