--- Begin Message ---
Package: comedilib
Version: 0.10.1-1.1
I've just uploaded a NMU to the 7 day delayed queue to fix the RC bug
causing xoscope and other packages used by Debian Edu to be removed from
testing. I fixed a few other issues in the process.
The attached patch is the debdiff for my upload.
--
Happy hacking
Petter Reinholdtsen
diff -Nru comedilib-0.10.1/debian/changelog comedilib-0.10.1/debian/changelog
--- comedilib-0.10.1/debian/changelog 2013-08-18 10:32:17.000000000 +0200
+++ comedilib-0.10.1/debian/changelog 2014-05-11 20:52:06.000000000 +0200
@@ -1,3 +1,24 @@
+comedilib (0.10.1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload to fix RC bug #733322.
+ * Fix build problem with newer bison (Closes: #733322). Patch from
+ Daniel T Chen and Ubuntu via A. Maitland Bottoms backporting
+ upstream changesets 90ce9a9, cc0c9e7, f4e228e, c689eff, and
+ 2277e82.
+ * Use dh-autoreconf to fix build problem on some architectures
+ (Closes: #727345). Drop now obsolete autotools-dev build
+ dependency. Patch from Daniel T Chen and Ubuntu via A. Maitland
+ Bottoms.
+ * Add new executables comedi_soft_calibrate and comedi_board_info to
+ the libcomedi1 package (Closes: #711203). Add new directory
+ /var/lib/comedi/calibrations to the package, and build using
+ --localstatedir=/var to store the state to the correct location.
+ Patch from A. Maitland Bottoms.
+ * Adjusted 01_calibrate_build.patch to remove check for comedilib.h too,
+ to ensure the comedi-calibrate/configure script work without libcomedi0.
+
+ -- Petter Reinholdtsen <[email protected]> Sun, 11 May 2014 20:52:01 +0200
+
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 23:12:24.000000000 +0200
+++ comedilib-0.10.1/debian/control 2014-05-11 14:24:43.000000000 +0200
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Gudjon I. Gudjonsson <[email protected]>
-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-04 01:35:26.000000000 +0200
+++ comedilib-0.10.1/debian/libcomedi0.dirs 2014-05-11 14:24:43.000000000 +0200
@@ -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-04 01:35:38.000000000 +0200
+++ comedilib-0.10.1/debian/libcomedi0.install 2014-05-11 14:53:12.000000000 +0200
@@ -1,7 +1,9 @@
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/share/man/man7/*
usr/share/man/man8/*
diff -Nru comedilib-0.10.1/debian/patches/01_calibrate_build.patch comedilib-0.10.1/debian/patches/01_calibrate_build.patch
--- comedilib-0.10.1/debian/patches/01_calibrate_build.patch 2013-01-20 19:02:21.000000000 +0100
+++ comedilib-0.10.1/debian/patches/01_calibrate_build.patch 2014-05-11 16:12:00.000000000 +0200
@@ -1,12 +1,151 @@
Allows comedi_calibrate to be built without having libcomedi0 installed.
This is a patch to configure, a machine generated file. A better solution
-without patching machine generated files would be preferable.
---- a/comedi-calibrate/configure
-+++ b/comedi-calibrate/configure
-@@ -5616,81 +5616,6 @@
-
+without patching machine generated files would be preferable, but the tools do
+to thus are currently missing.
+
+Index: comedilib-0.10.1-pere/comedi-calibrate/configure
+===================================================================
+--- comedilib-0.10.1-pere.orig/comedi-calibrate/configure 2014-05-11 16:10:54.925251751 +0200
++++ comedilib-0.10.1-pere/comedi-calibrate/configure 2014-05-11 16:11:17.405352278 +0200
+@@ -5481,216 +5481,6 @@
+ done
+-if test "${ac_cv_header_comedilib_h+set}" = set; then
+- { echo "$as_me:$LINENO: checking for comedilib.h" >&5
+-echo $ECHO_N "checking for comedilib.h... $ECHO_C" >&6; }
+-if test "${ac_cv_header_comedilib_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_header_comedilib_h" >&5
+-echo "${ECHO_T}$ac_cv_header_comedilib_h" >&6; }
+-else
+- # Is the header compilable?
+-{ echo "$as_me:$LINENO: checking comedilib.h usability" >&5
+-echo $ECHO_N "checking comedilib.h usability... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-#include <comedilib.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_compile") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest.$ac_objext; then
+- ac_header_compiler=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ echo "$as_me:$LINENO: checking comedilib.h presence" >&5
+-echo $ECHO_N "checking comedilib.h presence... $ECHO_C" >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-#include <comedilib.h>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } >/dev/null && {
+- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- }; then
+- ac_header_preproc=yes
+-else
+- echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6; }
+-
+-# So? What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+- yes:no: )
+- { echo "$as_me:$LINENO: WARNING: comedilib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: comedilib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+- { echo "$as_me:$LINENO: WARNING: comedilib.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: comedilib.h: proceeding with the compiler's result" >&2;}
+- ac_header_preproc=yes
+- ;;
+- no:yes:* )
+- { echo "$as_me:$LINENO: WARNING: comedilib.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: comedilib.h: present but cannot be compiled" >&2;}
+- { echo "$as_me:$LINENO: WARNING: comedilib.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: comedilib.h: check for missing prerequisite headers?" >&2;}
+- { echo "$as_me:$LINENO: WARNING: comedilib.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: comedilib.h: see the Autoconf documentation" >&2;}
+- { echo "$as_me:$LINENO: WARNING: comedilib.h: section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: comedilib.h: section \"Present But Cannot Be Compiled\"" >&2;}
+- { echo "$as_me:$LINENO: WARNING: comedilib.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: comedilib.h: proceeding with the preprocessor's result" >&2;}
+- { echo "$as_me:$LINENO: WARNING: comedilib.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: comedilib.h: in the future, the compiler will take precedence" >&2;}
+-
+- ;;
+-esac
+-{ echo "$as_me:$LINENO: checking for comedilib.h" >&5
+-echo $ECHO_N "checking for comedilib.h... $ECHO_C" >&6; }
+-if test "${ac_cv_header_comedilib_h+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- ac_cv_header_comedilib_h=$ac_header_preproc
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_header_comedilib_h" >&5
+-echo "${ECHO_T}$ac_cv_header_comedilib_h" >&6; }
+-
+-fi
+-if test $ac_cv_header_comedilib_h = yes; then
+- :
+-else
+- { { echo "$as_me:$LINENO: error: Failed to find comedilib.h." >&5
+-echo "$as_me: error: Failed to find comedilib.h." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
+-
+-
+-
-{ echo "$as_me:$LINENO: checking for comedi_open in -lcomedi" >&5
-echo $ECHO_N "checking for comedi_open in -lcomedi... $ECHO_C" >&6; }
-if test "${ac_cv_lib_comedi_comedi_open+set}" = set; then
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 22:58:59.000000000 +0200
+++ comedilib-0.10.1/debian/patches/04_bison.patch 1970-01-01 01:00:00.000000000 +0100
@@ -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 <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.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 1970-01-01 01:00:00.000000000 +0100
+++ comedilib-0.10.1/debian/patches/04_new_bison.patch 2014-05-11 14:50:39.000000000 +0200
@@ -0,0 +1,253 @@
+Index: comedilib-0.10.1/lib/calib_lex.l
+===================================================================
+--- comedilib-0.10.1.orig/lib/calib_lex.l 2014-01-07 17:17:46.120064499 -0500
++++ comedilib-0.10.1/lib/calib_lex.l 2014-01-07 17:19:30.965518265 -0500
+@@ -31,6 +31,8 @@
+ #include "libinternal.h"
+ #include "calib_yacc.h"
+
++#define YY_NO_INPUT
++
+ %}
+
+ %x COMMENT
+Index: comedilib-0.10.1/lib/calib_yacc.y
+===================================================================
+--- comedilib-0.10.1.orig/lib/calib_yacc.y 2014-01-07 17:17:46.108063299 -0500
++++ comedilib-0.10.1/lib/calib_yacc.y 2014-01-07 17:22:12.611832960 -0500
+@@ -28,12 +28,12 @@
+ #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
++#define LEX_PARAM parse_arg->yyscanner
++
++#include "calib_yacc.h"
++#include "calib_lex.h"
+
+ enum polynomial_direction
+ {
+@@ -41,7 +41,7 @@
+ POLYNOMIAL_FROM_PHYS
+ };
+
+-typedef struct
++struct calib_yyparse_private
+ {
+ yyscan_t yyscanner;
+ comedi_calibration_t *parsed_file;
+@@ -49,15 +49,10 @@
+ int cal_index;
+ unsigned num_coefficients;
+ comedi_polynomial_t polynomial;
+-} calib_yyparse_private_t;
++};
+
+ YY_DECL;
+
+-static inline calib_yyparse_private_t* priv( calib_yyparse_private_t *parse_arg)
+-{
+- return parse_arg;
+-}
+-
+ static void free_calibration_setting( comedi_calibration_setting_t *setting )
+ {
+ if( setting->channels );
+@@ -317,39 +312,18 @@
+ }
+ }
+
+-EXPORT_ALIAS_DEFAULT(_comedi_parse_calibration_file,comedi_parse_calibration_file,0.7.20);
+-extern comedi_calibration_t* _comedi_parse_calibration_file( const char *cal_file_path )
++static void yyerror(calib_yyparse_private_t *parse_arg, const char *s)
+ {
+- calib_yyparse_private_t priv;
+- FILE *file;
+-
+- if( cal_file_path == NULL ) return NULL;
+- memset(&priv, 0, sizeof(calib_yyparse_private_t));
+- priv.parsed_file = alloc_calib_parse();
+- if( priv.parsed_file == NULL ) return NULL;
+-
+- file = fopen( cal_file_path, "r" );
+- if( file == NULL )
+- {
+- COMEDILIB_DEBUG( 3, "failed to open file\n" );
+- return NULL;
+- }
+- calib_yylex_init(&priv.yyscanner);
+- calib_yyrestart(file, priv.yyscanner);
+- if( calib_yyparse( &priv ) )
+- {
+- comedi_cleanup_calibration( priv.parsed_file );
+- priv.parsed_file = NULL;
+- }
+- calib_yylex_destroy(priv.yyscanner);
+- fclose( file );
+- fill_inverse_linear_polynomials(priv.parsed_file);
+- return priv.parsed_file;
++ fprintf(stderr, "%s\n", s);
+ }
+
+ %}
+
+-%pure_parser
++%pure-parser
++
++%parse-param {calib_yyparse_private_t *parse_arg}
++
++%lex-param {LEX_PARAM}
+
+ %union
+ {
+@@ -372,7 +346,7 @@
+ input: '{' hash '}'
+ | error
+ {
+- fprintf(stderr, "input error on line %i\n", calib_yyget_lineno(priv(parse_arg)->yyscanner));
++ fprintf(stderr, "input error on line %i\n", calib_yyget_lineno(parse_arg->yyscanner));
+ // fprintf(stderr, "input error on line %i\n", @1.first_line );
+ YYABORT;
+ }
+@@ -385,13 +359,13 @@
+
+ hash_element: T_DRIVER_NAME T_ASSIGN T_STRING
+ {
+- if( priv(parse_arg)->parsed_file->driver_name != NULL ) YYABORT;
+- priv(parse_arg)->parsed_file->driver_name = strdup( $3 );
++ if( parse_arg->parsed_file->driver_name != NULL ) YYABORT;
++ parse_arg->parsed_file->driver_name = strdup( $3 );
+ }
+ | T_BOARD_NAME T_ASSIGN T_STRING
+ {
+- if( priv(parse_arg)->parsed_file->board_name != NULL ) YYABORT;
+- priv(parse_arg)->parsed_file->board_name = strdup( $3 );
++ if( parse_arg->parsed_file->board_name != NULL ) YYABORT;
++ parse_arg->parsed_file->board_name = strdup( $3 );
+ }
+ | T_CALIBRATIONS T_ASSIGN '[' calibrations_array ']'
+ ;
+@@ -401,8 +375,8 @@
+ | '{' calibration_setting '}' ',' calibrations_array
+ ;
+
+- calibration_setting: /* empty */ { priv(parse_arg)->cal_index++; }
+- | calibration_setting_element { priv(parse_arg)->cal_index++; }
++ calibration_setting: /* empty */ { parse_arg->cal_index++; }
++ | calibration_setting_element { parse_arg->cal_index++; }
+ | calibration_setting_element ',' calibration_setting
+ ;
+
+@@ -420,12 +394,12 @@
+ | T_SOFTCAL_TO_PHYS T_ASSIGN '{' polynomial '}'
+ {
+ if(add_polynomial(parse_arg, POLYNOMIAL_TO_PHYS) < 0) YYERROR;
+- priv(parse_arg)->num_coefficients = 0;
++ parse_arg->num_coefficients = 0;
+ }
+ | T_SOFTCAL_FROM_PHYS T_ASSIGN '{' polynomial '}'
+ {
+ if(add_polynomial(parse_arg, POLYNOMIAL_FROM_PHYS) < 0) YYERROR;
+- priv(parse_arg)->num_coefficients = 0;
++ parse_arg->num_coefficients = 0;
+ }
+ ;
+
+@@ -458,14 +432,14 @@
+ | '{' caldac '}' ',' caldacs_array
+ ;
+
+- caldac: /* empty */ { if(add_caldac( parse_arg, priv(parse_arg)->caldac ) < 0) YYERROR; }
+- | caldac_element { if(add_caldac( parse_arg, priv(parse_arg)->caldac ) < 0) YYERROR; }
++ caldac: /* empty */ { if(add_caldac( parse_arg, parse_arg->caldac ) < 0) YYERROR; }
++ | caldac_element { if(add_caldac( parse_arg, parse_arg->caldac ) < 0) YYERROR; }
+ | caldac_element ',' caldac
+ ;
+
+- caldac_element: T_SUBDEVICE T_ASSIGN T_NUMBER { priv(parse_arg)->caldac.subdevice = $3; }
+- | T_CHANNEL T_ASSIGN T_NUMBER { priv(parse_arg)->caldac.channel = $3; }
+- | T_VALUE T_ASSIGN T_NUMBER { priv(parse_arg)->caldac.value = $3; }
++ caldac_element: T_SUBDEVICE T_ASSIGN T_NUMBER { parse_arg->caldac.subdevice = $3; }
++ | T_CHANNEL T_ASSIGN T_NUMBER { parse_arg->caldac.channel = $3; }
++ | T_VALUE T_ASSIGN T_NUMBER { parse_arg->caldac.value = $3; }
+ ;
+
+ polynomial: /* empty */
+@@ -494,20 +468,45 @@
+
+ expansion_origin: T_FLOAT
+ {
+- priv(parse_arg)->polynomial.expansion_origin = $1;
++ parse_arg->polynomial.expansion_origin = $1;
+ }
+ | T_NUMBER
+ {
+- priv(parse_arg)->polynomial.expansion_origin = $1;
++ parse_arg->polynomial.expansion_origin = $1;
+ }
+ ;
+
+ %%
+
+-void calib_yyerror(char *s)
++
++EXPORT_ALIAS_DEFAULT(_comedi_parse_calibration_file,comedi_parse_calibration_file,0.7.20);
++extern comedi_calibration_t* _comedi_parse_calibration_file( const char *cal_file_path )
+ {
+- fprintf(stderr, "%s\n", s);
+-}
++ calib_yyparse_private_t priv;
++ FILE *file;
++
++ if( cal_file_path == NULL ) return NULL;
++ memset(&priv, 0, sizeof(calib_yyparse_private_t));
++ priv.parsed_file = alloc_calib_parse();
++ if( priv.parsed_file == NULL ) return NULL;
+
++ file = fopen( cal_file_path, "r" );
++ if( file == NULL )
++ {
++ COMEDILIB_DEBUG( 3, "failed to open file\n" );
++ return NULL;
++ }
++ calib_yylex_init(&priv.yyscanner);
++ calib_yyrestart(file, priv.yyscanner);
++ if( calib_yyparse( &priv ) )
++ {
++ comedi_cleanup_calibration( priv.parsed_file );
++ priv.parsed_file = NULL;
++ }
++ calib_yylex_destroy(priv.yyscanner);
++ fclose( file );
++ fill_inverse_linear_polynomials(priv.parsed_file);
++ return priv.parsed_file;
++}
+
+
+Index: comedilib-0.10.1/lib/libinternal.h
+===================================================================
+--- comedilib-0.10.1.orig/lib/libinternal.h 2014-01-07 17:17:46.132065695 -0500
++++ comedilib-0.10.1/lib/libinternal.h 2014-01-07 17:20:57.106739088 -0500
+@@ -85,6 +85,8 @@
+ typedef struct subdevice_struct subdevice;
+ typedef struct device_struct device;
+
++typedef struct calib_yyparse_private calib_yyparse_private_t;
++
+ struct comedi_t_struct{
+ int magic;
+
+@@ -146,8 +148,6 @@
+ 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/05_automake_warning.patch comedilib-0.10.1/debian/patches/05_automake_warning.patch
--- comedilib-0.10.1/debian/patches/05_automake_warning.patch 1970-01-01 01:00:00.000000000 +0100
+++ comedilib-0.10.1/debian/patches/05_automake_warning.patch 2014-05-11 14:24:43.000000000 +0200
@@ -0,0 +1,21 @@
+Index: comedilib-0.10.1/configure.ac
+===================================================================
+--- comedilib-0.10.1.orig/configure.ac 2012-08-22 07:48:48.000000000 -0400
++++ comedilib-0.10.1/configure.ac 2014-01-08 15:09:19.160460885 -0500
+@@ -29,6 +29,8 @@
+ m4_define([scxi_lt_revision], [0])
+ m4_define([scxi_lt_age], [9])
+
++m4_pattern_allow([AM_PROG_AR])
++
+ # comedilib library version: major.minor.micro
+ # comedilib package version: major.minor.micro[letter]
+ #
+@@ -105,6 +107,7 @@
+ AM_PROG_LEX
+ AC_PROG_YACC
+ AC_PROG_LIBTOOL
++AM_PROG_AR
+
+ AC_HEADER_STDC([])
+
diff -Nru comedilib-0.10.1/debian/patches/series comedilib-0.10.1/debian/patches/series
--- comedilib-0.10.1/debian/patches/series 2013-08-14 22:59:28.000000000 +0200
+++ comedilib-0.10.1/debian/patches/series 2014-05-11 15:46:01.000000000 +0200
@@ -1,5 +1,5 @@
01_calibrate_build.patch
02_fix_manpages.patch
03_fix_compile.patch
-04_bison.patch
-
+04_new_bison.patch
+05_automake_warning.patch
diff -Nru comedilib-0.10.1/debian/rules comedilib-0.10.1/debian/rules
--- comedilib-0.10.1/debian/rules 2013-04-28 10:04:15.000000000 +0200
+++ comedilib-0.10.1/debian/rules 2014-05-11 18:57:57.000000000 +0200
@@ -25,9 +25,8 @@
configure: configure-stamp
configure-stamp:
dh_testdir
+ dh_autoreconf
#ln -s comedi-calibrate-1 comedi-calibrate
- cp /usr/share/misc/config.sub .
- cp /usr/share/misc/config.guess .
cp /usr/share/misc/config.sub comedi-calibrate/
cp /usr/share/misc/config.guess comedi-calibrate/
for pyvers in ${PYTHONS}; \
@@ -80,9 +79,6 @@
clean:
dh_testdir
dh_testroot
- rm -f config.sub
- rm -f config.guess
- rm -f config.log
rm -f *-stamp
rm -rf pybuild
rm -rf doc/doc_html/
@@ -108,6 +104,7 @@
[ ! -f comedi-calibrate/Makefile ]] || cd comedi-calibrate && [ ! -f Makefile ] || $(MAKE) distclean
find . -name Makefile -exec rm -f {} \;
#rm -f comedi-calibrate
+ dh_autoreconf_clean
dh_clean
install: build
--- End Message ---
