Commit 376fb876 authored by Georges Khaznadar's avatar Georges Khaznadar

cleared debian patches

parent 12b0a2db
From: Boyuan Yang <073plan@gmail.com>
Date: Fri, 20 Jul 2018 13:05:17 +0800
Subject: Use Qt5 lrelease / pylupdate5 instead of qt4 tools
---
eyes17/lang/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eyes17/lang/Makefile b/eyes17/lang/Makefile
index 8825a15..004b1e3 100644
--- a/eyes17/lang/Makefile
+++ b/eyes17/lang/Makefile
@@ -2,12 +2,12 @@ DESTDIR =
TS_FILES = $(shell ls *.ts)
QM_FILES = $(patsubst %.ts, %.qm, $(TS_FILES))
SOURCES = $(shell ls ../*py ../code/*.py)
-PYLUPDATE ?= pylupdate4
+PYLUPDATE ?= pylupdate5
all: $(QM_FILES)
$(QM_FILES): $(TS_FILES)
- lrelease-qt4 eyes17.pro
+ lrelease eyes17.pro
$(TS_FILES): eyes17.pro
$(PYLUPDATE) eyes17.pro
This diff is collapsed.
Index: expeyes/eyes17/main.py
===================================================================
--- expeyes.orig/eyes17/main.py
+++ expeyes/eyes17/main.py
@@ -136,7 +136,6 @@ class helpWin(QWebView):
hit during the search defines the file to open.
"""
QWebView.__init__(self)
- print("GRRRR, type(name[1])", type(name[1]), name[1])
if type(name[1]) is str:
fn = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'html', name[1]+'.html')
else:
@@ -165,7 +164,6 @@ class helpWin(QWebView):
"/usr/share/eyes17/html", # packaged environment, plain HTML files
os.path.join(os.path.dirname(os.path.abspath(__file__)), 'html'), # development environment, plain HTML files (must be last to let /usr/share/eyes17/main.py find help files in rst/**/)
]
- print("GRRRR dirs=", dirs)
for directory in dirs:
for f in htmlFiles:
target= os.path.join(directory,f)
0001-Use-Qt5-lrelease-pylupdate5-instead-of-qt4-tools.patch
0010_examplesForEyes17.patch
setup-with-python3.patch
remove-debug-messages.patch
removed calls for python2
Index: expeyes/Makefile
===================================================================
--- expeyes.orig/Makefile
+++ expeyes/Makefile
@@ -4,7 +4,6 @@ SUBDIRS = bin po firmware clib/expeyes-c
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/
Index: expeyes/expeyes-web/cgi-bin/expeyes_setoutput.cgi
===================================================================
--- expeyes.orig/expeyes-web/cgi-bin/expeyes_setoutput.cgi
+++ expeyes/expeyes-web/cgi-bin/expeyes_setoutput.cgi
@@ -1,4 +1,4 @@
-#!/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]
Index: expeyes/expeyes-web/cgi-bin/expeyes_status.cgi
===================================================================
--- expeyes.orig/expeyes-web/cgi-bin/expeyes_status.cgi
+++ expeyes/expeyes-web/cgi-bin/expeyes_status.cgi
@@ -1,4 +1,4 @@
-#!/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]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment