Bug#733322: comedilib: FTBFS

[A. Maitland Bottoms]

Tags: patch

I pulled out some fixes from Ubuntu
https://launchpad.net/ubuntu/+source/comedilib/0.10.1-1ubuntu2
and added some other Debian bug fixes.

What is not addressed is #732685, since that will take
something beyond what debdiff can represent to get
a new debian source package tarball uploaded and installed...

This builds in current Debian unstable, so solves #733322.

-Maitland

diff -Nru comedilib-0.10.1/debian/changelog comedilib-0.10.1/debian/changelog
--- comedilib-0.10.1/debian/changelog   2013-08-18 04:32:17.0 -0400
+++ comedilib-0.10.1/debian/changelog   2014-03-31 19:11:16.0 -0400
@@ -1,3 +1,26 @@
+comedilib (0.10.1-2) unstable; urgency=low
+
+  * Bring in Ubuntu fixes (patch from A. Maitland Bottoms)
+   (Closes: #727345, #733322, #711203)
+
+ -- Gudjon I. Gudjonsson   Mon, 31 Mar 2014 22:40:31 +0200
+
+comedilib (0.10.1-1ubuntu2) trusty; urgency=low
+
+  * Use dh-autoreconf to resolve FTBFS on ppc64el.
+
+ -- Daniel T Chen   Wed, 08 Jan 2014 13:12:42 -0500
+
+comedilib (0.10.1-1ubuntu1) trusty; urgency=low
+
+  * FTBFS fixes:
+- Backport upstream changesets 90ce9a9, cc0c9e7, f4e228e, c689eff,
+  and 2277e82;
+- Use explicit parameters.
+  * Closes: #733322. LP: #1264686.
+
+ -- Daniel T Chen   Tue, 07 Jan 2014 17:22:30 -0500
+
 comedilib (0.10.1-1) unstable; urgency=low
 
   * New upstream release
diff -Nru comedilib-0.10.1/debian/control comedilib-0.10.1/debian/control
--- comedilib-0.10.1/debian/control 2013-04-27 17:12:24.0 -0400
+++ comedilib-0.10.1/debian/control 2014-03-31 18:43:02.0 -0400
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Gudjon I. Gudjonsson 
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), python-all-dev, 
autotools-dev,
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), python-all-dev, 
dh-autoreconf,
  swig, docbook-utils, dblatex, bison, flex, libtool, xmlto, imagemagick, fop,
  libboost-program-options-dev, libgsl0-dev, hardening-wrapper
 Standards-Version: 3.9.4
diff -Nru comedilib-0.10.1/debian/libcomedi0.dirs 
comedilib-0.10.1/debian/libcomedi0.dirs
--- comedilib-0.10.1/debian/libcomedi0.dirs 2012-06-03 19:35:26.0 
-0400
+++ comedilib-0.10.1/debian/libcomedi0.dirs 2014-03-31 19:14:12.0 
-0400
@@ -6,3 +6,4 @@
 usr/share/doc/libcomedi0/
 etc/pcmcia/
 lib/udev/rules.d/
+var/lib/comedi/calibrations
diff -Nru comedilib-0.10.1/debian/libcomedi0.install 
comedilib-0.10.1/debian/libcomedi0.install
--- comedilib-0.10.1/debian/libcomedi0.install  2012-06-03 19:35:38.0 
-0400
+++ comedilib-0.10.1/debian/libcomedi0.install  2014-03-31 19:10:51.0 
-0400
@@ -1,11 +1,12 @@
+etc/pcmcia/*
+lib/udev/*
 usr/lib/libcomedi.so.*
 #usr/lib/ruby/*
-usr/sbin/*
+usr/bin/comedi_board_info
 usr/bin/comedi_calibrate
+usr/bin/comedi_soft_calibrate
 usr/bin/comedi_test
+usr/sbin/*
 usr/share/man/man7/*
 usr/share/man/man8/*
 usr/share/doc/comedilib/*.conf usr/share/doc/libcomedi0/
-etc/pcmcia/*
-lib/udev/*
-
diff -Nru comedilib-0.10.1/debian/patches/04_bison.patch 
comedilib-0.10.1/debian/patches/04_bison.patch
--- comedilib-0.10.1/debian/patches/04_bison.patch  2013-08-14 
16:58:59.0 -0400
+++ comedilib-0.10.1/debian/patches/04_bison.patch  1969-12-31 
19:00:00.0 -0500
@@ -1,59 +0,0 @@
-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 
- #include 
- #include 
--#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.1/debian/patches/04_new_bison.patch 
comedilib-0.10.1/debian/patches/04_new_bison.patch
--- comedilib-0.10.1/debian/patches/04_new_bison.patch  1969-12-31 
19:00:00.0 -0500
+++ comedi

Bug#733322: comedilib: FTBFS: calib_yacc.y:340:2: error: too many arguments to function 'calib_yyparse'

[Andreas Moog]

Package: comedilib
Version: 0.10.1-1
Severity: serious

Hi there,

building your package fails in a up-to-date amd64 sbuild chroot:

> libtool: compile:  x86_64-linux-gnu-gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. 
> -D_FORTIFY_SOURCE=2 -I../include -I../include -Wall -D_REENTRANT 
> -DLOCALSTATEDIR=\"/var/lib/libcomedi0\" -g -O2 -fstack-protector 
> --param=ssp-buffer-size=4 -Wformat -Werror=format-security -c calib_lex.c -o 
> libcomedi_la-calib_lex.o >/dev/null 2>&1
> /bin/bash ../libtool  --tag=CC   --mode=compile x86_64-linux-gnu-gcc 
> -std=gnu99 -DHAVE_CONFIG_H -I. -I..   -D_FORTIFY_SOURCE=2 -I../include 
> -I../include -Wall -D_REENTRANT -DLOCALSTATEDIR=\"\/var/lib/libcomedi0\" -g 
> -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat 
> -Werror=format-security -c -o libcomedi_la-calib_yacc.lo `test -f 
> 'calib_yacc.c' || echo './'`calib_yacc.c
> libtool: compile:  x86_64-linux-gnu-gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. 
> -D_FORTIFY_SOURCE=2 -I../include -I../include -Wall -D_REENTRANT 
> -DLOCALSTATEDIR=\"/var/lib/libcomedi0\" -g -O2 -fstack-protector 
> --param=ssp-buffer-size=4 -Wformat -Werror=format-security -c calib_yacc.c  
> -fPIC -DPIC -o .libs/libcomedi_la-calib_yacc.o
> calib_yacc.y: In function '_comedi_parse_calibration_file':
> calib_yacc.y:340:2: error: too many arguments to function 'calib_yyparse'
>   if( calib_yyparse( &priv ) )
>   ^
> In file included from calib_yacc.y:36:0:
> ./calib_yacc.h:107:5: note: declared here
>  int calib_yyparse (void);
>  ^
> ./calib_yacc.c: In function 'calib_yyparse':
> ./calib_yacc.c:1596:7: error: too few arguments to function 'calib_yylex'
>yychar = yylex (&yylval);
>^
> In file included from calib_yacc.y:27:0:
> libinternal.h:148:21: note: declared here
>  #define YY_DECL int calib_yylex(YYSTYPE *calib_lvalp, yyscan_t yyscanner)
>  ^
> calib_yacc.y:55:1: note: in expansion of macro 'YY_DECL'
>  YY_DECL;
>  ^
> calib_yacc.y:381:73: error: 'parse_arg' undeclared (first use in this 
> function)
>  fprintf(stderr, "input error on line %i\n", 
> calib_yyget_lineno(priv(parse_arg)->yyscanner));
>  ^
> calib_yacc.y:381:73: note: each undeclared identifier is reported only once 
> for each function it appears in
> make[4]: *** [libcomedi_la-calib_yacc.lo] Error 1
> make[4]: Leaving directory `/«PKGBUILDDIR»/lib'
> make[3]: *** [all] Error 2
> make[3]: Leaving directory `/«PKGBUILDDIR»/lib'
> make[2]: *** [all-recursive] Error 1
> make[2]: Leaving directory `/«PKGBUILDDIR»'
> make[1]: *** [all] Error 2
> make[1]: Leaving directory `/«PKGBUILDDIR»'
> make: *** [build-arch-stamp] Error 2
> dpkg-buildpackage: error: debian/rules build gave error exit status 2

Full buildlog attached.

-- 
Andreas Moog, Berliner Str. 29, 36205 Sontra/Germany
PGP-encrypted mails preferred (Key-ID: 74DE6624)
PGP Fingerprint: 74CD D9FE 5BCB FE0D 13EE 8EEA 61F3 4426 74DE 6624


comedilib_0.10.1-1_amd64.build.gz
Description: application/gzip


signature.asc
Description: OpenPGP digital signature