Commit 91728c27 authored by Georges Khaznadar's avatar Georges Khaznadar

new backport

parents eb064ad1 e2ee5134
......@@ -50,3 +50,5 @@ m4/
*.lo
*.la
# quilt stuff
.pc/
......@@ -4,7 +4,6 @@ SUBDIRS = bin po firmware clib/expeyes-clib microhope \
SUBDIRS_INDEP = expeyes-web eyes17/lang
all:
python setup.py build
python3 setup.py build
for d in $(SUBDIRS); do \
if [ -f $$d/configure.ac ]; then \
......@@ -25,14 +24,11 @@ all_indep:
done
install:
# for python-expeyes
# for python3-expeyes
if grep -Eq "Debian|Ubuntu" /etc/issue; then \
python setup.py install --install-layout=deb \
--root=$(DESTDIR)/ --prefix=/usr; \
python3 setup.py install --install-layout=deb \
--root=$(DESTDIR)/ --prefix=/usr; \
else \
python setup.py install --root=$(DESTDIR)/ --prefix=/usr; \
python3 setup.py install --root=$(DESTDIR)/ --prefix=/usr; \
fi
install -d $(DESTDIR)/lib/udev/rules.d/
......
#!/bin/sh
exec python /usr/share/eyes17/main.py
exec python3 /usr/share/eyes17/main.py
This diff is collapsed.
This diff is collapsed.
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 6 ltsugar.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
# lt_join(SEP, ARG1, [ARG2...])
# -----------------------------
# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
# associated separator.
# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
# versions in m4sugar had bugs.
m4_define([lt_join],
[m4_if([$#], [1], [],
[$#], [2], [[$2]],
[m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
m4_define([_lt_join],
[m4_if([$#$2], [2], [],
[m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
# lt_car(LIST)
# lt_cdr(LIST)
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
# Autoconf-2.59 which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
[$#], 1, [],
[m4_dquote(m4_shift($@))])])
m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
# than defined and empty).
#
# This macro is needed until we can rely on Autoconf 2.62, since earlier
# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
m4_define([lt_append],
[m4_define([$1],
m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
# ----------------------------------------------------------
# Produce a SEP delimited list of all paired combinations of elements of
# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
# has the form PREFIXmINFIXSUFFIXn.
# Needed until we can rely on m4_combine added in Autoconf 2.62.
m4_define([lt_combine],
[m4_if(m4_eval([$# > 3]), [1],
[m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
[[m4_foreach([_Lt_prefix], [$2],
[m4_foreach([_Lt_suffix],
]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
# -----------------------------------------------------------------------
# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
m4_define([lt_if_append_uniq],
[m4_ifdef([$1],
[m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
[lt_append([$1], [$2], [$3])$4],
[$5])],
[lt_append([$1], [$2], [$3])$4])])
# lt_dict_add(DICT, KEY, VALUE)
# -----------------------------
m4_define([lt_dict_add],
[m4_define([$1($2)], [$3])])
# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
# --------------------------------------------
m4_define([lt_dict_add_subkey],
[m4_define([$1($2:$3)], [$4])])
# lt_dict_fetch(DICT, KEY, [SUBKEY])
# ----------------------------------
m4_define([lt_dict_fetch],
[m4_ifval([$3],
m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
# -----------------------------------------------------------------
m4_define([lt_if_dict_fetch],
[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
[$5],
[$6])])
# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
# --------------------------------------------------------------
m4_define([lt_dict_filter],
[m4_if([$5], [], [],
[lt_join(m4_quote(m4_default([$4], [[, ]])),
lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
[lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
])
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 5 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN
# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
# using a macro with the same name in our local m4/libtool.m4 it'll
# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
# and doesn't know about Autoconf macros at all.)
#
# So we provide this file, which has a silly filename so it's always
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
# we give up compatibility with versions before 1.7, at which point
# we need to keep only those names which we still refer to.
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])])
m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])])
m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])])
m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])])
m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])])
m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])])
m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])])
m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])])
m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])])
m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])])
m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])])
m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])])
m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])])
m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])])
m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])])
m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])])
m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])])
m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])])
m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
This diff is collapsed.
expeyes (4.4.3+dfsg-1~bpo9+1) stretch-backports; urgency=medium
expeyes (4.4.4+dfsg-2~bpo9+1) stretch-backports; urgency=medium
* initiated a backport
* new backport
* lowered Standards-Version
* modified dependencies of eyes17
* modified the command bin/eyes17 to use python2
-- Georges Khaznadar <georgesk@debian.org> Fri, 13 Jul 2018 15:22:28 +0200
expeyes (4.4.4+dfsg-2) unstable; urgency=medium
* added conflicts for python3-expeyes (<< 4.3). Closes: #910226
-- Georges Khaznadar <georgesk@debian.org> Fri, 05 Oct 2018 16:59:52 +0200
expeyes (4.4.4+dfsg-1) unstable; urgency=medium
* fixed the postinst and prerm scripts for python3-expeyes, expeyes-web.
Closes: #904514
* upgraded to the last upstream version
-- Georges Khaznadar <georgesk@debian.org> Wed, 08 Aug 2018 10:00:49 +0200
expeyes (4.4.3+dfsg-3) unstable; urgency=medium
* promoted the recommendation python3-expeyes <- udev to a dependency.
Closes: #904514
-- Georges Khaznadar <georgesk@debian.org> Mon, 30 Jul 2018 05:03:44 +0200
expeyes (4.4.3+dfsg-2) unstable; urgency=medium
* removed any dependency on python2
* applied Boyuan Yang's patch. Closes: #904090
* applied a patch from Ajith Kumar, which add examples for eyes17,
in Python language.
* added a build dependency on qt5-qmake
* removed debug messages emitted by eyes17/main.py
-- Georges Khaznadar <georgesk@debian.org> Fri, 20 Jul 2018 17:39:12 +0200
expeyes (4.4.3+dfsg-1) unstable; urgency=medium
* added Frans Spiesschaert's nl.po file. Closes: #898869
......
......@@ -3,10 +3,10 @@ Section: science
Priority: optional
Maintainer: Georges Khaznadar <georgesk@debian.org>
Build-Depends: debhelper (>= 10), quilt,
python3-all, python-all, dh-python,
python3-all, dh-python,
gcc-avr, binutils-avr, avr-libc (>=1:1.8.0+Atmel3.5.0),
pkg-config, libgtk2.0-dev, x11proto-randr-dev (>= 1.5.0),
pyqt4-dev-tools, qt4-linguist-tools
pyqt5-dev-tools, qttools5-dev-tools, qt5-qmake
Standards-Version: 3.9.6
Homepage: http://expeyes.in/
Vcs-Browser: https://salsa.debian.org/georgesk/expeyes
......@@ -14,12 +14,12 @@ Vcs-Git: https://salsa.debian.org/georgesk/expeyes.git
Package: expeyes
Architecture: all
Depends: python, python3, ${misc:Depends},
python-expeyes (= ${source:Version}),
python3-pil.imagetk, python-pil.imagetk,
tix, python3-tk, python-tk, udev
Recommends: python-numpy, python-scipy, python3-numpy, python3-scipy,
expeyes-web, qtiplot, python-pygrace(>=0.5),python3-pygrace(>=0.5),
Depends: python3, ${misc:Depends}, ${python3:Depends},
python3-expeyes (= ${source:Version}),
python3-pil.imagetk,
tix, python3-tk, udev
Recommends: python3-numpy, python3-scipy,
expeyes-web, qtiplot, python3-pygrace(>=0.5),
expeyes-doc-en|expeyes-doc
Description: hardware & software framework for developing science experiments
This package provides high level interfaces for making science experiments
......@@ -37,11 +37,12 @@ Description: hardware & software framework for developing science experiments
Package: eyes17
Architecture: all
Depends: python, python3, ${misc:Depends},
python-expeyes (= ${source:Version}),
python-pyqtgraph, python-qt4, python-qgis,
Depends: python3, ${misc:Depends}, ${python3:Depends},
python3-expeyes (= ${source:Version}),
python3-pyqtgraph, python3-pyqt5, python3-pyqt5.qtwebkit,
python-configparser
Recommends: python-numpy, python-scipy, python-numpy, python-scipy
Recommends: python3-numpy, python3-scipy,
python3-pyqt5.qtwebengine
Description: hardware & software framework for developing science experiments
This package provides high level interfaces for making science experiments
with an ExpEYES-17 box.
......@@ -118,15 +119,14 @@ Description: hardware & software framework for developing science experiments
design is also open.
Package: python-expeyes
Package: python3-expeyes
Section: python
Architecture: all
Depends: python, python3, ${misc:Depends},
python3-scipy, python3-serial (>= 2.6),
python-scipy, python-serial (>= 2.6)
Provides: python3-expeyes
Recommends: udev
Description: Python library for expeyes
Depends: python3, ${misc:Depends}, ${python3:Depends},
python3-scipy, python3-serial (>= 2.6), udev
Conflicts: python-expeyes, python3-expeyes (<< 4.3)
Replaces: python-expeyes
Description: Python3 library for expeyes
This package provides low level interfaces for making science experiments
with an ExpEYES box. The library allows one to develop new programs easily
.
......@@ -143,16 +143,16 @@ Description: Python library for expeyes
Package: expeyes-web
Section: web
Architecture: all
Depends: python, python3, ${misc:Depends},
python-expeyes, libjs-jquery, libjs-bootstrap
Depends: python3, ${misc:Depends}, ${python3:Depends},
python3-expeyes, libjs-jquery, libjs-bootstrap
Description: Web interface for expEYES-Junior
This package allows you to access remotely to a server which drives an
expEYES-Jr box. This extends the power of expEYES.
Package: microhope
Architecture: any
Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends},
expeyes, python-tk, avr-libc, avrdude, gnome-icon-theme,
Depends: ${python3:Depends}, ${misc:Depends}, ${shlibs:Depends},
expeyes, python3-tk, avr-libc, avrdude, gnome-icon-theme,
python-wxgtk3.0
Recommends: gnome-human-icon-theme
Description: hardware & software framework to learn microcontrollers
......
......@@ -21,7 +21,9 @@ set -e
case "$1" in
configure)
# make cgi scripts executable and compile them
chmod +x /usr/share/expeyes-web/cgi-bin/*.cgi
python3 -m py_compile /usr/share/expeyes-web/cgi-bin/*.cgi
# reconfigure the webserver if necessary
db_get expeyes-web/reconfigure-webserver || true
webserver="$RET"
......@@ -63,7 +65,7 @@ esac
## this was not managed properly by debian/rules:
if which py3compile >/dev/null 2>&1; then
py3compile -p python-expeyes
py3compile -p python3-expeyes
fi
# dh_installdeb will replace this with shell code automatically
......
#!/bin/sh
# postrm script for expeyes-web
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postrm> `remove'
# * <postrm> `purge'
# * <old-postrm> `upgrade' <new-version>
# * <new-postrm> `failed-upgrade' <old-version>
# * <new-postrm> `abort-install'
# * <new-postrm> `abort-install' <old-version>
# * <new-postrm> `abort-upgrade' <old-version>
# * <disappearer's-postrm> `disappear' <overwriter>
# <overwriter-version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
rm -rf /usr/share/expeyes-web/cgi-bin/__pycache__
;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#
exit 0
......@@ -5,6 +5,7 @@ usr/share/expeyes/eyes17/lang/*.ts usr/share/eyes17/lang
usr/share/expeyes/eyes17/*.py usr/share/eyes17
usr/share/eyes17/doc usr/share/eyes17
usr/share/eyes17/rst usr/share/eyes17
eyes17/examples usr/share/eyes17
desktop/expeyes-17.desktop usr/share/applications
desktop/eyes17-doc.desktop usr/share/applications
pixmaps/eyes17-logo.png usr/share/icons
......
fixed a bug which appears with newer versions of autotools
Index: expeyes/Makefile
===================================================================
--- expeyes.orig/Makefile
+++ expeyes/Makefile
@@ -87,9 +87,7 @@ clean:
# clean the bootloader hex file
make -C microhope/firmware clean
# clean the autconf generated files
- for f in Makefile.in aclocal.m4 config.guess config.sub configure ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 src/Makefile.in; do \
- rm -f clib/expeyes-clib/$$f; \
- done
+ cd clib/expeyes-clib; sh clean-all.sh
.PHONY: all all_indep install install_indep clean
Index: expeyes/clib/expeyes-clib/src/Makefile.am
===================================================================
--- expeyes.orig/clib/expeyes-clib/src/Makefile.am
+++ expeyes/clib/expeyes-clib/src/Makefile.am
@@ -2,6 +2,8 @@ bin_PROGRAMS = capdemo1 capdemo2 capdemo
lib_LTLIBRARIES = libej.la
+$(bin_PROGRAMS): $(lib_LTLIBRARIES)
+
LDADD = -ldl #-L must be use to specify the folder for dl library
AM_CFLAGS = -Wall
enforcing the usage of python2
--- expeyes-4.4.3+dfsg.orig/bin/eyes17
+++ expeyes-4.4.3+dfsg/bin/eyes17
@@ -1,3 +1,3 @@
#!/bin/sh
-exec python3 /usr/share/eyes17/main.py
+exec python /usr/share/eyes17/main.py
python2.patch
autotool-clib.patch
usr/lib/python2.7/dist-packages
usr/lib/python3/dist-packages
99-phoenix.rules lib/udev/rules.d
......@@ -36,7 +36,7 @@ esac
## this was not managed properly by debian/rules:
if which py3compile >/dev/null 2>&1; then
py3compile -p python-expeyes
py3compile -p python3-expeyes
fi
# dh_installdeb will replace this with shell code automatically
......
......@@ -32,7 +32,7 @@ esac
## this was not managed properly by debian/rules:
if which py3clean >/dev/null 2>&1; then
py3clean -p python-expeyes
py3clean -p python3-expeyes
fi
# dh_installdeb will replace this with shell code automatically
......
......@@ -14,8 +14,10 @@ DEB_BUILD_MAINT_OPTIONS=reproducible=-timeless
LD_LIBRARY_PATH += debian/libexpeyes1/usr/lib
export DEB_BUILD_HARDENING=1
export QT_SELECT := 5
%:
dh $@ --with python2,python3
dh $@ --with python3
HOME = $(CURDIR)/debian/build
override_dh_auto_build-arch:
......
#!/usr/bin/python
#!/usr/bin/python3
"""
CGI script for setting status for output pins of expEYES Junior connected to server
Copyright 2016, Authors : , Jishnu R(jishnu47@gmail.com), Rakesh K M(rakeshkm2203@gmail.com), Manoj.S.Nair(manojsnair007@gmail.com) [Amrita School of Engineering, Amritapuri Campus, Kollam 690525, Kerala]
......
#!/usr/bin/python
#!/usr/bin/python3
"""
CGI script for reading status of input pins of expEYES Junior connected to server
Copyright 2016, Authors : Manoj.S.Nair(manojsnair007@gmail.com), Jishnu R(jishnu47@gmail.com), Rakesh K M(rakeshkm2203@gmail.com) [Amrita School of Engineering, Amritapuri Campus, Kollam 690525, Kerala]
......
import eyes17.eyes
p = eyes17.eyes.open()
from pylab import *
import eyes17.eyemath17 as em
p.set_sine(1000)
p.set_sqr1(500)
t,v, tt,vv = p.capture2(5000, 20) # captures A1 and A2
xlabel('Freq')
ylabel('Amplitude')
xlim([0,10000])
xa,ya = em.fft(v,20*0.001)
plot(xa,ya, linewidth = 2, color = 'blue')
xa,ya = em.fft(vv, 20*0.001)
plot(xa, ya, linewidth = 2, color = 'red')
show()
import eyes17.eyes
p = eyes17.eyes.open()
from pylab import *
p.set_wave(50,'tria')
p.select_range('A1',4)
p.select_range('A2',4)
t,v, tt,vv = p.capture2(500, 100) # captures A1 and A2
xlabel('Time(mS)')
ylabel('Voltage(V)')
plot([0,1], [0,0], 'black')
ylim([-4,4])
plot(t,v,linewidth = 2, color = 'blue')
plot(tt, vv, linewidth = 2, color = 'red')
show()
import eyes17.eyes
p = eyes17.eyes.open()
from pylab import *
p.set_wave(500,'tria')
p.select_range('A1',4)
p.select_range('A2',4)
t,v, tt,vv = p.capture2(500, 20) # captures A1 and A2
xlabel('Time(mS)')
ylabel('Voltage(V)')
plot([0,10], [0,0], 'black')
ylim([-4,4])
plot(t,v,linewidth = 2, color = 'blue')
plot(tt, vv, linewidth = 2, color = 'red')
show()
import eyes17.eyes
p = eyes17.eyes.open()
from pylab import *
set_sine(200)
set_pv1(1.35) # will clip at 1.35 + diode drop
t,v, tt,vv = capture2(500, 20) # captures A1 and A2
xlabel('Time(mS)')
ylabel('Voltage(V)')
plot([0,10], [0,0], 'black')
ylim([-4,4])
plot(t,v,linewidth = 2, color = 'blue')
plot(tt, vv, linewidth = 2, color = 'red')
show()
import eyes17.eyes
p = eyes17.eyes.open()
from pylab import *
import time
p.set_state(OD1=0) # OD1 to LOW
time.sleep(.5)
t,v = p.capture_action('A1', 100, 5, 'SET_HIGH')
plot(t,v,linewidth = 2, color = 'blue')
p.set_state(OD1=1) # OD1 to LOW
time.sleep(.5)
t,v = p.capture_action('A1', 100, 5, 'SET_LOW')
plot(t,v,linewidth = 2, color = 'red')
show()
import eyes17.eyes
p = eyes17.eyes.open()
from pylab import *
import time
plot([0,.5], [0,0], color='black')
ylim([-5,5])
p.set_state(OD1=1) # OD1 to LOW
time.sleep(.5)
t,v = p.capture_action('A1', 100, 5, 'SET_LOW')
plot(t,v,linewidth = 2, color = 'red')
show()
import eyes17.eyes
p = eyes17.eyes.open()
from pylab import *
x,y = p.capture1('A1',10,10)
plot(x,y)
show()
import eyes17.eyes
p = eyes17.eyes.open()
from pylab import *
p.set_sine(200)
t,v, tt,vv = p.capture2(500, 20) # captures A1 and A2
xlabel('Time(mS)')
ylabel('Voltage(V)')
plot([0,10], [0,0], 'black')
ylim([-4,4])
plot(t,v,linewidth = 2, color = 'blue')
plot(tt, vv, linewidth = 2, color = 'red')
show()
import eyes17.eyes
p = eyes17.eyes.open()
from pylab import *
p.set_sine(200)
res = p.capture4(500, 20) # captures A1, A2,A3 and MIC
plot(res[0], res[1], linewidth = 2, color = 'blue')
plot(res[6], res[7], linewidth = 2, color = 'red')
show()
import eyes17.eyes
p = eyes17.eyes.open()
from pylab import *
p.set_sine(200)
p.set_pv1(1.7) # will clamp at 2.0 + diode drop