This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapserver.
commit fe6df7cc9bb52e3d81c36ad6606778f66fd02bd0 Author: Bas Couwenberg <[email protected]> Date: Tue Jan 26 07:29:10 2016 +0100 Add patch by Michael Tautschnig to fix type inconsistencies. --- debian/changelog | 7 +++++++ debian/patches/fix-types.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8490077..e4a13d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mapserver (7.0.0-9) UNRELEASED; urgency=medium + + * Add patch by Michael Tautschnig to fix type inconsistencies. + (closes: #812685) + + -- Bas Couwenberg <[email protected]> Tue, 26 Jan 2016 07:28:39 +0100 + mapserver (7.0.0-8) unstable; urgency=medium * Don't fail the build when the examples are not installed. diff --git a/debian/patches/fix-types.patch b/debian/patches/fix-types.patch new file mode 100644 index 0000000..aacee35 --- /dev/null +++ b/debian/patches/fix-types.patch @@ -0,0 +1,21 @@ +Description: Fix type inconsitencies. + mapfile.c line 65: error: conflicting types for variable `msyystring_icase' + old definition in module `maplexer' file maplexer.l line 51 + signed int + new definition in module `mapfile' file mapfile.c line 65 + char +Author: Michael Tautschnig <[email protected]> +Bug-Debian: https://bugs.debian.org/812685 +Forwarded: https://github.com/mapserver/mapserver/pull/5227 + +--- a/mapfile.c ++++ b/mapfile.c +@@ -62,7 +62,7 @@ extern char *msyystring; + extern char *msyybasepath; + extern int msyyreturncomments; + extern char *msyystring_buffer; +-extern char msyystring_icase; ++extern int msyystring_icase; + + extern int loadSymbol(symbolObj *s, char *symbolpath); /* in mapsymbol.c */ + extern void writeSymbol(symbolObj *s, FILE *stream); /* in mapsymbol.c */ diff --git a/debian/patches/series b/debian/patches/series index a726aa6..318c50c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ dont-install-headers-in-usr-lib.patch dont-export-mapserver-target-for-static-libmapserver.patch 0001-Fix-compilation-with-gif_lib-5.1.patch 0001-Fix-java-mapscript-to-be-compatible-with-newer-swig.patch +fix-types.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
