tag 724417 + pending tag 733373 + pending tag 736162 + pending thanks Dear maintainer,
I've prepared an NMU for ming (versioned as 1:0.4.5-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. diff -u ming-0.4.5/debian/control ming-0.4.5/debian/control --- ming-0.4.5/debian/control +++ ming-0.4.5/debian/control @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Stuart R. Anderson <ander...@netsweng.com> -Build-Depends: debhelper (>= 5.0.37.2), docbook-to-man, swig, python-all-dev (>= 2.7.3), libgif-dev, libpng-dev, libz-dev, perl (>= 5.10.0), autotools-dev, flex, bison, libfreetype6-dev, ttf-dejavu, ttf-opensymbol, php5-dev, php5-cli, automake1.10, autoconf2.59, quilt, chrpath +Build-Depends: debhelper (>= 5.0.37.2), docbook-to-man, swig, python-all-dev (>= 2.7.3), libgif-dev, libpng-dev, libz-dev, perl (>= 5.10.0), autotools-dev, flex, bison, libfreetype6-dev, ttf-dejavu, ttf-opensymbol, php5-dev, php5-cli, automake, autoconf2.59, quilt, chrpath Standards-Version: 3.9.3 Homepage: http://www.libming.net/ diff -u ming-0.4.5/debian/changelog ming-0.4.5/debian/changelog --- ming-0.4.5/debian/changelog +++ ming-0.4.5/debian/changelog @@ -1,3 +1,12 @@ +ming (1:0.4.5-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS due to ungif linking (Closes: #733373). + * Fix FTBFS on Hurd and against recent bison versions (Closes: #736162). + * Switch from superseded automake1.10 to automake (Closes: #724417). + + -- Gabriele Giacone <1o5g4...@gmail.com> Tue, 28 Jan 2014 19:16:47 +0100 + ming (1:0.4.5-1) unstable; urgency=low * New Upstream release (Closes: 664992) diff -u ming-0.4.5/debian/patches/series ming-0.4.5/debian/patches/series --- ming-0.4.5/debian/patches/series +++ ming-0.4.5/debian/patches/series @@ -3,0 +4,3 @@ +04_bison +05_hurd +06_ungif only in patch2: unchanged: --- ming-0.4.5.orig/debian/patches/04_bison +++ ming-0.4.5/debian/patches/04_bison @@ -0,0 +1,113 @@ +Description: Fix build with recent bison versions. +Author: Gabriele Giacone <1o5g4...@gmail.com> +Origin: upstream, https://github.com/libming/libming/commit/8745e080324be997b2eaebc7bd9c0284130d55ff + +--- a/src/actioncompiler/compile.h ++++ b/src/actioncompiler/compile.h +@@ -17,7 +17,7 @@ extern int swfVersion; + typedef struct _buffer *Buffer; + + /* shut up bison.simple */ +-void yyerror(char *msg); ++void yyerror(void *buffer, char *msg); + int yylex(); + + #ifndef max +--- a/src/actioncompiler/swf4compiler.y ++++ b/src/actioncompiler/swf4compiler.y +@@ -16,6 +16,8 @@ + + %} + ++%parse-param {void *buffer} ++ + %union { + Buffer action; + char *str; +--- a/src/actioncompiler/swf5compiler.y ++++ b/src/actioncompiler/swf5compiler.y +@@ -25,6 +25,8 @@ static int classContext = 0; + + %} + ++%parse-param {void *buffer} ++ + %union + { + Buffer action; +@@ -261,7 +263,7 @@ class_init + { + if(classContext) + { +- swf5error("Nested classes are not allowed\n"); ++ swf5error(NULL, "Nested classes are not allowed\n"); + YYABORT; + } + classContext = 1; +@@ -391,7 +393,7 @@ return_stmt + { int tmp = chkctx(CTX_FUNCTION); + if(tmp < 0) + { +- swf5error("return outside function"); ++ swf5error(NULL, "return outside function"); + YYABORT; + } + $$ = newBuffer(); +@@ -404,7 +406,7 @@ return_stmt + { int tmp = chkctx(CTX_FUNCTION); + if(tmp < 0) + { +- swf5error("return outside function"); ++ swf5error(NULL, "return outside function"); + YYABORT; + } + $$ = newBuffer(); +@@ -877,7 +879,7 @@ cont_stmt + { + if(chkctx(CTX_CONTINUE) < 0) + { +- swf5error("continue outside loop"); ++ swf5error(NULL, "continue outside loop"); + YYABORT; + } + $$ = newBuffer(); +@@ -905,7 +907,7 @@ break_stmt + } + else + { +- swf5error("break outside switch / loop"); ++ swf5error(NULL, "break outside switch / loop"); + YYABORT; + } + } +@@ -1603,7 +1605,7 @@ primary + { + if($1->name != NULL) + { +- swf5error("anonymous decl only. identifier not allowed"); ++ swf5error(NULL, "anonymous decl only. identifier not allowed"); + YYABORT; + } + $$ = newBuffer(); +--- a/src/actioncompiler/swf4compiler.flex ++++ b/src/actioncompiler/swf4compiler.flex +@@ -9,7 +9,7 @@ + #include "blocks/error.h" + #include "swf4compiler.tab.h" /* defines token types */ + +-static int swf4debug; ++extern int swf4debug; + + static const char *lexBuffer = NULL; + static int lexBufferLen = 0; +--- a/src/actioncompiler/swf5compiler.flex ++++ b/src/actioncompiler/swf5compiler.flex +@@ -9,7 +9,7 @@ + #include "blocks/error.h" + #include "swf5compiler.tab.h" /* defines token types */ + +-static int swf5debug; ++extern int swf5debug; + + static const char *lexBuffer = NULL; + static int lexBufferLen = 0; only in patch2: unchanged: --- ming-0.4.5.orig/debian/patches/05_hurd +++ ming-0.4.5/debian/patches/05_hurd @@ -0,0 +1,17 @@ +Description: Fix build on GNU/Hurd +Author: Gabriele Giacone <1o5g4...@gmail.com> +Origin: upstream, https://github.com/libming/libming/commit/f079175192199c912ee9de4e56182e4c2a7acc8b + +--- a/src/ming.h.in ++++ b/src/ming.h.in +@@ -47,6 +47,10 @@ extern "C" { + #define MING_VERSION @MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@ + #define MING_VERSION_TEXT "@MAJOR_VERSION@.@MINOR_VERSION@.@MICRO_VERSION@" + ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + /***** Type definitions - avoid cyclic dependencies ****/ + + typedef unsigned char byte; only in patch2: unchanged: --- ming-0.4.5.orig/debian/patches/06_ungif +++ ming-0.4.5/debian/patches/06_ungif @@ -0,0 +1,16 @@ +Description: Remove ungif linking, see #732272 +Author: Gabriele Giacone <1o5g4...@gmail.com> + +--- a/py_ext/setup.py.in ++++ b/py_ext/setup.py.in +@@ -18,10 +18,6 @@ if "@ZLIB@": + if "@PNGLIB@": + mylibs.append('png') + +-if "@GIFLIB@": +- mylibs.append("ungif") +- +- + setup(name = "mingc", version = "@MING_VERSION@", + package_dir = {'': srcdir}, + py_modules = ['ming', 'mingc'], -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
