changed the install list for *.qm files
Georges Khaznadar
3 years ago
0 | 0 |
*.py /usr/share/kuttypy
|
|
1 |
lang/*.qm /usr/share/kuttypy/lang
|
1 | 2 |
docs /usr/share/kuttypy
|
2 | 3 |
README.md /usr/share/kuttypy
|
3 | 4 |
examples /usr/share/kuttypy
|
0 | |
Index: kuttypy/kuttypy-gui
|
1 | |
===================================================================
|
2 | |
--- /dev/null
|
3 | |
+++ kuttypy/kuttypy-gui
|
4 | |
@@ -0,0 +1,3 @@
|
5 | |
+#! /bin/sh
|
6 | |
+
|
7 | |
+exec python3 /usr/share/kuttypy/KuttyPyGUI.py
|
0 | |
Index: kuttypy/docs/kuttyPy.py
|
1 | |
===================================================================
|
2 | |
--- kuttypy.orig/docs/kuttyPy.py
|
3 | |
+++ kuttypy/docs/kuttyPy.py
|
4 | |
@@ -1,3 +1,4 @@
|
5 | |
+from __future__ import print_function
|
6 | |
import serial, time, platform, sys,struct
|
7 | |
|
8 | |
VERSION = 99 # uC return this when GETVER is send
|
9 | |
@@ -99,12 +100,12 @@ def connectKP(s): # Establish connect
|
10 | |
if ver == VERSION:
|
11 | |
return fd
|
12 | |
else:
|
13 | |
- print 'Found port %s, but no kuttyPy on it',s
|
14 | |
+ print ('Found port %s, but no kuttyPy on it',s)
|
15 | |
return None
|
16 | |
except:
|
17 | |
pass
|
18 | |
#Exception as e:
|
19 | |
- #print str(e)
|
20 | |
+ #print (str(e))
|
21 | |
|
22 | |
def findKP():
|
23 | |
device_list = []
|
24 | |
@@ -117,11 +118,11 @@ def findKP():
|
25 | |
device_list.append(k)
|
26 | |
elif 'inux' in pf:
|
27 | |
device_list = ['/dev/ttyUSB0', '/dev/ttyUSB1', '/dev/ttyACM0','/dev/ttyACM1']
|
28 | |
- #print device_list
|
29 | |
+ #print (device_list)
|
30 | |
for dev in device_list:
|
31 | |
res = connectKP(dev)
|
32 | |
if res != None:
|
33 | |
- print 'KuttyPy found on port ',dev
|
34 | |
+ print ('KuttyPy found on port ',dev)
|
35 | |
return res
|
36 | |
|
37 | |
|
38 | |
@@ -152,6 +153,6 @@ def readADC(ch): # Read the ADC c
|
39 | |
|
40 | |
KP = findKP()
|
41 | |
if KP == None:
|
42 | |
- print 'Hardware NOT detected. Exiting'
|
43 | |
+ print ('Hardware NOT detected. Exiting')
|
44 | |
sys.exit(0)
|
45 | |
|
debian/patches/reproducible.patch
less
more
0 | |
enforcing reproducible builds
|
1 | |
Index: kuttypy/utilities/templates/Makefile
|
2 | |
===================================================================
|
3 | |
--- kuttypy.orig/utilities/templates/Makefile
|
4 | |
+++ kuttypy/utilities/templates/Makefile
|
5 | |
@@ -23,7 +23,8 @@ clean:
|
6 | |
rm -rf *.pyc *~ __pycache__
|
7 | |
|
8 | |
ui_%.py: %.ui
|
9 | |
- $(PYUIC) --from-import $< -o $@
|
10 | |
+ # lauch pyrcc5 to make reproducible builds
|
11 | |
+ export QT_HASH_SEED=0; $(PYUIC) --from-import $< -o $@
|
12 | |
|
13 | |
|
14 | |
%_rc.py: %.qrc
|
0 | |
Index: kuttypy/utilities/Makefile
|
1 | |
===================================================================
|
2 | |
--- kuttypy.orig/utilities/Makefile
|
3 | |
+++ kuttypy/utilities/Makefile
|
4 | |
@@ -7,6 +7,7 @@ recursive_all:
|
5 | |
|
6 | |
clean: recursive_clean
|
7 | |
rm -rf *.pyc *~ __pycache__
|
8 | |
+ rm -f build_details.py
|
9 | |
|
10 | |
recursive_clean:
|
11 | |
for d in $(SUBDIRS); do make PYUIC=$(PYUIC) PYRCC=$(PYRCC) PYLUPDATE=$(PYLUPDATE) PY_VERSION=$(PY_VERSION) -C $$d clean; done
|
0 | |
reproducible.patch
|
1 | |
py3Qt5.patch
|
2 | |
rm_build.patch
|
3 | |
cmdline.patch
|