From 31d8e52c887545959b6da71a60b2b2e97c76647a Mon Sep 17 00:00:00 2001
From: t0b3 <thomas.bettler@gmail.com>
Date: Thu, 21 Jan 2021 21:41:12 +0100
Subject: [PATCH] fix: build releases with python3

Signed-off-by: t0b3 <thomas.bettler@gmail.com>
---
 Makefile                       | 8 ++++----
 distribute/deb/description-pak | 6 +++---
 distribute/deb/dist.sh         | 4 ++--
 distribute/distribute.sh       | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 382f80d5..53b5bfb1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ PREFIX?=/usr
 DISTNAME=inkscape-silhouette
 EXCL=--exclude \*.orig --exclude \*.pyc
 ALL=README.md *.png *.sh *.rules *.py *.inx examples misc silhouette
-VERS=$$(python ./sendto_silhouette.py --version)
+VERS=$$(python3 ./sendto_silhouette.py --version)
 
-## echo '<xml height="0"/>' | python ./sendto_silhouette.py /dev/stdin
+## echo python3 ./sendto_silhouette.py
 # 'module' object has no attribute 'core'
 # 'module' object has no attribute 'core'
 # done. 0 min 0 sec
@@ -15,7 +15,7 @@ VERS=$$(python ./sendto_silhouette.py --version)
 # --------
 # echo > /etc/apt/sources.list.d/backports.list 'deb http://ftp.debian.org debian jessie-backports main'
 # apt-get update
-# apt-get -t jessie-backports install python-usb
+# apt-get -t jessie-backports install python3-usb
 # vi /etc/group
 # lp:x:debian
 
@@ -55,7 +55,7 @@ tar_dist_classic: clean
 	@echo version should be $(VERS)
 
 tar_dist:
-	python setup.py sdist --format=bztar
+	python3 setup.py sdist --format=bztar
 	mv dist/*.tar* .
 	rm -rf dist
 
diff --git a/distribute/deb/description-pak b/distribute/deb/description-pak
index de57e1bd..8e9ff360 100644
--- a/distribute/deb/description-pak
+++ b/distribute/deb/description-pak
@@ -1,8 +1,8 @@
 An inkscape extension to drive a Silhouette Cameo plotter.
 
-Requires python-usb 1.0.0 -- if this causes errors, please try:
+Requires python3-usb 1.0.0 -- if this causes errors, please try:
 <pre>
-sudo apt install python-pip python-setuptools
-sudo pip install --upgrade pyusb
+sudo apt install python3-pip python3-setuptools
+sudo pip3 install --upgrade pyusb
 </pre>
 
diff --git a/distribute/deb/dist.sh b/distribute/deb/dist.sh
index 307eca7e..26d8a387 100644
--- a/distribute/deb/dist.sh
+++ b/distribute/deb/dist.sh
@@ -5,11 +5,11 @@ name=$1
 vers=$2
 url=http://github.com/fablabnbg/$name
 # versioned dependencies need \ escapes to survive checkinstall mangling.
-# requires="python-usb\ \(\>=1.0.0\), bash"
+# requires="python3-usb\ \(\>=1.0.0\), bash"
 
 ## not even ubuntu 16.04 has python-usb 1.0,  we requre any python-usb
 ## and check at runtime again.
-requires="python-usb, bash"
+requires="python3-usb, bash"
 
 tmp=../out
 
diff --git a/distribute/distribute.sh b/distribute/distribute.sh
index 7cd64be0..bd4e61e4 100755
--- a/distribute/distribute.sh
+++ b/distribute/distribute.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 echo "Determining Version:"
-VERSION=$(python ../sendto_silhouette.py --version)
+VERSION=$(python3 ../sendto_silhouette.py --version)
 
 test -e /usr/bin/xpath || sudo apt-get install libxml-xpath-perl
 test -e /usr/bin/checkinstall || sudo apt-get install checkinstall