--- gpib-3.2.06.orig/debian/modutils/gpib +++ gpib-3.2.06/debian/modutils/gpib @@ -0,0 +1,12 @@ +alias char-major-160 gpib_common +post-install agilent_82350b /usr/sbin/gpib_config +post-install agilent_82357a /usr/sbin/gpib_config +post-install cb7210 /usr/sbin/gpib_config +post-install cec_gpib /usr/sbin/gpib_config +post-install hp82335 /usr/sbin/gpib_config +post-install hp_82341 /usr/sbin/gpib_config +post-install ines_gpib /usr/sbin/gpib_config +post-install ni_usb_gpib /usr/sbin/gpib_config +post-install pc2_gpib /usr/sbin/gpib_config +post-install tms9914 /usr/sbin/gpib_config +post-install tnt4882 /usr/sbin/gpib_config --- gpib-3.2.06.orig/debian/modprobe.d/gpib +++ gpib-3.2.06/debian/modprobe.d/gpib @@ -0,0 +1,12 @@ +alias char-major-160 gpib_common +install agilent_82350b /sbin/modprobe --ignore-install agilent_82350b && /usr/sbin/gpib_config +install agilent_82357a /sbin/modprobe --ignore-install agilent_82357a && /usr/sbin/gpib_config +install cb7210 /sbin/modprobe --ignore-install cb7210 && /usr/sbin/gpib_config +install cec_gpib /sbin/modprobe --ignore-install cec_gpib && /usr/sbin/gpib_config +install hp82335 /sbin/modprobe --ignore-install hp82335 && /usr/sbin/gpib_config +install hp_82341 /sbin/modprobe --ignore-install hp_82341 && /usr/sbin/gpib_config +install ines_gpib /sbin/modprobe --ignore-install ines_gpib && /usr/sbin/gpib_config +install ni_usb_gpib /sbin/modprobe --ignore-install ni_usb_gpib && /usr/sbin/gpib_config +install pc2_gpib /sbin/modprobe --ignore-install pc2_gpib && /usr/sbin/gpib_config +install tms9914 /sbin/modprobe --ignore-install tms9914 && /usr/sbin/gpib_config +install tnt4882 /sbin/modprobe --ignore-install tnt4882 && /usr/sbin/gpib_config --- gpib-3.2.06.orig/debian/patches/series +++ gpib-3.2.06/debian/patches/series @@ -0,0 +1,10 @@ +fix-conf-dev-installs.patch +remove-AM-CHECK-PYTHON-HEADERS.patch +build-python-from-toplevel.patch +dont-build-modules.patch +dont-install-pcmcia-and-usb-stuff.patch +regen-autotools.patch +no-segment.h.patch +new-pci-ids.h.patch +ines-gpib-irq-fix.patch -p0 +device-fix.patch -p0 --- gpib-3.2.06.orig/debian/patches/regen-autotools.patch +++ gpib-3.2.06/debian/patches/regen-autotools.patch @@ -0,0 +1,2213 @@ +Index: linux-gpib-3.2.02/examples/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/examples/Makefile.in 2004-12-30 04:16:27.000000000 +0100 ++++ linux-gpib-3.2.02/examples/Makefile.in 2005-01-17 15:55:57.293747659 +0100 +@@ -45,8 +45,7 @@ + subdir = examples + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -174,7 +173,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -182,16 +180,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +Index: linux-gpib-3.2.02/language/guile/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/language/guile/Makefile.in 2004-12-30 04:16:31.000000000 +0100 ++++ linux-gpib-3.2.02/language/guile/Makefile.in 2005-01-17 15:56:01.057880903 +0100 +@@ -52,8 +52,7 @@ + DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -167,7 +166,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -175,16 +173,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +Index: linux-gpib-3.2.02/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/Makefile.in 2004-12-30 04:16:47.000000000 +0100 ++++ linux-gpib-3.2.02/Makefile.in 2005-01-17 15:56:11.912265110 +0100 +@@ -51,8 +51,7 @@ + ltmain.sh missing mkinstalldirs py-compile + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ +@@ -161,7 +160,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -169,16 +167,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +@@ -419,7 +407,6 @@ + distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) +- $(mkdir_p) $(distdir)/m4 + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ +Index: linux-gpib-3.2.02/missing +=================================================================== +--- linux-gpib-3.2.02.orig/missing 2003-07-06 00:04:59.000000000 +0200 ++++ linux-gpib-3.2.02/missing 2005-01-17 15:55:53.936628821 +0100 +@@ -1,6 +1,10 @@ + #! /bin/sh + # Common stub for a few missing GNU programs while installing. +-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. ++ ++scriptversion=2004-09-07.08 ++ ++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004 ++# Free Software Foundation, Inc. + # Originally by Fran,cois Pinard , 1996. + + # This program is free software; you can redistribute it and/or modify +@@ -38,18 +42,24 @@ + configure_ac=configure.in + fi + ++msg="missing on your system" ++ + case "$1" in + --run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 ++ # Exit code 63 means version mismatch. This often happens ++ # when the user try to use an ancient version of a tool on ++ # a file that requires a minimum version. In this case we ++ # we should proceed has if the program had been absent, or ++ # if --run hadn't been passed. ++ if test $? = 63; then ++ run=: ++ msg="probably too old" ++ fi + ;; +-esac +- +-# If it does not exist, or fails to run (possibly an outdated version), +-# try to emulate it. +-case "$1" in + + -h|--h|--he|--hel|--help) + echo "\ +@@ -74,11 +84,15 @@ + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags +- yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ++ yacc create \`y.tab.[ch]', if possible, from existing .[ch] ++ ++Send bug reports to ." ++ exit 0 + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) +- echo "missing 0.3 - GNU automake" ++ echo "missing $scriptversion (GNU Automake)" ++ exit 0 + ;; + + -*) +@@ -87,9 +101,44 @@ + exit 1 + ;; + +- aclocal) ++esac ++ ++# Now exit if we have it, but it failed. Also exit now if we ++# don't have it and --version was passed (most likely to detect ++# the program). ++case "$1" in ++ lex|yacc) ++ # Not GNU programs, they don't have --version. ++ ;; ++ ++ tar) ++ if test -n "$run"; then ++ echo 1>&2 "ERROR: \`tar' requires --run" ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ exit 1 ++ fi ++ ;; ++ ++ *) ++ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then ++ # We have it, but it failed. ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ # Could not run --version or --help. This is probably someone ++ # running `$TOOL --version' or `$TOOL --help' to check whether ++ # $TOOL exists and not knowing $TOOL uses missing. ++ exit 1 ++ fi ++ ;; ++esac ++ ++# If it does not exist, or fails to run (possibly an outdated version), ++# try to emulate it. ++case "$1" in ++ aclocal*) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." +@@ -98,7 +147,7 @@ + + autoconf) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." +@@ -107,7 +156,7 @@ + + autoheader) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." +@@ -124,9 +173,9 @@ + touch $touch_files + ;; + +- automake) ++ automake*) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." +@@ -135,9 +184,32 @@ + while read f; do touch "$f"; done + ;; + ++ autom4te) ++ echo 1>&2 "\ ++WARNING: \`$1' is needed, but is $msg. ++ You might have modified some files without having the ++ proper tools for further handling them. ++ You can get \`$1' as part of \`Autoconf' from any GNU ++ archive site." ++ ++ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` ++ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` ++ if test -f "$file"; then ++ touch $file ++ else ++ test -z "$file" || exec >$file ++ echo "#! /bin/sh" ++ echo "# Created by GNU Automake missing as a replacement of" ++ echo "# $ $@" ++ echo "exit 0" ++ chmod +x $file ++ exit 1 ++ fi ++ ;; ++ + bison|yacc) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." +@@ -167,7 +239,7 @@ + + lex|flex) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." +@@ -190,7 +262,7 @@ + + help2man) + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." +@@ -209,13 +281,8 @@ + ;; + + makeinfo) +- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then +- # We have makeinfo, but it failed. +- exit 1 +- fi +- + echo 1>&2 "\ +-WARNING: \`$1' is missing on your system. You should only need it if ++WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, +@@ -231,32 +298,28 @@ + + tar) + shift +- if test -n "$run"; then +- echo 1>&2 "ERROR: \`tar' requires --run" +- exit 1 +- fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then +- gnutar ${1+"$@"} && exit 0 ++ gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then +- gtar ${1+"$@"} && exit 0 ++ gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` +- tar "$firstarg" ${1+"$@"} && exit 0 ++ tar "$firstarg" "$@" && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` +- tar "$firstarg" ${1+"$@"} && exit 0 ++ tar "$firstarg" "$@" && exit 0 + ;; + esac + fi +@@ -270,10 +333,10 @@ + + *) + echo 1>&2 "\ +-WARNING: \`$1' is needed, and you do not seem to have it handy on your +- system. You might have modified some files without having the ++WARNING: \`$1' is needed, and is $msg. ++ You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, +- it often tells you about the needed prerequirements for installing ++ it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 +@@ -281,3 +344,10 @@ + esac + + exit 0 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +Index: linux-gpib-3.2.02/doc/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/doc/Makefile.in 2004-12-30 04:16:23.000000000 +0100 ++++ linux-gpib-3.2.02/doc/Makefile.in 2005-01-17 15:55:54.377644432 +0100 +@@ -48,8 +48,7 @@ + subdir = doc + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -146,7 +145,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -154,16 +152,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +Index: linux-gpib-3.2.02/driver/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/driver/Makefile.in 2004-12-30 04:16:24.000000000 +0100 ++++ linux-gpib-3.2.02/driver/Makefile.in 2005-01-17 15:55:55.019667159 +0100 +@@ -47,8 +47,7 @@ + subdir = driver + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -145,7 +144,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -153,16 +151,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +@@ -432,7 +420,7 @@ + dist-hook + check-am: all-am + check: check-recursive +-all-am: Makefile all-local ++all-am: Makefile + installdirs: installdirs-recursive + installdirs-am: + install: install-recursive +@@ -461,7 +449,7 @@ + @echo "it deletes files that may require special tools to rebuild." + clean: clean-recursive + +-clean-am: clean-generic clean-libtool clean-local mostlyclean-am ++clean-am: clean-generic clean-libtool mostlyclean-am + + distclean: distclean-recursive + -rm -f Makefile +@@ -479,8 +467,6 @@ + info-am: + + install-data-am: +- @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + + install-exec-am: + +@@ -510,35 +496,34 @@ + + uninstall-info: uninstall-info-recursive + +-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am all-local check \ +- check-am clean clean-generic clean-libtool clean-local \ +- clean-recursive ctags ctags-recursive dist-hook distclean \ +- distclean-generic distclean-libtool distclean-recursive \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am \ +- install-data-hook install-exec install-exec-am install-info \ +- install-info-am install-man install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic maintainer-clean-recursive \ +- mostlyclean mostlyclean-generic mostlyclean-libtool \ +- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am uninstall-info-am ++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ ++ clean clean-generic clean-libtool clean-recursive ctags \ ++ ctags-recursive dist-hook distclean distclean-generic \ ++ distclean-libtool distclean-recursive distclean-tags distdir \ ++ dvi dvi-am html html-am info info-am install install-am \ ++ install-data install-data-am install-exec install-exec-am \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs installdirs-am \ ++ maintainer-clean maintainer-clean-generic \ ++ maintainer-clean-recursive mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ ++ tags tags-recursive uninstall uninstall-am uninstall-info-am + + + -include $(top_srcdir)/util/linux_flags/flags + +-all-local: ++modules-all-local: + $(RM) $(GPIB_MODVERDIR)/* + $(MAKE) -C $(LINUX_SRCDIR) V=1 modules\ + CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \ + SUBDIRS="$(GPIB_ABS_MODULE_SUBDIRS)" \ + MODVERDIR="$(GPIB_MODVERDIR)" + +-clean-local: ++modules-clean-local: + find $(srcdir) \( -name '*.[oas]' -o -name '*.ko' -o -name core -o -name '.*.cmd' \) -type f \ + -exec $(RM) {} \; + +-install-data-hook: device-file-check /etc/gpib.conf ++setup-data-hook: device-file-check /etc/gpib.conf + for module in $(GPIB_MODULES) ; do \ + $(INSTALL_DATA) -D $$module $(LINUX_MODLIB)/gpib/$$(basename $$module) ; \ + done +Index: linux-gpib-3.2.02/configure +=================================================================== +--- linux-gpib-3.2.02.orig/configure 2004-12-30 02:51:29.000000000 +0100 ++++ linux-gpib-3.2.02/configure 2005-01-17 15:55:34.951956733 +0100 +@@ -463,7 +463,7 @@ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GPIB_SO_VERSION ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LINUX_SRCDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL JW_PATH DEPMOD PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PERL TCL_VERSION TCL_BIN_DIR TCL_INC_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC PHP_CONFIG PYTHON_INCLUDES ALLOCA LIBOBJS LIBGPIB_CFLAGS LIBGPIB_LDFLAGS IBMAJOR BUILD_DOCS_TRUE BUILD_DOCS_FALSE BIND_GUILE_TRUE BIND_GUILE_FALSE BIND_PERL_TRUE BIND_PERL_FALSE BIND_PHP_TRUE BIND_PHP_FALSE BIND_PYTHON_TRUE BIND_PYTHON_FALSE BIND_TCL_TRUE BIND_TCL_FALSE LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GPIB_SO_VERSION ISODATE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LINUX_SRCDIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LEX LEXLIB LEX_OUTPUT_ROOT YACC EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL JW_PATH DEPMOD PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PERL PHP_CONFIG ALLOCA LIBOBJS LIBGPIB_CFLAGS LIBGPIB_LDFLAGS IBMAJOR BUILD_DOCS_TRUE BUILD_DOCS_FALSE BIND_GUILE_TRUE BIND_GUILE_FALSE BIND_PERL_TRUE BIND_PERL_FALSE BIND_PHP_TRUE BIND_PHP_FALSE BIND_PYTHON_TRUE BIND_PYTHON_FALSE BIND_TCL_TRUE BIND_TCL_FALSE LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -1054,7 +1054,6 @@ + both] + --with-tags[=TAGS] + include additional configurations [automatic] +- --with-tcl=DIR directory containing tcl configuration (tclConfig.sh) + + Some influential environment variables: + CC C compiler command +@@ -4207,7 +4206,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4210 "configure"' > conftest.$ac_ext ++ echo '#line 4209 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -5771,7 +5770,7 @@ + + + # Provide some information about the compiler. +-echo "$as_me:5774:" \ ++echo "$as_me:5773:" \ + "checking for Fortran 77 compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +@@ -6803,11 +6802,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6806: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6805: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6810: \$? = $ac_status" >&5 ++ echo "$as_me:6809: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -7036,11 +7035,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7039: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7038: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:7043: \$? = $ac_status" >&5 ++ echo "$as_me:7042: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -7096,11 +7095,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7099: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7098: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7103: \$? = $ac_status" >&5 ++ echo "$as_me:7102: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9284,7 +9283,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:11561: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11566: \$? = $ac_status" >&5 ++ echo "$as_me:11565: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -11619,11 +11618,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11622: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11621: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:11626: \$? = $ac_status" >&5 ++ echo "$as_me:11625: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12988,7 +12987,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:13915: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13920: \$? = $ac_status" >&5 ++ echo "$as_me:13919: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -13973,11 +13972,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13976: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13975: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13980: \$? = $ac_status" >&5 ++ echo "$as_me:13979: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16018,11 +16017,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16021: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16020: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16025: \$? = $ac_status" >&5 ++ echo "$as_me:16024: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -16251,11 +16250,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16254: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16253: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16258: \$? = $ac_status" >&5 ++ echo "$as_me:16257: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings +@@ -16311,11 +16310,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16314: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16313: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16318: \$? = $ac_status" >&5 ++ echo "$as_me:16317: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -18499,7 +18498,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&6;} + BIND_PERL="no" + fi +- +- # +- # Ok, lets find the tcl configuration +- # First, look for one uninstalled. +- # the alternative search directory is invoked by --with-tcl +- # +- +- if test x"${no_tcl}" = x ; then +- # we reset no_tcl in case something fails here +- no_tcl=true +- +-# Check whether --with-tcl or --without-tcl was given. +-if test "${with_tcl+set}" = set; then +- withval="$with_tcl" +- with_tclconfig=${withval} +-fi; +- echo "$as_me:$LINENO: checking for Tcl configuration" >&5 +-echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6 +- if test "${ac_cv_c_tclconfig+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- +- +- # First check to see if --with-tcl was specified. +- if test x"${with_tclconfig}" != x ; then +- if test -f "${with_tclconfig}/tclConfig.sh" ; then +- ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)` +- else +- { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5 +-echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;} +- { (exit 1); exit 1; }; } +- fi +- fi +- +- # then check for a private Tcl installation +- if test x"${ac_cv_c_tclconfig}" = x ; then +- for i in \ +- ../tcl \ +- `ls -dr ../tcl[8-9].[0-9]* 2>/dev/null` \ +- ../../tcl \ +- `ls -dr ../../tcl[8-9].[0-9]* 2>/dev/null` \ +- ../../../tcl \ +- `ls -dr ../../../tcl[8-9].[0-9]* 2>/dev/null` ; do +- if test -f "$i/unix/tclConfig.sh" ; then +- ac_cv_c_tclconfig=`(cd $i/unix; pwd)` +- break +- fi +- done +- fi +- +- # check in a few common install locations +- if test x"${ac_cv_c_tclconfig}" = x ; then +- for i in `ls -d ${libdir} 2>/dev/null` \ +- `ls -d /usr/local/lib 2>/dev/null` \ +- `ls -d /usr/contrib/lib 2>/dev/null` \ +- `ls -d /usr/lib 2>/dev/null` \ +- `ls -dr /usr/lib/tcl[8-9].[0-9]* 2>/dev/null` \ +- ; do +- if test -f "$i/tclConfig.sh" ; then +- ac_cv_c_tclconfig=`(cd $i; pwd)` +- break +- fi +- done +- fi +- +- # check in a few other private locations +- if test x"${ac_cv_c_tclconfig}" = x ; then +- for i in \ +- ${srcdir}/../tcl \ +- `ls -dr ${srcdir}/../tcl[8-9].[0-9]* 2>/dev/null` ; do +- if test -f "$i/unix/tclConfig.sh" ; then +- ac_cv_c_tclconfig=`(cd $i/unix; pwd)` +- break +- fi +- done +- fi +- +-fi +- +- +- if test x"${ac_cv_c_tclconfig}" = x ; then +- TCL_BIN_DIR="# no Tcl configs found" +- { echo "$as_me:$LINENO: WARNING: +- Can't find Tcl configuration definitions, use --with-tcl to specify +- a directory." >&5 +-echo "$as_me: WARNING: +- Can't find Tcl configuration definitions, use --with-tcl to specify +- a directory." >&2;} +- else +- no_tcl= +- TCL_BIN_DIR=${ac_cv_c_tclconfig} +- echo "$as_me:$LINENO: result: found $TCL_BIN_DIR/tclConfig.sh" >&5 +-echo "${ECHO_T}found $TCL_BIN_DIR/tclConfig.sh" >&6 +- fi +- fi +- ++SC_PATH_TCLCONFIG + if [ $no_tcl ]; then + { echo "$as_me:$LINENO: TCL config not found, disabling TCL binding" >&5 + echo "$as_me: TCL config not found, disabling TCL binding" >&6;} + BIND_TCL="no" + else +- +- echo "$as_me:$LINENO: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5 +-echo $ECHO_N "checking for existence of $TCL_BIN_DIR/tclConfig.sh... $ECHO_C" >&6 +- +- if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then +- echo "$as_me:$LINENO: result: loading" >&5 +-echo "${ECHO_T}loading" >&6 +- . $TCL_BIN_DIR/tclConfig.sh +- else +- echo "$as_me:$LINENO: result: file not found" >&5 +-echo "${ECHO_T}file not found" >&6 +- fi +- +- # +- # If the TCL_BIN_DIR is the build directory (not the install directory), +- # then set the common variable name to the value of the build variables. +- # For example, the variable TCL_LIB_SPEC will be set to the value +- # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC +- # instead of TCL_BUILD_LIB_SPEC since it will work with both an +- # installed and uninstalled version of Tcl. +- # +- +- if test -f $TCL_BIN_DIR/Makefile ; then +- TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC} +- TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC} +- TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH} +- fi +- +- # +- # eval is required to do the TCL_DBGX substitution +- # +- +- eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\"" +- eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\"" +- eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\"" +- +- eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\"" +- eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\"" +- eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\"" +- +- +- +- if [ ! $TCL_INC_DIR ]; then +- TCL_INC_DIR=${TCL_PREFIX}/include +- fi +- +- +- +- +- +- +- +- +- +- +- ++ SC_LOAD_TCLCONFIG + fi + # Extract the first word of "php-config", so it can be a program name with args. + set dummy php-config; ac_word=$2 +@@ -20489,59 +20338,6 @@ + + done + +- +-echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5 +-echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6 +-py_prefix=`$PYTHON -c "import sys; print sys.prefix"` +-py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" +-if test "$py_prefix" != "$py_exec_prefix"; then +- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" +-fi +- +-save_CPPFLAGS="$CPPFLAGS" +-CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include +-_ACEOF +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then +- echo "$as_me:$LINENO: result: found" >&5 +-echo "${ECHO_T}found" >&6 +- +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- echo "$as_me:$LINENO: result: not found" >&5 +-echo "${ECHO_T}not found" >&6 +-BIND_PYTHON=no;{ echo "$as_me:$LINENO: python headers not found, disabling python binding" >&5 +-echo "$as_me: python headers not found, disabling python binding" >&6;} +-fi +-rm -f conftest.err conftest.$ac_ext +-CPPFLAGS="$save_CPPFLAGS" +- + if test "${ac_cv_header_libguile_h+set}" = set; then + echo "$as_me:$LINENO: checking for libguile.h" >&5 + echo $ECHO_N "checking for libguile.h... $ECHO_C" >&6 +@@ -23335,18 +23131,7 @@ + s,@pyexecdir@,$pyexecdir,;t t + s,@pkgpyexecdir@,$pkgpyexecdir,;t t + s,@PERL@,$PERL,;t t +-s,@TCL_VERSION@,$TCL_VERSION,;t t +-s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t +-s,@TCL_INC_DIR@,$TCL_INC_DIR,;t t +-s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t +-s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t +-s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t +-s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t +-s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t +-s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t +-s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t + s,@PHP_CONFIG@,$PHP_CONFIG,;t t +-s,@PYTHON_INCLUDES@,$PYTHON_INCLUDES,;t t + s,@ALLOCA@,$ALLOCA,;t t + s,@LIBOBJS@,$LIBOBJS,;t t + s,@LIBGPIB_CFLAGS@,$LIBGPIB_CFLAGS,;t t +Index: linux-gpib-3.2.02/test/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/test/Makefile.in 2004-12-30 04:16:43.000000000 +0100 ++++ linux-gpib-3.2.02/test/Makefile.in 2005-01-17 15:56:08.203133823 +0100 +@@ -42,8 +42,7 @@ + subdir = test + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -149,7 +148,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -157,16 +155,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +Index: linux-gpib-3.2.02/language/python/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/language/python/Makefile.in 2004-12-30 04:16:35.000000000 +0100 ++++ linux-gpib-3.2.02/language/python/Makefile.in 2005-01-17 15:56:02.582934886 +0100 +@@ -47,8 +47,7 @@ + subdir = language/python + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -136,7 +135,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -144,16 +142,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +Index: linux-gpib-3.2.02/language/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/language/Makefile.in 2004-12-30 04:16:30.000000000 +0100 ++++ linux-gpib-3.2.02/language/Makefile.in 2005-01-17 15:56:00.487860725 +0100 +@@ -47,8 +47,7 @@ + subdir = language + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -145,7 +144,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -153,16 +151,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +Index: linux-gpib-3.2.02/driver/include/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/driver/include/Makefile.in 2004-12-30 04:16:25.000000000 +0100 ++++ linux-gpib-3.2.02/driver/include/Makefile.in 2005-01-17 15:55:55.588687302 +0100 +@@ -49,8 +49,7 @@ + DIST_COMMON = $(headers_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -149,7 +148,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -157,16 +155,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +Index: linux-gpib-3.2.02/mkinstalldirs +=================================================================== +--- linux-gpib-3.2.02.orig/mkinstalldirs 2003-07-06 00:04:59.000000000 +0200 ++++ linux-gpib-3.2.02/mkinstalldirs 2005-01-17 15:56:11.636255341 +0100 +@@ -1,40 +1,150 @@ + #! /bin/sh + # mkinstalldirs --- make directory hierarchy +-# Author: Noah Friedman +-# Created: 1993-05-16 +-# Public domain + +-# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $ ++scriptversion=2004-02-15.20 ++ ++# Original author: Noah Friedman ++# Created: 1993-05-16 ++# Public domain. ++# ++# This file is maintained in Automake, please report ++# bugs to or send patches to ++# . + + errstatus=0 ++dirmode="" ++ ++usage="\ ++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... ++ ++Create each directory DIR (with mode MODE, if specified), including all ++leading file name components. ++ ++Report bugs to ." ++ ++# process command line arguments ++while test $# -gt 0 ; do ++ case $1 in ++ -h | --help | --h*) # -h for help ++ echo "$usage" ++ exit 0 ++ ;; ++ -m) # -m PERM arg ++ shift ++ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } ++ dirmode=$1 ++ shift ++ ;; ++ --version) ++ echo "$0 $scriptversion" ++ exit 0 ++ ;; ++ --) # stop option processing ++ shift ++ break ++ ;; ++ -*) # unknown option ++ echo "$usage" 1>&2 ++ exit 1 ++ ;; ++ *) # first non-opt arg ++ break ++ ;; ++ esac ++done ++ ++for file ++do ++ if test -d "$file"; then ++ shift ++ else ++ break ++ fi ++done ++ ++case $# in ++ 0) exit 0 ;; ++esac ++ ++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and ++# mkdir -p a/c at the same time, both will detect that a is missing, ++# one will create a, then the other will try to create a and die with ++# a "File exists" error. This is a problem when calling mkinstalldirs ++# from a parallel make. We use --version in the probe to restrict ++# ourselves to GNU mkdir, which is thread-safe. ++case $dirmode in ++ '') ++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ++ echo "mkdir -p -- $*" ++ exec mkdir -p -- "$@" ++ else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ test -d ./-p && rmdir ./-p ++ test -d ./--version && rmdir ./--version ++ fi ++ ;; ++ *) ++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && ++ test ! -d ./--version; then ++ echo "mkdir -m $dirmode -p -- $*" ++ exec mkdir -m "$dirmode" -p -- "$@" ++ else ++ # Clean up after NextStep and OpenStep mkdir. ++ for d in ./-m ./-p ./--version "./$dirmode"; ++ do ++ test -d $d && rmdir $d ++ done ++ fi ++ ;; ++esac + + for file + do +- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` +- shift ++ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` ++ shift + +- pathcomp= +- for d +- do +- pathcomp="$pathcomp$d" +- case "$pathcomp" in +- -* ) pathcomp=./$pathcomp ;; +- esac +- +- if test ! -d "$pathcomp"; then +- echo "mkdir $pathcomp" +- +- mkdir "$pathcomp" || lasterr=$? +- +- if test ! -d "$pathcomp"; then +- errstatus=$lasterr +- fi +- fi ++ pathcomp= ++ for d ++ do ++ pathcomp="$pathcomp$d" ++ case $pathcomp in ++ -*) pathcomp=./$pathcomp ;; ++ esac ++ ++ if test ! -d "$pathcomp"; then ++ echo "mkdir $pathcomp" ++ ++ mkdir "$pathcomp" || lasterr=$? ++ ++ if test ! -d "$pathcomp"; then ++ errstatus=$lasterr ++ else ++ if test ! -z "$dirmode"; then ++ echo "chmod $dirmode $pathcomp" ++ lasterr="" ++ chmod "$dirmode" "$pathcomp" || lasterr=$? ++ ++ if test ! -z "$lasterr"; then ++ errstatus=$lasterr ++ fi ++ fi ++ fi ++ fi + +- pathcomp="$pathcomp/" +- done ++ pathcomp="$pathcomp/" ++ done + done + + exit $errstatus + +-# mkinstalldirs ends here ++# Local Variables: ++# mode: shell-script ++# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +Index: linux-gpib-3.2.02/language/php/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/language/php/Makefile.in 2004-12-30 04:16:33.000000000 +0100 ++++ linux-gpib-3.2.02/language/php/Makefile.in 2005-01-17 15:56:01.913911204 +0100 +@@ -50,8 +50,7 @@ + subdir = language/php + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -171,7 +170,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -179,16 +177,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +Index: linux-gpib-3.2.02/aclocal.m4 +=================================================================== +--- linux-gpib-3.2.02.orig/aclocal.m4 2004-12-30 02:51:04.000000000 +0100 ++++ linux-gpib-3.2.02/aclocal.m4 2005-01-17 15:55:24.485586172 +0100 +@@ -7184,5 +7184,3 @@ + AC_SUBST([am__untar]) + ]) # _AM_PROG_TAR + +-m4_include([m4/am-check-python-headers.m4]) +-m4_include([m4/tcl.m4]) +Index: linux-gpib-3.2.02/language/tcl/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/language/tcl/Makefile.in 2004-12-30 04:16:36.000000000 +0100 ++++ linux-gpib-3.2.02/language/tcl/Makefile.in 2005-01-17 15:56:03.060951806 +0100 +@@ -50,8 +50,7 @@ + subdir = language/tcl + DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -164,7 +163,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -172,16 +170,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = $(shell $(SHELL) -c '. $(TCL_CONFIG); eval echo $${TCL_LIB_SPEC};') +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +@@ -235,6 +223,7 @@ + lib_LTLIBRARIES = libgpib_tcl.la + libgpib_tcl_la_SOURCES = ibCmds.c + TCL_CONFIG = $(TCL_BIN_DIR)/tclConfig.sh ++TCL_LIB_SPEC = $(shell $(SHELL) -c '. $(TCL_CONFIG); eval echo $${TCL_LIB_SPEC};') + + #fix tcl directory for version independence + libgpib_tcl_la_CFLAGS = $(LIBGPIB_CFLAGS) -I$(TCL_INC_DIR) +Index: linux-gpib-3.2.02/install-sh +=================================================================== +--- linux-gpib-3.2.02.orig/install-sh 2003-07-06 00:04:59.000000000 +0200 ++++ linux-gpib-3.2.02/install-sh 2005-01-17 15:55:53.930628608 +0100 +@@ -1,19 +1,38 @@ + #!/bin/sh +-# + # install - install a program, script, or datafile +-# This comes from X11R5 (mit/util/scripts/install.sh). ++ ++scriptversion=2004-12-17.09 ++ ++# This originates from X11R5 (mit/util/scripts/install.sh), which was ++# later released in X11R6 (xc/config/util/install.sh) with the ++# following copyright and license. ++# ++# Copyright (C) 1994 X Consortium ++# ++# Permission is hereby granted, free of charge, to any person obtaining a copy ++# of this software and associated documentation files (the "Software"), to ++# deal in the Software without restriction, including without limitation the ++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or ++# sell copies of the Software, and to permit persons to whom the Software is ++# furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice shall be included in ++# all copies or substantial portions of the Software. + # +-# Copyright 1991 by the Massachusetts Institute of Technology ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- ++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + # +-# Permission to use, copy, modify, distribute, and sell this software and its +-# documentation for any purpose is hereby granted without fee, provided that +-# the above copyright notice appear in all copies and that both that +-# copyright notice and this permission notice appear in supporting +-# documentation, and that the name of M.I.T. not be used in advertising or +-# publicity pertaining to distribution of the software without specific, +-# written prior permission. M.I.T. makes no representations about the +-# suitability of this software for any purpose. It is provided "as is" +-# without express or implied warranty. ++# Except as contained in this notice, the name of the X Consortium shall not ++# be used in advertising or otherwise to promote the sale, use or other deal- ++# ings in this Software without prior written authorization from the X Consor- ++# tium. ++# ++# ++# FSF changes to this file are in the public domain. + # + # Calling this script install-sh is preferred over install.sh, to prevent + # `make' implicit rules from creating a file called install from it +@@ -23,13 +42,11 @@ + # from scratch. It can only install one file at a time, a restriction + # shared with many OS's install programs. + +- + # set DOITPROG to echo to test this script + + # Don't use :- since 4.3BSD and earlier shells don't like it. + doit="${DOITPROG-}" + +- + # put in absolute paths if you don't have them in your path; or use env. vars. + + mvprog="${MVPROG-mv}" +@@ -41,211 +58,266 @@ + rmprog="${RMPROG-rm}" + mkdirprog="${MKDIRPROG-mkdir}" + +-transformbasename="" +-transform_arg="" +-instcmd="$mvprog" + chmodcmd="$chmodprog 0755" +-chowncmd="" +-chgrpcmd="" +-stripcmd="" ++chowncmd= ++chgrpcmd= ++stripcmd= + rmcmd="$rmprog -f" + mvcmd="$mvprog" +-src="" +-dst="" +-dir_arg="" +- +-while [ x"$1" != x ]; do +- case $1 in +- -c) instcmd="$cpprog" +- shift +- continue;; +- +- -d) dir_arg=true +- shift +- continue;; +- +- -m) chmodcmd="$chmodprog $2" +- shift +- shift +- continue;; +- +- -o) chowncmd="$chownprog $2" +- shift +- shift +- continue;; +- +- -g) chgrpcmd="$chgrpprog $2" +- shift +- shift +- continue;; +- +- -s) stripcmd="$stripprog" +- shift +- continue;; +- +- -t=*) transformarg=`echo $1 | sed 's/-t=//'` +- shift +- continue;; +- +- -b=*) transformbasename=`echo $1 | sed 's/-b=//'` +- shift +- continue;; +- +- *) if [ x"$src" = x ] +- then +- src=$1 +- else +- # this colon is to work around a 386BSD /bin/sh bug +- : +- dst=$1 +- fi +- shift +- continue;; +- esac +-done +- +-if [ x"$src" = x ] +-then +- echo "install: no input file specified" +- exit 1 +-else +- true +-fi +- +-if [ x"$dir_arg" != x ]; then +- dst=$src +- src="" +- +- if [ -d $dst ]; then +- instcmd=: +- chmodcmd="" +- else +- instcmd=mkdir +- fi +-else +- +-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command +-# might cause directories to be created, which would be especially bad +-# if $src (and thus $dsttmp) contains '*'. +- +- if [ -f $src -o -d $src ] +- then +- true +- else +- echo "install: $src does not exist" +- exit 1 +- fi +- +- if [ x"$dst" = x ] +- then +- echo "install: no destination specified" +- exit 1 +- else +- true +- fi +- +-# If destination is a directory, append the input filename; if your system +-# does not like double slashes in filenames, you may need to add some logic +- +- if [ -d $dst ] +- then +- dst="$dst"/`basename $src` +- else +- true +- fi +-fi +- +-## this sed command emulates the dirname command +-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` +- +-# Make sure that the destination directory exists. +-# this part is taken from Noah Friedman's mkinstalldirs script ++src= ++dst= ++dir_arg= ++dstarg= ++no_target_directory= ++ ++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE ++ or: $0 [OPTION]... SRCFILES... DIRECTORY ++ or: $0 [OPTION]... -t DIRECTORY SRCFILES... ++ or: $0 [OPTION]... -d DIRECTORIES... ++ ++In the 1st form, copy SRCFILE to DSTFILE. ++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. ++In the 4th, create DIRECTORIES. ++ ++Options: ++-c (ignored) ++-d create directories instead of installing files. ++-g GROUP $chgrpprog installed files to GROUP. ++-m MODE $chmodprog installed files to MODE. ++-o USER $chownprog installed files to USER. ++-s $stripprog installed files. ++-t DIRECTORY install into DIRECTORY. ++-T report an error if DSTFILE is a directory. ++--help display this help and exit. ++--version display version info and exit. ++ ++Environment variables override the default commands: ++ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG ++" ++ ++while test -n "$1"; do ++ case $1 in ++ -c) shift ++ continue;; ++ ++ -d) dir_arg=true ++ shift ++ continue;; ++ ++ -g) chgrpcmd="$chgrpprog $2" ++ shift ++ shift ++ continue;; ++ ++ --help) echo "$usage"; exit 0;; ++ ++ -m) chmodcmd="$chmodprog $2" ++ shift ++ shift ++ continue;; ++ ++ -o) chowncmd="$chownprog $2" ++ shift ++ shift ++ continue;; ++ ++ -s) stripcmd=$stripprog ++ shift ++ continue;; + +-# Skip lots of stat calls in the usual case. +-if [ ! -d "$dstdir" ]; then +-defaultIFS=' +-' +-IFS="${IFS-${defaultIFS}}" +- +-oIFS="${IFS}" +-# Some sh's can't handle IFS=/ for some reason. +-IFS='%' +-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` +-IFS="${oIFS}" +- +-pathcomp='' ++ -t) dstarg=$2 ++ shift ++ shift ++ continue;; + +-while [ $# -ne 0 ] ; do +- pathcomp="${pathcomp}${1}" ++ -T) no_target_directory=true + shift ++ continue;; + +- if [ ! -d "${pathcomp}" ] ; +- then +- $mkdirprog "${pathcomp}" +- else +- true +- fi ++ --version) echo "$0 $scriptversion"; exit 0;; + +- pathcomp="${pathcomp}/" ++ *) # When -d is used, all remaining arguments are directories to create. ++ # When -t is used, the destination is already specified. ++ test -n "$dir_arg$dstarg" && break ++ # Otherwise, the last argument is the destination. Remove it from $@. ++ for arg ++ do ++ if test -n "$dstarg"; then ++ # $@ is not empty: it contains at least $arg. ++ set fnord "$@" "$dstarg" ++ shift # fnord ++ fi ++ shift # arg ++ dstarg=$arg ++ done ++ break;; ++ esac + done +-fi +- +-if [ x"$dir_arg" != x ] +-then +- $doit $instcmd $dst && +- +- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi +-else +- +-# If we're going to rename the final executable, determine the name now. +- +- if [ x"$transformarg" = x ] +- then +- dstfile=`basename $dst` +- else +- dstfile=`basename $dst $transformbasename | +- sed $transformarg`$transformbasename +- fi +- +-# don't allow the sed command to completely eliminate the filename +- +- if [ x"$dstfile" = x ] +- then +- dstfile=`basename $dst` +- else +- true +- fi +- +-# Make a temp file name in the proper directory. +- +- dsttmp=$dstdir/#inst.$$# +- +-# Move or copy the file name to the temp name + +- $doit $instcmd $src $dsttmp && +- +- trap "rm -f ${dsttmp}" 0 && +- +-# and set any options; do chmod last to preserve setuid bits +- +-# If any of these fail, we abort the whole thing. If we want to +-# ignore errors from any of these, just make sure not to ignore +-# errors from the above "$doit $instcmd $src $dsttmp" command. +- +- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && +- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && +- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && +- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && +- +-# Now rename the file to the real destination. +- +- $doit $rmcmd -f $dstdir/$dstfile && +- $doit $mvcmd $dsttmp $dstdir/$dstfile ++if test -z "$1"; then ++ if test -z "$dir_arg"; then ++ echo "$0: no input file specified." >&2 ++ exit 1 ++ fi ++ # It's OK to call `install-sh -d' without argument. ++ # This can happen when creating conditional directories. ++ exit 0 ++fi + +-fi && ++for src ++do ++ # Protect names starting with `-'. ++ case $src in ++ -*) src=./$src ;; ++ esac ++ ++ if test -n "$dir_arg"; then ++ dst=$src ++ src= ++ ++ if test -d "$dst"; then ++ mkdircmd=: ++ chmodcmd= ++ else ++ mkdircmd=$mkdirprog ++ fi ++ else ++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command ++ # might cause directories to be created, which would be especially bad ++ # if $src (and thus $dsttmp) contains '*'. ++ if test ! -f "$src" && test ! -d "$src"; then ++ echo "$0: $src does not exist." >&2 ++ exit 1 ++ fi ++ ++ if test -z "$dstarg"; then ++ echo "$0: no destination specified." >&2 ++ exit 1 ++ fi ++ ++ dst=$dstarg ++ # Protect names starting with `-'. ++ case $dst in ++ -*) dst=./$dst ;; ++ esac + ++ # If destination is a directory, append the input filename; won't work ++ # if double slashes aren't ignored. ++ if test -d "$dst"; then ++ if test -n "$no_target_directory"; then ++ echo "$0: $dstarg: Is a directory" >&2 ++ exit 1 ++ fi ++ dst=$dst/`basename "$src"` ++ fi ++ fi ++ ++ # This sed command emulates the dirname command. ++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` ++ ++ # Make sure that the destination directory exists. ++ ++ # Skip lots of stat calls in the usual case. ++ if test ! -d "$dstdir"; then ++ defaultIFS=' ++ ' ++ IFS="${IFS-$defaultIFS}" ++ ++ oIFS=$IFS ++ # Some sh's can't handle IFS=/ for some reason. ++ IFS='%' ++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` ++ shift ++ IFS=$oIFS ++ ++ pathcomp= ++ ++ while test $# -ne 0 ; do ++ pathcomp=$pathcomp$1 ++ shift ++ if test ! -d "$pathcomp"; then ++ $mkdirprog "$pathcomp" ++ # mkdir can fail with a `File exist' error in case several ++ # install-sh are creating the directory concurrently. This ++ # is OK. ++ test -d "$pathcomp" || exit ++ fi ++ pathcomp=$pathcomp/ ++ done ++ fi ++ ++ if test -n "$dir_arg"; then ++ $doit $mkdircmd "$dst" \ ++ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } ++ ++ else ++ dstfile=`basename "$dst"` ++ ++ # Make a couple of temp file names in the proper directory. ++ dsttmp=$dstdir/_inst.$$_ ++ rmtmp=$dstdir/_rm.$$_ ++ ++ # Trap to clean up those temp files at exit. ++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 ++ trap '(exit $?); exit' 1 2 13 15 ++ ++ # Copy the file name to the temp name. ++ $doit $cpprog "$src" "$dsttmp" && ++ ++ # and set any options; do chmod last to preserve setuid bits. ++ # ++ # If any of these fail, we abort the whole thing. If we want to ++ # ignore errors from any of these, just make sure not to ignore ++ # errors from the above "$doit $cpprog $src $dsttmp" command. ++ # ++ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ ++ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ ++ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ ++ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && ++ ++ # Now rename the file to the real destination. ++ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ ++ || { ++ # The rename failed, perhaps because mv can't rename something else ++ # to itself, or perhaps because mv is so ancient that it does not ++ # support -f. ++ ++ # Now remove or move aside any old file at destination location. ++ # We try this two ways since rm can't unlink itself on some ++ # systems and the destination file might be busy for other ++ # reasons. In this case, the final cleanup might fail but the new ++ # file should still install successfully. ++ { ++ if test -f "$dstdir/$dstfile"; then ++ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ ++ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ ++ || { ++ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 ++ (exit 1); exit 1 ++ } ++ else ++ : ++ fi ++ } && ++ ++ # Now rename the file to the real destination. ++ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" ++ } ++ } ++ fi || { (exit 1); exit 1; } ++done + +-exit 0 ++# The final little trick to "correctly" pass the exit status to the exit trap. ++{ ++ (exit 0); exit 0 ++} ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" ++# End: +Index: linux-gpib-3.2.02/usb/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/usb/Makefile.in 2004-12-30 04:16:44.000000000 +0100 ++++ linux-gpib-3.2.02/usb/Makefile.in 2005-01-17 15:56:08.591147557 +0100 +@@ -47,8 +47,7 @@ + subdir = usb + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -145,7 +144,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -153,16 +151,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +Index: linux-gpib-3.2.02/lib/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/lib/Makefile.in 2004-12-30 04:16:40.000000000 +0100 ++++ linux-gpib-3.2.02/lib/Makefile.in 2005-01-17 15:56:05.737046532 +0100 +@@ -52,8 +52,7 @@ + DIST_COMMON = $(headers_HEADERS) $(noinst_HEADERS) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -189,7 +188,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -197,16 +195,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +Index: linux-gpib-3.2.02/usb/ni_usb_gpib/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/usb/ni_usb_gpib/Makefile.in 2004-12-30 04:16:46.000000000 +0100 ++++ linux-gpib-3.2.02/usb/ni_usb_gpib/Makefile.in 2005-01-17 15:56:09.576182423 +0100 +@@ -47,8 +47,7 @@ + subdir = usb/ni_usb_gpib + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -136,7 +135,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -144,16 +142,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +@@ -328,7 +316,7 @@ + + info-am: + +-install-data-am: install-data-local ++install-data-am: + + install-exec-am: + +@@ -359,15 +347,15 @@ + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am ++ install-data install-data-am install-exec install-exec-am \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am + + +-install-data-local: ++usb-install-data-local: + test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib || $(INSTALL_SCRIPT) -D ni_usb_gpib $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib + test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap || $(INSTALL_DATA) -D ni_usb_gpib.usermap $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap + $(INSTALL) -d $(USB_FIRMWARE_DIR)/ni_usb_gpib +Index: linux-gpib-3.2.02/usb/agilent_82357a/Makefile.in +=================================================================== +--- linux-gpib-3.2.02.orig/usb/agilent_82357a/Makefile.in 2004-12-30 04:16:45.000000000 +0100 ++++ linux-gpib-3.2.02/usb/agilent_82357a/Makefile.in 2005-01-17 15:56:08.886157999 +0100 +@@ -47,8 +47,7 @@ + subdir = usb/agilent_82357a + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/m4/am-check-python-headers.m4 \ +- $(top_srcdir)/m4/tcl.m4 $(top_srcdir)/configure.ac ++am__aclocal_m4_deps = $(top_srcdir)/configure.ac + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -136,7 +135,6 @@ + PHP_CONFIG = @PHP_CONFIG@ + PYTHON = @PYTHON@ + PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +-PYTHON_INCLUDES = @PYTHON_INCLUDES@ + PYTHON_PLATFORM = @PYTHON_PLATFORM@ + PYTHON_PREFIX = @PYTHON_PREFIX@ + PYTHON_VERSION = @PYTHON_VERSION@ +@@ -144,16 +142,6 @@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ + STRIP = @STRIP@ +-TCL_BIN_DIR = @TCL_BIN_DIR@ +-TCL_INC_DIR = @TCL_INC_DIR@ +-TCL_LIB_FILE = @TCL_LIB_FILE@ +-TCL_LIB_FLAG = @TCL_LIB_FLAG@ +-TCL_LIB_SPEC = @TCL_LIB_SPEC@ +-TCL_SRC_DIR = @TCL_SRC_DIR@ +-TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@ +-TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@ +-TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@ +-TCL_VERSION = @TCL_VERSION@ + VERSION = @VERSION@ + YACC = @YACC@ + ac_ct_AR = @ac_ct_AR@ +@@ -328,7 +316,7 @@ + + info-am: + +-install-data-am: install-data-local ++install-data-am: + + install-exec-am: + +@@ -359,15 +347,15 @@ + .PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ +- install-data install-data-am install-data-local install-exec \ +- install-exec-am install-info install-info-am install-man \ +- install-strip installcheck installcheck-am installdirs \ +- maintainer-clean maintainer-clean-generic mostlyclean \ +- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ +- uninstall uninstall-am uninstall-info-am ++ install-data install-data-am install-exec install-exec-am \ ++ install-info install-info-am install-man install-strip \ ++ installcheck installcheck-am installdirs maintainer-clean \ ++ maintainer-clean-generic mostlyclean mostlyclean-generic \ ++ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ ++ uninstall-info-am + + +-install-data-local: ++usb-install-data-local: + test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a || $(INSTALL_SCRIPT) -D agilent_82357a $(HOTPLUG_USB_CONF_DIR)/agilent_82357a + test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap || $(INSTALL_DATA) -D agilent_82357a.usermap $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap + $(INSTALL) -d $(USB_FIRMWARE_DIR)/agilent_82357a --- gpib-3.2.06.orig/debian/patches/new-pci-ids.h.patch +++ gpib-3.2.06/debian/patches/new-pci-ids.h.patch @@ -0,0 +1,19 @@ +Index: linux-gpib-3.2.06/driver/include/linux/pci_ids.h +=================================================================== +--- linux-gpib-3.2.06.orig/driver/include/linux/pci_ids.h 2005-10-24 00:44:47.000000000 +0200 ++++ linux-gpib-3.2.06/driver/include/linux/pci_ids.h 2006-02-17 12:18:45.000000000 +0100 +@@ -12,6 +12,14 @@ + + #include_next + ++#ifndef PCI_VENDOR_ID_AMCC ++#define PCI_VENDOR_ID_AMCC 0x10e8 ++#endif ++ ++#ifndef PCI_VENDOR_ID_CBOARDS ++#define PCI_VENDOR_ID_CBOARDS 0x1307 ++#endif ++ + #ifndef PCI_VENDOR_ID_QUANCOM + #define PCI_VENDOR_ID_QUANCOM 0x8008 + #endif --- gpib-3.2.06.orig/debian/patches/fix-conf-dev-installs.patch +++ gpib-3.2.06/debian/patches/fix-conf-dev-installs.patch @@ -0,0 +1,13 @@ +Index: linux-gpib-3.2.01/driver/Makefile.am +=================================================================== +--- linux-gpib-3.2.01.orig/driver/Makefile.am 2004-10-01 02:12:10.000000000 +0200 ++++ linux-gpib-3.2.01/driver/Makefile.am 2004-11-13 13:22:21.199165544 +0100 +@@ -31,7 +31,7 @@ + find $(srcdir) \( -name '*.[oas]' -o -name '*.ko' -o -name core -o -name '.*.cmd' \) -type f \ + -exec $(RM) {} \; + +-install-data-hook: device-file-check /etc/gpib.conf ++setup-data-hook: device-file-check /etc/gpib.conf + for module in $(GPIB_MODULES) ; do \ + $(INSTALL_DATA) -D $$module $(LINUX_MODLIB)/gpib/$$(basename $$module) ; \ + done --- gpib-3.2.06.orig/debian/patches/remove-AM-CHECK-PYTHON-HEADERS.patch +++ gpib-3.2.06/debian/patches/remove-AM-CHECK-PYTHON-HEADERS.patch @@ -0,0 +1,12 @@ +Index: linux-gpib-3.2.01/configure.ac +=================================================================== +--- linux-gpib-3.2.01.orig/configure.ac 2004-11-13 12:50:29.894102858 +0100 ++++ linux-gpib-3.2.01/configure.ac 2004-11-13 12:51:46.117764584 +0100 +@@ -116,7 +116,6 @@ + dnl Checks for header files. + AC_HEADER_STDC + AC_CHECK_HEADERS(unistd.h sys/param.h sys/time.h time.h sys/mkdev.h sys/sysmacros.h string.h memory.h fcntl.h dirent.h sys/ndir.h ndir.h alloca.h locale.h ) +-AM_CHECK_PYTHON_HEADERS([],[BIND_PYTHON=no;AC_MSG_NOTICE([python headers not found, disabling python binding])]) + AC_CHECK_HEADER([libguile.h],[],[BIND_GUILE="no";AC_MSG_NOTICE([libguile headers not found, disabling guile binding])]) + + if test "$BIND_TCL" != "no"; then --- gpib-3.2.06.orig/debian/patches/ines-gpib-irq-fix.patch +++ gpib-3.2.06/debian/patches/ines-gpib-irq-fix.patch @@ -0,0 +1,106 @@ +Index: driver/ines/ines_cis_dump.txt +=================================================================== +RCS file: /cvsroot/linux-gpib/linux-gpib/driver/ines/ines_cis_dump.txt,v +retrieving revision 1.1 +retrieving revision 1.2 +diff -u -r1.1 -r1.2 +--- driver/ines/ines_cis_dump.txt 4 Dec 2002 19:36:07 -0000 1.1 ++++ driver/ines/ines_cis_dump.txt 20 Feb 2006 14:38:23 -0000 1.2 +@@ -1,4 +1,4 @@ +- ++First a dump from a revision 1.1 card: + + Socket 0: + dev_info +@@ -15,3 +15,17 @@ + irq mask 0xffff [pulse] + manfid 0x01b4, 0x4730 + ++ ++Now a revision 1.0 card (note, they're using National Instruments manfid!): ++ ++dev_info ++NULL 0ns, 512b ++vers_1 4.1, "ines GmbH", "IEEE488.2 PCMCIA", "Rev 1.0", ++"Compat: NEC 7210" ++config base 0x0100 mask 0x0003 last_index 0x01 ++cftable_entry 0x31 [default] ++Vcc Vnom 5V ++timing wait 120us ++io 0x0000-0x001f [lines=5] [8bit] [16bit] ++irq mask 0xffff [pulse] ++manfid 0x010b, 0x4882 +Index: driver/ines/ines_cs.c +=================================================================== +RCS file: /cvsroot/linux-gpib/linux-gpib/driver/ines/ines_cs.c,v +retrieving revision 1.44 +retrieving revision 1.46 +diff -u -r1.44 -r1.46 +--- driver/ines/ines_cs.c 20 Sep 2005 02:32:56 -0000 1.44 ++++ driver/ines/ines_cs.c 27 Feb 2006 22:59:27 -0000 1.46 +@@ -175,14 +175,14 @@ + memset(link, 0, sizeof(struct dev_link_t)); + + /* The io structure describes IO port mapping */ +- link->io.NumPorts1 =32; ++ link->io.NumPorts1 = 32; + link->io.Attributes1 = IO_DATA_PATH_WIDTH_8; + link->io.NumPorts2 = 0; +- link->io.Attributes2 =0; ++ link->io.Attributes2 = 0; + link->io.IOAddrLines = 5; + + /* Interrupt setup */ +- link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_FORCED_PULSE; ++ link->irq.Attributes = IRQ_TYPE_EXCLUSIVE; + link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_PULSE_ID; + if(irq_list[0] == -1) + link->irq.IRQInfo2 = irq_mask; +@@ -197,8 +197,6 @@ + link->conf.Attributes = CONF_ENABLE_IRQ; + link->conf.Vcc = 50; + link->conf.IntType = INT_MEMORY_AND_IO; +- link->conf.ConfigIndex = 0x30; +- link->conf.Present = PRESENT_OPTION; + + /* Allocate space for private device-specific data */ + local = kmalloc(sizeof(local_info_t), GFP_KERNEL); +@@ -315,7 +313,7 @@ + if (i != CS_SUCCESS) break; + link->conf.ConfigBase = parse.config.base; + link->conf.Present = parse.config.rmask[0]; +- } while (0); ++ } while (0); + if (i != CS_SUCCESS) { + cs_error(link->handle, ParseTuple, i); + link->state &= ~DEV_CONFIG_PENDING; +@@ -351,6 +349,7 @@ + if (i == CS_SUCCESS) { + printk( KERN_DEBUG "ines_cs: base=0x%x len=%d registered\n", + link->io.BasePort1, link->io.NumPorts1 ); ++ link->conf.ConfigIndex = parse.cftable_entry.index; + break; + } + } +@@ -647,6 +646,12 @@ + return_to_local: ines_return_to_local, + }; + ++irqreturn_t ines_pcmcia_interrupt(int irq, void *arg, struct pt_regs *registerp) ++{ ++ gpib_board_t *board = arg; ++ return ines_interrupt(board); ++} ++ + int ines_common_pcmcia_attach( gpib_board_t *board ) + { + ines_private_t *ines_priv; +@@ -669,7 +674,7 @@ + + nec7210_board_reset( nec_priv, board ); + +- if(request_irq(dev_list->irq.AssignedIRQ, ines_interrupt, 0, "pcmcia-gpib", board)) ++ if(request_irq(dev_list->irq.AssignedIRQ, ines_pcmcia_interrupt, SA_SHIRQ, "pcmcia-gpib", board)) + { + printk("gpib: can't request IRQ %d\n", dev_list->irq.AssignedIRQ); + return -1; --- gpib-3.2.06.orig/debian/patches/dont-build-modules.patch +++ gpib-3.2.06/debian/patches/dont-build-modules.patch @@ -0,0 +1,21 @@ +Index: linux-gpib-3.2.02/driver/Makefile.am +=================================================================== +--- linux-gpib-3.2.02.orig/driver/Makefile.am 2005-01-15 14:51:16.971403607 +0100 ++++ linux-gpib-3.2.02/driver/Makefile.am 2005-01-15 16:51:34.414065348 +0100 +@@ -20,14 +20,14 @@ + + -include $(top_srcdir)/util/linux_flags/flags + +-all-local: ++modules-all-local: + $(RM) $(GPIB_MODVERDIR)/* + $(MAKE) -C $(LINUX_SRCDIR) V=1 modules\ + CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \ + SUBDIRS="$(GPIB_ABS_MODULE_SUBDIRS)" \ + MODVERDIR="$(GPIB_MODVERDIR)" + +-clean-local: ++modules-clean-local: + find $(srcdir) \( -name '*.[oas]' -o -name '*.ko' -o -name core -o -name '.*.cmd' \) -type f \ + -exec $(RM) {} \; + --- gpib-3.2.06.orig/debian/patches/device-fix.patch +++ gpib-3.2.06/debian/patches/device-fix.patch @@ -0,0 +1,97 @@ +Index: driver/include/linux/device.h +=================================================================== +RCS file: /cvsroot/linux-gpib/linux-gpib/driver/include/linux/device.h,v +retrieving revision 1.1 +retrieving revision 1.2 +diff -u -r1.1 -r1.2 +--- driver/include/linux/device.h 20 Sep 2005 02:06:33 -0000 1.1 ++++ driver/include/linux/device.h 15 Jan 2006 20:36:59 -0000 1.2 +@@ -7,19 +7,69 @@ + + #include + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) ++#include ++ ++struct device_driver ++{ ++ char *name; ++}; ++ ++struct class; ++struct class_device; ++struct device; ++ ++static inline struct class *class_create(struct module *owner, char *name) ++{ ++ return NULL; ++}; ++ ++static inline void class_destroy(struct class *cs) ++{}; ++ ++static inline struct class_device *CLASS_DEVICE_CREATE(struct class *cls, ++ struct class_device *parent, dev_t devt, struct device *device, ++ char *fmt, ...) ++{ ++ return NULL; ++}; ++ ++static inline void class_device_destroy(struct class *cs, dev_t dev) ++{}; ++ ++#else ++ + #include_next + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) ++ + #define class_create(owner, name) \ + (struct class *)class_simple_create(owner, name) + #define class_destroy(cs) \ + class_simple_destroy((struct class_simple *)(cs)) +-#define class_device_create(cs, dev, device, fmt...) \ ++#define CLASS_DEVICE_CREATE(cs, parent, dev, device, fmt...) \ + class_simple_device_add((struct class_simple *)(cs), \ + dev, device, fmt) + #define class_device_destroy(cs, dev) \ + class_simple_device_remove(dev) +-#endif ++ ++#else ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) ++ ++#define CLASS_DEVICE_CREATE(cs, parent, dev, device, fmt...) \ ++ class_device_create(cs, dev, device, fmt) ++ ++#else ++ ++#define CLASS_DEVICE_CREATE(cs, parent, dev, device, fmt...) \ ++ class_device_create(cs, parent, dev, device, fmt) ++ ++#endif // LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) ++ ++#endif // LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) ++ ++#endif // LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) + + #endif // __COMPAT_LINUX_DEVICE_H_ + +Index: driver/sys/osinit.c +=================================================================== +RCS file: /cvsroot/linux-gpib/linux-gpib/driver/sys/osinit.c,v +retrieving revision 1.71 +retrieving revision 1.72 +diff -u -r1.71 -r1.72 +--- driver/sys/osinit.c 20 Sep 2005 02:06:34 -0000 1.71 ++++ driver/sys/osinit.c 15 Jan 2006 20:38:20 -0000 1.72 +@@ -220,7 +220,7 @@ + } + for(i = 0; i < GPIB_MAX_NUM_BOARDS; ++i) + { +- class_device_create(gpib_class, MKDEV(IBMAJOR, i), NULL, "gpib%i", i); ++ CLASS_DEVICE_CREATE(gpib_class, 0, MKDEV(IBMAJOR, i), NULL, "gpib%i", i); + } + return 0; + } --- gpib-3.2.06.orig/debian/patches/build-python-from-toplevel.patch +++ gpib-3.2.06/debian/patches/build-python-from-toplevel.patch @@ -0,0 +1,20 @@ +Index: linux-gpib-3.2.02/language/python/setup.py +=================================================================== +--- linux-gpib-3.2.02.orig/language/python/setup.py 2004-12-24 22:14:48.000000000 +0100 ++++ linux-gpib-3.2.02/language/python/setup.py 2005-01-16 22:06:59.603485990 +0100 +@@ -5,11 +5,12 @@ + version="1.0", + description="Linux GPIB Python Bindings", + py_modules = ['Gpib'], ++ package_dir = {'': 'language/python'}, + ext_modules=[ + Extension("gpib", +- ["gpibinter.c"], +- include_dirs=["../../include"], +- library_dirs = ['../../lib/.libs'], ++ ["language/python/gpibinter.c"], ++ include_dirs=["include"], ++ library_dirs = ['lib/.libs'], + libraries=["gpib", "pthread"] + )] + ) --- gpib-3.2.06.orig/debian/patches/no-segment.h.patch +++ gpib-3.2.06/debian/patches/no-segment.h.patch @@ -0,0 +1,12 @@ +Index: linux-gpib-3.2.06/driver/sys/ibsys.h +=================================================================== +--- linux-gpib-3.2.06.orig/driver/sys/ibsys.h 2002-12-29 03:13:52.000000000 +0100 ++++ linux-gpib-3.2.06/driver/sys/ibsys.h 2005-11-01 16:26:47.000000000 +0100 +@@ -13,7 +13,6 @@ + #include + + #include +-#include + #include + #include + #include --- gpib-3.2.06.orig/debian/patches/dont-install-pcmcia-and-usb-stuff.patch +++ gpib-3.2.06/debian/patches/dont-install-pcmcia-and-usb-stuff.patch @@ -0,0 +1,29 @@ +Index: linux-gpib-3.2.02/usb/ni_usb_gpib/Makefile.am +=================================================================== +--- linux-gpib-3.2.02.orig/usb/ni_usb_gpib/Makefile.am 2004-12-24 22:14:48.000000000 +0100 ++++ linux-gpib-3.2.02/usb/ni_usb_gpib/Makefile.am 2005-01-17 14:38:39.122293181 +0100 +@@ -12,8 +12,8 @@ + HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb + USB_FIRMWARE_DIR=/usr/share/usb/ + +-install-data-local: ++usb-install-data-local: + test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib || $(INSTALL_SCRIPT) -D ni_usb_gpib $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib + test -e $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap || $(INSTALL_DATA) -D ni_usb_gpib.usermap $(HOTPLUG_USB_CONF_DIR)/ni_usb_gpib.usermap + $(INSTALL) -d $(USB_FIRMWARE_DIR)/ni_usb_gpib +- +\ No newline at end of file ++ +Index: linux-gpib-3.2.02/usb/agilent_82357a/Makefile.am +=================================================================== +--- linux-gpib-3.2.02.orig/usb/agilent_82357a/Makefile.am 2004-12-24 22:14:48.000000000 +0100 ++++ linux-gpib-3.2.02/usb/agilent_82357a/Makefile.am 2005-01-17 14:39:44.273734644 +0100 +@@ -12,7 +12,7 @@ + HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb + USB_FIRMWARE_DIR=/usr/share/usb/ + +-install-data-local: ++usb-install-data-local: + test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a || $(INSTALL_SCRIPT) -D agilent_82357a $(HOTPLUG_USB_CONF_DIR)/agilent_82357a + test -e $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap || $(INSTALL_DATA) -D agilent_82357a.usermap $(HOTPLUG_USB_CONF_DIR)/agilent_82357a.usermap + $(INSTALL) -d $(USB_FIRMWARE_DIR)/agilent_82357a --- gpib-3.2.06.orig/debian/libperl-gpib.examples +++ gpib-3.2.06/debian/libperl-gpib.examples @@ -0,0 +1 @@ +build-tree/linux-gpib-*/language/perl/examples/examples/nSur --- gpib-3.2.06.orig/debian/python-gpib.install +++ gpib-3.2.06/debian/python-gpib.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/python* --- gpib-3.2.06.orig/debian/README.Debian +++ gpib-3.2.06/debian/README.Debian @@ -0,0 +1,39 @@ +gpib for Debian/GNU Linux +------------------------- + +To get a working GPIB setup you have to do the following: + + 1. Check whether your GPIB adapter is support: check at + or install lingpib0-dev and look + at /usr/share/doc/libgpib0-dev/linux-gpib.pdf.gz. + + 2. Install gpib-modules-source and compile the kernel modules: + + a. Easy way with module-assistant: m-a a-i gpib + as root should be sufficient, provided you have the kernel-source + or kernel-headers package for your currently running kernel + version installed and unpacked. + + b. With make-kpkg (kernel-package): see the kernel-package + documentation for this. + + 3. Install the resulting gpib-modules-KVERS package. + + 4. Install libgpib-bin, libgpib0-dev. If you are using a usb adapter + which needs firmware, you can download that from + . + + 5. Configure /etc/gpib.conf according to your setup. Pay special + attention to the board_type variable. + /usr/share/doc/libgpib0-dev/linux-gpib.pdf.gz provides the + explanation for the settings. + + 6. When using pcmcia or usb your modules should get loaded + automatically and configuration via gpib_config also should take + place automatically. For all other boards you might have to load the + modules and run gpib_config manually. + + 7. Now should be set. You can play with the examples in libgpib-bin + (ibtest), python-gpib, libgpib-perl and php4-gpib. + + -- Robert Jordens Sat, 13 Nov 2004 01:12:53 +0100 --- gpib-3.2.06.orig/debian/gpib-modules-source.dirs +++ gpib-3.2.06/debian/gpib-modules-source.dirs @@ -0,0 +1,2 @@ +usr/src/modules +usr/share/modass/overrides --- gpib-3.2.06.orig/debian/control +++ gpib-3.2.06/debian/control @@ -0,0 +1,70 @@ +Source: gpib +Priority: optional +Section: science +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Robert Jordens +Build-Depends: debhelper (>= 5.0.37.2), cdbs, dh-buildinfo, bzip2, quilt, + autotools-dev, doxygen, docbook-utils, docbook-to-man, perl (>= 5.6.0-16), + python-all-dev (>= 2.3.5-11), python-support (>= 0.3), + module-assistant +Standards-Version: 3.7.2 + +Package: libgpib0-dev +Section: libdevel +Architecture: any +Provides: libgpib-dev +Conflicts: libgpib-dev +Replaces: libgpib-dev +Depends: libgpib0 (= ${Source-Version}) +Description: C bindings for GPIB (IEEE 488) kernel driver -- headers + ${Common:Description} + This package contains headers, documentation and static libraries. + +Package: libgpib0 +Section: libs +Architecture: any +Suggests: libgpib0-dev +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: gpib-modules, libgpib-bin +Description: C bindings for GPIB (IEEE 488) kernel driver -- headers + ${Common:Description} + This package contains the shared library. + +Package: libgpib-bin +Section: science +Architecture: any +Depends: ${shlibs:Depends}, adduser, ${misc:Depends} +Description: libgpib support applications and configuration + ${Common:Description} + This package contains configuration files and binaries for libgpib + +Package: libgpib-perl +Section: perl +Architecture: any +Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends} +Description: libgpib perl bindings + ${Common:Description} + This package contains the bindings for perl. + +Package: python-gpib +Section: python +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Provides: ${python:Provides} +Replaces: python2.3-gpib (<< 3.2.06-3.1), python2.4-gpib (<< 3.2.06-3.1) +Conflicts: python2.3-gpib (<< 3.2.06-3.1), python2.4-gpib (<< 3.2.06-3.1) +XB-Python-Version: ${python:Versions} +Description: libgpib python bindings (default package) + ${Common:Description} + This package contains the bindings for Python. + +Package: gpib-modules-source +Section: science +Architecture: all +Depends: module-assistant, quilt, cdbs, bzip2 +Recommends: kernel-headers-2.6 | kernel-source-2.6 +Suggests: kernel-package +Description: kernel modules for various GPIB boards + ${Common:Description} + This packages contains the source for the kernel modules for various + GPIB boards. --- gpib-3.2.06.orig/debian/libgpib0-dev.install +++ gpib-3.2.06/debian/libgpib0-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/* +debian/tmp/usr/lib/libgpib.so +debian/tmp/usr/lib/lib*.a +debian/tmp/usr/share/linux-gpib/html usr/share/doc/libgpib0-dev +build-tree/linux-gpib-*/doc/linux-gpib.pdf usr/share/doc/libgpib0-dev --- gpib-3.2.06.orig/debian/pycompat +++ gpib-3.2.06/debian/pycompat @@ -0,0 +1 @@ +2 --- gpib-3.2.06.orig/debian/rules +++ gpib-3.2.06/debian/rules @@ -0,0 +1,151 @@ +#!/usr/bin/make -f +# rules +# +# Robert Jordens +# +# This software may be used and distributed according to the terms +# of the GNU General Public License, incorporated herein by reference. +# +# $Id$ +# + +DEB_PYTHON_SYSTEM=pysupport + +PACKAGE = gpib-modules +MA_DIR ?= /usr/share/modass +-include $(MA_DIR)/include/generic.make +-include $(MA_DIR)/include/common-rules.make +# save from environment +KPKG_DESTDIR := $(DEB_DESTDIR) + +include /usr/share/cdbs/1/class/makefile.mk +DEB_UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed 's/-[^-]*$$//') +DEB_UPSTREAM_TARBALL_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/+[^+]*$$//') +DEB_TAR_SRCDIR := linux-$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_TARBALL_VERSION) +# tarball has to be first because of #205396 +include /usr/share/cdbs/1/rules/tarball.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +include /usr/share/cdbs/1/class/python-distutils.mk + +DEB_PYTHON_MODULE_PACKAGE := python-gpib +DEB_PYTHON_SETUP_CMD := language/python/setup.py +DEB_PYTHON_INSTALL_ARGS_ALL = --root=$(CURDIR)/debian/python-gpib +phpapiver=$(shell php-config4 --phpapi) + + +#include /usr/share/cdbs/1/class/perlmodule.mk +#DEB_MAKEMAKER_INVOKE = /usr/bin/perl language/perl/Makefile.PL INSTALLDIRS=vendor + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-pcmcia --enable-static + +DEB_DH_MAKESHLIBS_ARGS := -V +DEB_SHLIBDEPS_INCLUDE := lib/.libs + +# after the directories are created but before dh_compress is run. +common-binary-post-install-arch:: + dh_buildinfo + +# make include = gpib to build perl and python bindings +#post-patches:: +# -rm -f gpib && ln -s include gpib + +build/libgpib-perl:: + (cd $(DEB_BUILDDIR)/language/perl; \ + perl Makefile.PL INSTALLDIRS=vendor;\ + $(MAKE) OPTIMIZE="-O2 -g -Wall" LD_RUN_PATH=) + +install/libgpib-perl:: + (cd $(DEB_BUILDDIR)/language/perl; \ + $(MAKE) install PREFIX=$(CURDIR)/debian/libgpib-perl/usr ) + +.PHONY: clean/libgpib-perl +clean/libgpib-perl: + -(cd $(DEB_BUILDDIR)/language/perl; \ + $(MAKE) distclean ) + +clean:: clean/libgpib-perl + +build/gpib-modules-source:: + mkdir -p debian/gpib-modules-source/usr/src/modules + cp -a build-tree/linux-gpib-*/driver \ + debian/gpib-modules-source/usr/src/modules/gpib + mkdir -p debian/gpib-modules-source/usr/src/modules/gpib/debian + cd debian ; cp changelog control common-description \ + compat *.modules.in rules copyright \ + gpib-modules-source/usr/src/modules/gpib/debian + cp build-tree/linux-gpib-*/config.h \ + debian/gpib-modules-source/usr/src/modules/gpib/include + ln -s . debian/gpib-modules-source/usr/src/modules/gpib/include/gpib + cd debian/gpib-modules-source/usr/src/ ; \ + tar -c modules | bzip2 -9 > gpib.tar.bz2 && rm -rf modules + mkdir -p debian/gpib-modules-source/usr/share/modass/overrides + ln -s ../packages/default.sh \ + debian/gpib-modules-source/usr/share/modass/overrides/gpib-modules-source + +kdist_clean: + dh_clean + find $(CURDIR) \( -name '*.[oas]' -o -name '*.ko' \ + -o -name core -o -name '.*.cmd' \) -type f -exec $(RM) {} \; + +kdist_config: prep-deb-files +kdist_configure: kdist_config + +KO := k +GPIB_MODULE_SUBDIRS := agilent_82350b agilent_82357a cb7210 cec hp82335 hp_82341 ines nec7210 pc2 sys tms9914 tnt4882 ni_usb + +GPIB_ABS_MODULE_SUBDIRS :=$(patsubst %, $(CURDIR)/%/, $(GPIB_MODULE_SUBDIRS)) + +binary-modules: prep-deb-files + dh_testdir + dh_testroot + dh_clean -k + $(MAKE) -C $(KSRC) V=1 MODVERSIONS=detect modules\ + CC="$(CC) -I$(CURDIR) -I$(CURDIR)/include" \ + SUBDIRS="$(GPIB_ABS_MODULE_SUBDIRS)" \ + MODVERDIR="$(CURDIR)/.tmp-versions" + install -d $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/gpib + install -m644 */*.$(KO)o \ + $(CURDIR)/debian/$(PKGNAME)/lib/modules/$(KVERS)/gpib/ + dh_installdocs + dh_installchangelogs + dh_compress + dh_fixperms + dh_installdeb + cat debian/common-description >> debian/$(PKGNAME).substvars + dh_gencontrol -- -v$(VERSION) + dh_md5sums + dh_builddeb --destdir=$(KPKG_DESTDIR) + +$(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) :: binary-predeb/%: binary-fixup/% + cat debian/common-description >> debian/$(cdbs_curpkg).substvars + +.PHONY: update-regen-autotools-patch +update-regen-autotools-patch: + -fakeroot debian/rules clean apply-patches + (cd build-tree/*-*; \ + quilt push -a -f; \ + aclocal-1.9 --force; \ + autoconf --force; \ + automake-1.9 -a -c -f; \ + libtoolize --force --copy; \ + quilt refresh; ) + + +.PHONY: update-create-orig-tarball +update-create-orig-tarball: + mkdir -p tmp-orig-tree/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig + cp *.tar.* tmp-orig-tree/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig + tar -C tmp-orig-tree -czvf \ + ../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \ + $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig + +.PHONY: update-clean +update-clean: + rm -rf tmp-cvs-tarball \ + tmp-orig-tree + +clean:: update-clean + --- gpib-3.2.06.orig/debian/watch +++ gpib-3.2.06/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/linux-gpib/linux-gpib-(.*)\.tar\.gz --- gpib-3.2.06.orig/debian/changelog +++ gpib-3.2.06/debian/changelog @@ -0,0 +1,217 @@ +gpib (3.2.06-3.2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Don't build a php4 module anymore. + - Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Andrea Veri Mon, 18 Jun 2007 11:37:22 +0200 + +gpib (3.2.06-3.2) unstable; urgency=low + + * Non-maintainer upload. + * Add dependency on adduser. (Closes: #416596). + + -- Amos Waterland Thu, 05 Apr 2007 15:15:35 +0000 + +gpib (3.2.06-3.1ubuntu1) feisty; urgency=low + + * Don't build a php4 module anymore. + * debian/control: Change Maintainer/XSBC-Original-Maintainer field. + + -- Michael Bienia Tue, 13 Mar 2007 16:30:24 +0100 + +gpib (3.2.06-3.1build2) feisty; urgency=low + + * Rebuild against latest php4 api + + -- Stephan Hermann Tue, 6 Mar 2007 20:06:35 +0100 + +gpib (3.2.06-3.1build1) edgy; urgency=low + + * Rebuild to add support for python2.5. + + -- Matthias Klose Fri, 8 Sep 2006 18:25:47 +0000 + +gpib (3.2.06-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Update package to the last python policy (Closes: #373440). + * Wrap description correctly. + + -- Pierre Habouzit Sun, 2 Jul 2006 00:25:58 +0200 + +gpib (3.2.06-3) unstable; urgency=high + + * break circular dependency around libgpib-bin; closes: Bug#356589 (libgpib0 + has circular Depends on libgpib-bin) + * add lost no-segment.h patch; closes: Bug#360136 + (gpib_3.2.06-2(amd64/unstable): Patch no-segment.h.patch does not exist + * debian/rules: add "LD_RUN_PATH=" to make invokation for the perl bindings + to dump the rpath; closes: Bug#359239 + (libgpib-perl: LinuxGpib.so has trapdoor rpath /tmp/buildd/...) + * urgency high because the last two are RC and security critical + * now standards compliant to 3.6.2 + + -- Robert Jordens Mon, 3 Apr 2006 13:12:17 +0200 + +gpib (3.2.06-2) unstable; urgency=medium + + * ines-gpib-irq-fix.patch (backported from CVS gead): fix problems + with INES pcmcia cards + * device-fix.patch: make class_(device_)?_(create|destroy) more flexible to + compile correctly with kernels >= 2.6.15; closes: Bug#357240 (segfaults + with kernel 2.6.15) + * urgency medium because this is RC + + -- Robert Jordens Fri, 17 Mar 2006 00:35:56 +0100 + +gpib (3.2.06-1) unstable; urgency=low + + * new upstream release: + + debian/patches/ines.h-add-unaccel.patch: included upstream + * upload to experimental to not hinder the CXX transition group + * debian/patches/add-new-pci-ids.h.patch: take the new pci ids header from + CVS since the old one does not compile on >= 2.6.12; + closes: Bug#352759 + * debian/watch: update + * debian/control.modules.in: recommend udev/hotplug + + -- Robert Jordens Sat, 4 Mar 2006 20:49:13 +0100 + +gpib (3.2.04-5) unstable; urgency=low + + * debian/{control,rules}: use output from php4-config --phpapi instead of + grepping the include file and depend on a recent php4-dev + to rebuild against new phpapi + + -- Robert Jordens Wed, 5 Oct 2005 15:57:01 +0200 + +gpib (3.2.04-4) unstable; urgency=low + + * debisn/{control, python2.4-gpib, python2.2-gpib, rules}: + build python2.4 bindings, drop the 2.2 ones. + + -- Robert Jordens Tue, 2 Aug 2005 01:16:02 +0200 + +gpib (3.2.04-3) unstable; urgency=low + + * Pah. Really fix modprobe and modutils files + + -- Robert Jordens Thu, 16 Jun 2005 18:42:29 +0200 + +gpib (3.2.04-2) unstable; urgency=low + + * debian/control: move kernel-package to suggests and -headers|-source to + recommends; closes: Bug#314189 [should not *depend* on kernel-source and + kernel-package] + * re-double modprobe.d as modutils + + -- Robert Jordens Wed, 15 Jun 2005 18:42:37 +0200 + +gpib (3.2.04-1) unstable; urgency=low + + * new upstream release + + add hp_82341 to modules + + debian/patches/ines.h-add-unaccel.patch: fixes missing declaration + * permissions files ignored as of udev 0.051-1, use rules.d + closes: Bug#311943 [/dev/gpib* created in wrong group at startup] + * make modutils a modprobe.d. + closes: Bug#311944 [Post install configuration of devices fails] + * make the depends on libgpib-bin a recommends. + + -- Robert Jordens Mon, 13 Jun 2005 10:44:50 +0200 + +gpib (3.2.03-2) unstable; urgency=medium + + * rebuild against the new PHP4 without ZTS; revert most of the changes from + 3.2.02-5; closes: Bug#301326 + * urgency medium due to above changes in PHP + + -- Robert Jordens Fri, 25 Mar 2005 11:43:55 +0100 + +gpib (3.2.03-1) unstable; urgency=low + + * new upstream release + + debian/patches/no-timeout-in-urb.patch applied upstream + + -- Robert Jordens Tue, 1 Mar 2005 16:57:32 +0100 + +gpib (3.2.02-5) unstable; urgency=medium + + * debian/control: b-dep on php4-dev (>= 4:4.3.10-3); + debian/rules: php4-gpib: depends on the right phpapi-$phpapiver + closes: Bug#294013 (php4-gpib: phpapi revision requires a new upload + in sid) + * urgency medium due to above change + + -- Robert Jordens Tue, 8 Feb 2005 14:14:17 +0100 + +gpib (3.2.02-4) unstable; urgency=low + + * debian/modutils/gpib added: runs gpib_config after loading a module; + debian/libgpib-bin.postinst: added update-modules call + closes: Bug#291643: gpib_config not run at boot time. + + -- Robert Jordens Thu, 27 Jan 2005 14:28:33 +0100 + +gpib (3.2.02-3) unstable; urgency=high + + * damn! + * debian/patches/regen-autotools.patch: updated; sorry autobuilders + * urgency still high because of the bugfix two revisions before + + -- Robert Jordens Mon, 17 Jan 2005 15:44:10 +0100 + +gpib (3.2.02-2) unstable; urgency=high + + * debian/patches/dont-install-pcmcia-and-usb-stuff.patch, + debian/libgpib-bin.install updated: + dont let the agilent usb driver mess with /etc. fixes the current + FTBFS + * urgency still high because of the bug fix in the upload before + + -- Robert Jordens Mon, 17 Jan 2005 14:43:31 +0100 + +gpib (3.2.02-1) unstable; urgency=high + + * debian/control.modules.in: fix gpib-modules-_KVERS_ + Build-dependencies; + closes: Bug#289443: gpib-modules-source: Dependency Problems + * urgency: high because the bug above is release critical + * new upstream release + + AM-MAINTAINER-MODE.patch, SONAME-lib.patch, + allow-null-in-python-bindings.patch, + dont-build-bindings-automatically.patch, + dont-check-for-kernel-source.patch, fix-doc-install.patch + gpib-HEADERS-fix.patch: applied upstream + + dont-build-modules.patch, regen-autotools.patch: adapted + + debian/control: updated GPIB_MODULE_SUBDIRS + * debian/libgpib-bin.postinst: add device nodes if not udev + or devfs and add the gpib group + closes: Bug#290594: Device nodes /dev/gpib* not created. + * debian/patches/no-timeout-in-urb.patch added: there is no + timeout in urb as of 2.6.9: + + * debian/gpib.permissions: added for udev. Gets installed under + libgpib-bin:/etc/udev/permissions.d + * build-python-from-toplevel.patch: fixed python module + installation path; thanks to Wayne Stambaugh + for noticing. + * debian/control: description fix for libgpib-bin + + -- Robert Jordens Sun, 16 Jan 2005 22:42:46 +0100 + +gpib (3.2.01-2) unstable; urgency=low + + * debian/patches/gpib-HEADERS-fix.patch: install headers under gpib/ + * debian/patches/SONAME-lib.patch: + move libgpib-3.2.01.so to /usr/lib/libgpib.so.0 + + -- Robert Jordens Tue, 21 Dec 2004 22:03:47 +0100 + +gpib (3.2.01-1) unstable; urgency=low + + * Initial Release. closes: #281002 (the ITP) + + -- Robert Jordens Sat, 13 Nov 2004 01:12:53 +0100 + --- gpib-3.2.06.orig/debian/libgpib-bin.install +++ gpib-3.2.06/debian/libgpib-bin.install @@ -0,0 +1,8 @@ +debian/tmp/usr/bin +debian/tmp/usr/sbin +build-tree/linux-gpib-*/util/templates/gpib.conf etc +build-tree/linux-gpib-*/etc/pcmcia/linux-gpib* etc/pcmcia +build-tree/linux-gpib-*/usb/ni_usb_gpib/ni_usb_gpib* etc/hotplug/usb +build-tree/linux-gpib-*/usb/agilent_82357a/agilent_82357a* etc/hotplug/usb +debian/gpib.rules etc/udev/rules.d +debian/modprobe.d/gpib etc/modprobe.d --- gpib-3.2.06.orig/debian/python-gpib.examples +++ gpib-3.2.06/debian/python-gpib.examples @@ -0,0 +1 @@ +build-tree/linux-gpib-*/language/python/gpibtest.py --- gpib-3.2.06.orig/debian/libgpib0.install +++ gpib-3.2.06/debian/libgpib0.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/lib*.so.* --- gpib-3.2.06.orig/debian/php4-gpib.install +++ gpib-3.2.06/debian/php4-gpib.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/php4 --- gpib-3.2.06.orig/debian/compat +++ gpib-3.2.06/debian/compat @@ -0,0 +1 @@ +4 --- gpib-3.2.06.orig/debian/common-description +++ gpib-3.2.06/debian/common-description @@ -0,0 +1 @@ +Common:Description=The Linux GPIB Package is a support package for GPIB (IEEE 488) hardware. The${Newline} package contains kernel driver modules, and a C user-space library with${Newline} Guile, Perl, PHP, Python and TCL bindings. The API of the C library is${Newline} intended to be compatible with National Instrument's GPIB library.${Newline} .${Newline} The General Purpose Instrumentation Bus (GPIB) is a short-range digital${Newline} communications cable standard connecting electronic test and measurement${Newline} devices to control devices. Developed by HP in 1970 (and then called HP-IB)${Newline} it has been standardized in 1978 by the Institute of Electrical and${Newline} Electronics Engineers as the IEEE Standard Digital Interface for Programmable${Newline} Instrumentation, IEEE-488-1978 (now 488.1).${Newline} .${Newline} IEEE-488 allows up to 15 intelligent devices to share a single bus by${Newline} daisy-chaining, with the slowest device participating in the control and data${Newline} transfer handshakes to determine the speed of the transaction. The maximum${Newline} data rate is about one megabit per second. Paraphrasing the 1989 HP Test &${Newline} Measurement Catalog: HP-IB has a party-line structure wherein all devices on${Newline} the bus are connected in parallel. The 16 signal lines within the passive${Newline} interconnecting HP-IB cable are grouped into three clusters according to${Newline} their functions: Data Bus, Data Byte Transfer.${Newline} .${Newline} To use these packages you have be using a 2.6 kernel, install${Newline} gpib-modules-source, compile a gpib-modules-KVERS package out of it, install${Newline} that and libgpib0 as well a libgpib-bin. Documentation and headers are${Newline} contained in libgpib0-dev. Language bindings for python, perl and php are${Newline} available in separate packages as well. --- gpib-3.2.06.orig/debian/copyright +++ gpib-3.2.06/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Robert Jordens on +Sat Nov 13 01:13:05 CET 2004 + +It was downloaded from: + +Upstream Authors: + John Ackermann + Michel Billaud + Stephan Boettcher + Brian Donavan + Frank Mori Hess + Steve Holland + Stefan Jahn + Kentaro Kitagawa + Thomas Nisius + Marco Prevedelli + Michael Ritzert + Claus Schroeter + Uwe Strempel + Werner Stille + Bryan Thomas + +The project is maintained by Frank Mori Hess, along with others who +have contributed code or documentation. It is a continuation of the +linux-gpib-2.05-alpha release available from the Linux Lab Project, +which was maintained by Claus Schroeter. + +linux-gpib is released under the GNU General Public License, version 2, +found on Debian GNU/Linux systems in the file +/usr/share/common-licenses/GPL-2 + --- gpib-3.2.06.orig/debian/php4-gpib.examples +++ gpib-3.2.06/debian/php4-gpib.examples @@ -0,0 +1 @@ +build-tree/linux-gpib-*/language/php/TESTS --- gpib-3.2.06.orig/debian/postinst.modules.in +++ gpib-3.2.06/debian/postinst.modules.in @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +if [ "`uname -r`" = "_KVERS_" ] ; then + depmod -a & +fi + --- gpib-3.2.06.orig/debian/libgpib-bin.postinst +++ gpib-3.2.06/debian/libgpib-bin.postinst @@ -0,0 +1,73 @@ +#! /bin/sh +# postinst script for libgpib-bin +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/share/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +IBMAJOR=160 + +case "$1" in + configure|abort-upgrade|abort-remove|abort-deconfigure) + if ! getent group | grep -q "^gpib:"; then + echo -n "Adding gpib group" 1>&2 + addgroup --quiet --system gpib + echo "." 1>&2 + fi + + # if udev is running, and we're in /dev, relocate ourselves + OLDWD="`pwd`" + if [ -d /.dev/ ] && [ -e /proc/mounts ] \ + && grep -qE '^[^ ]+ /\.dev' /proc/mounts; then + cd /.dev/ + else + cd /dev/ + fi + + if [ ! -c .devfsd -a ! -d gpib -a ! -c gpib0 ] ; then + echo -n "Generating gpib device nodes" 1>&2 + for i in `seq 0 15`; do + mknod --mode u=rw,g=rw,o= gpib$i c $IBMAJOR $i + chown root:gpib gpib$i + done + echo '.' 1>&2 + fi + + cd "$OLDWD" + + if [ -x /sbin/update-modules ]; then + /sbin/update-modules + fi + + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + --- gpib-3.2.06.orig/debian/control.modules.in +++ gpib-3.2.06/debian/control.modules.in @@ -0,0 +1,19 @@ +Source: gpib +Priority: optional +Section: science +Maintainer: Robert Jordens +Build-Depends: debhelper (>= 4.1.67), cdbs, quilt, dh-buildinfo, + modules-assistant, kernel-headers-2.6 | kernel-source-2.6, bzip2 +Standards-Version: 3.6.2 + +Package: gpib-modules-_KVERS_ +Section: science +Architecture: any +Provides: gpib-modules +Recommends: libgpib-bin, udev (>= 0.070-3) | hotplug (>= 0.0.20040329-19) +Description: kernel modules (kernel _KVERS_) for various GPIB boards + ${Common:Description} + This packages contains the loadable for the kernel modules for various + GPIB boards. The firmware for some boards is available from + . The modules in this packages + are compiled for kernel version _KVERS_. --- gpib-3.2.06.orig/debian/gpib.rules +++ gpib-3.2.06/debian/gpib.rules @@ -0,0 +1,3 @@ +KERNEL="gpib/*", MODE="0660", GROUP="gpib" +KERNEL="gpib[0-9]*", MODE="0660", GROUP="gpib" +