Control: tags -1 + patch pending Dear maintainer,
I've prepared an NMU for comedilib (versioned as 0.10.0-3.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru comedilib-0.10.0/debian/changelog comedilib-0.10.0/debian/changelog --- comedilib-0.10.0/debian/changelog 2012-07-05 21:42:43.000000000 +0200 +++ comedilib-0.10.0/debian/changelog 2013-08-11 01:45:35.000000000 +0200 @@ -1,3 +1,13 @@ +comedilib (0.10.0-3.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/03_bison.patch: Apply patch from upstream to fix build + failure with bison 2.6. (Closes: #710622) + * debian/python-comedilib.install: Don't install static libraries for the + Python package. They are of no use and cause a lintian autoreject. + + -- Sebastian Ramacher <sramac...@debian.org> Sun, 11 Aug 2013 01:42:56 +0200 + comedilib (0.10.0-3) unstable; urgency=low * Change pdf backend from fop to no. Fixes compilation on mips. diff -Nru comedilib-0.10.0/debian/patches/03_bison.patch comedilib-0.10.0/debian/patches/03_bison.patch --- comedilib-0.10.0/debian/patches/03_bison.patch 1970-01-01 01:00:00.000000000 +0100 +++ comedilib-0.10.0/debian/patches/03_bison.patch 2013-08-11 01:35:29.000000000 +0200 @@ -0,0 +1,59 @@ +Description: Fix build failure with bison 2.6 +Origin: upstream, + http://comedi.org/git?p=comedi/comedilib.git;a=commitdiff;h=90ce9a94bdb6b26a9cbffdf2e9922b0b1f668a65;hp=3dfae5a6ee6040d294493f3856a3949e1b602af0 +Bug-Debian: http://bugs.debian.org/710622 +Last-Update: 2013-08-11 + +--- comedilib-0.10.0.orig/lib/calib_yacc.y ++++ comedilib-0.10.0/lib/calib_yacc.y +@@ -28,13 +28,14 @@ + #include <math.h> + #include <string.h> + #include <stdlib.h> +-#include "calib_yacc.h" +-#include "calib_lex.h" + + #define YYERROR_VERBOSE + #define YYPARSE_PARAM parse_arg + #define YYLEX_PARAM priv(YYPARSE_PARAM)->yyscanner + ++#include "calib_yacc.h" ++#include "calib_lex.h" ++ + enum polynomial_direction + { + POLYNOMIAL_TO_PHYS, +@@ -347,6 +348,11 @@ extern comedi_calibration_t* _comedi_par + return priv.parsed_file; + } + ++static void yyerror(const char *s) ++{ ++ fprintf(stderr, "%s\n", s); ++} ++ + %} + + %pure_parser +@@ -504,10 +510,5 @@ extern comedi_calibration_t* _comedi_par + + %% + +-void calib_yyerror(char *s) +-{ +- fprintf(stderr, "%s\n", s); +-} +- + + +--- comedilib-0.10.0.orig/lib/libinternal.h ++++ comedilib-0.10.0/lib/libinternal.h +@@ -146,8 +146,6 @@ int valid_chan(comedi_t *it,unsigned int + int comedi_get_rangetype(comedi_t *it,unsigned int subdevice,unsigned int chan); + + #define YY_DECL int calib_yylex(YYSTYPE *calib_lvalp, yyscan_t yyscanner) +-void calib_yyerror(char *s); +-int calib_yyparse(void *parse_arg); + + #endif + diff -Nru comedilib-0.10.0/debian/patches/series comedilib-0.10.0/debian/patches/series --- comedilib-0.10.0/debian/patches/series 2012-06-04 10:37:10.000000000 +0200 +++ comedilib-0.10.0/debian/patches/series 2013-08-11 01:34:40.000000000 +0200 @@ -1,2 +1,3 @@ 01_calibrate_build.patch 02_fix_manpages.patch +03_bison.patch diff -Nru comedilib-0.10.0/debian/python-comedilib.install comedilib-0.10.0/debian/python-comedilib.install --- comedilib-0.10.0/debian/python-comedilib.install 2012-04-21 09:09:23.000000000 +0200 +++ comedilib-0.10.0/debian/python-comedilib.install 2013-08-11 01:42:54.000000000 +0200 @@ -1,3 +1,2 @@ usr/lib/python*/dist-packages/*.so -usr/lib/python*/dist-packages/*.a usr/lib/python*/dist-packages/comedi.py
signature.asc
Description: Digital signature
