diff options
| author | Georges Khaznadar <georgesk@debian.org> | 2025-01-21 17:52:38 +0100 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2025-01-21 22:39:56 +0000 |
| commit | 5333742ae4b9c2c2e4f77218d1b390def841f421 (patch) | |
| tree | 095cf90624e568783d7dc690455d57ee2988840d | |
| parent | baa4b80073b59445849213ff6b4dbedc714c2733 (diff) | |
1.0+git20250120-1 (patches unapplied)HEADimport/1.0+git20250120-1ubuntu/resolute-develubuntu/resoluteubuntu/questing-develubuntu/questingubuntu/plucky-proposedubuntu/plucky-develubuntu/pluckyubuntu/develdebian/sid
Imported using git-ubuntu import.
Notes
Notes:
* New upstream version 1.0+git20250120. Drop dependency on removed
"future" module. Closes: #1093535
* Bumped Standards-Version: 4.7.0
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/portToPython3.patch | 12 | ||||
| -rwxr-xr-x | python-whiteboard | 1 | ||||
| -rwxr-xr-x | python-whiteboard-test | 1 | ||||
| -rw-r--r-- | stuff/calibration.py | 9 | ||||
| -rw-r--r-- | stuff/cursor.py | 6 | ||||
| -rw-r--r-- | stuff/linuxWiimoteLib.py | 12 | ||||
| -rw-r--r-- | stuff/pywhiteboard.py | 12 | ||||
| -rw-r--r-- | stuff/wiimote.py | 11 |
11 files changed, 40 insertions, 37 deletions
@@ -30,8 +30,7 @@ $ make deb Required packages: -- To run the program: python-bluez python-qt5 python-numpy python-xlib - python python-support python-future +- To run the program: python3-bluez python3-qt5 python3-numpy python3-xlib - To run make: libqt5-dev qt5-dev-tools python-qt5-dev - To build the deb package: build-essential fakeroot dpkg-dev debhelper diff --git a/debian/changelog b/debian/changelog index 2a89ab8..22c9861 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-whiteboard (1.0+git20250120-1) unstable; urgency=medium + + * New upstream version 1.0+git20250120. Drop dependency on removed + "future" module. Closes: #1093535 + * Bumped Standards-Version: 4.7.0 + + -- Georges Khaznadar <georgesk@debian.org> Tue, 21 Jan 2025 17:52:38 +0100 + python-whiteboard (1.0+git20211001-2) unstable; urgency=medium * the package does not import numpy, neither xlib. So those dependencies diff --git a/debian/control b/debian/control index 1975f64..b5d1af6 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper-compat (=13), pyqt5-dev, qttools5-dev-tools, imagemagick -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Homepage: https://github.com/pnegre/python-whiteboard Vcs-Browser: https://salsa.debian.org/georgesk/python-whiteboard Vcs-Git: https://salsa.debian.org/georgesk/python-whiteboard.git diff --git a/debian/patches/portToPython3.patch b/debian/patches/portToPython3.patch index 08e0f65..413436b 100644 --- a/debian/patches/portToPython3.patch +++ b/debian/patches/portToPython3.patch @@ -7,7 +7,7 @@ Index: python-whiteboard/stuff/pywhiteboard.py +#!/usr/bin/python3 # -*- coding: utf-8 -*- - from __future__ import division + from wiimote import Wiimote Index: python-whiteboard/stuff/wiimote.py =================================================================== --- python-whiteboard.orig/stuff/wiimote.py @@ -17,7 +17,7 @@ Index: python-whiteboard/stuff/wiimote.py +#!/usr/bin/python3 # -*- coding: utf-8 -*- - from __future__ import print_function + import sys, re Index: python-whiteboard/python-whiteboard =================================================================== --- python-whiteboard.orig/python-whiteboard @@ -27,7 +27,7 @@ Index: python-whiteboard/python-whiteboard +#!/usr/bin/python3 # -*- coding: utf-8 -*- - from __future__ import print_function + import sys, os Index: python-whiteboard/python-whiteboard-test =================================================================== --- python-whiteboard.orig/python-whiteboard-test @@ -37,13 +37,13 @@ Index: python-whiteboard/python-whiteboard-test +#!/usr/bin/python3 # -*- coding: utf-8 -*- - from __future__ import print_function + import sys, os Index: python-whiteboard/stuff/linuxWiimoteLib.py =================================================================== --- python-whiteboard.orig/stuff/linuxWiimoteLib.py +++ python-whiteboard/stuff/linuxWiimoteLib.py -@@ -34,12 +34,12 @@ import time - import bluetooth +@@ -34,12 +34,12 @@ def old_div(a, b): + return a / b def i2bs(val): - lst = [] diff --git a/python-whiteboard b/python-whiteboard index 0f109ed..e008f45 100755 --- a/python-whiteboard +++ b/python-whiteboard @@ -1,7 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from __future__ import print_function import sys, os STUFFDIR = '/usr/share/python-whiteboard' diff --git a/python-whiteboard-test b/python-whiteboard-test index 3a3b037..2ee662f 100755 --- a/python-whiteboard-test +++ b/python-whiteboard-test @@ -1,7 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from __future__ import print_function import sys, os def main(): diff --git a/stuff/calibration.py b/stuff/calibration.py index 924dd1d..61ef232 100644 --- a/stuff/calibration.py +++ b/stuff/calibration.py @@ -1,9 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import division -from builtins import range -from builtins import object -from past.utils import old_div import sys,time import wiimote @@ -17,6 +13,11 @@ from configuration import Configuration class CalibrationAbort(Exception): pass +def old_div(a, b): + if isinstance(a, int) and isinstance(b, int): + return a // b + else: + return a / b def clock(): return int(time.time()*1000) diff --git a/stuff/cursor.py b/stuff/cursor.py index c6db70f..4149309 100644 --- a/stuff/cursor.py +++ b/stuff/cursor.py @@ -187,11 +187,11 @@ class FakeCursor(object): else: dX = p[0]-self.clkP[0] dY = p[1]-self.clkP[1] - # if the cursor moves, start click (drag) immediatly + # if the cursor moves, start click (drag) immediately if (dX*dX)+(dY*dY) > 16: self.begin = None self.run = True - # Returns to the originlal point and clicks there + # Returns to the original point and clicks there self.move(self.clkP) self.click = Click(self) @@ -207,7 +207,7 @@ class FakeCursor(object): while 1: qt.QThread.usleep(50) self.mutex.lock() - # A click had occourred: a short burst (noot an impulse) with no movement + # A click had occurred: a short burst (noot an impulse) with no movement if self.toclick and not self.run and clock() - self.lastdata > Click.UP_TIMEOUT: self.begin = None self.lastdata = None diff --git a/stuff/linuxWiimoteLib.py b/stuff/linuxWiimoteLib.py index 7a78f8c..cbf4a3a 100644 --- a/stuff/linuxWiimoteLib.py +++ b/stuff/linuxWiimoteLib.py @@ -1,5 +1,3 @@ -from __future__ import print_function -from __future__ import division # LICENSE: MIT (X11) License which follows: # # Copyright (c) 2008 Stephane Duchesneau @@ -25,14 +23,16 @@ from __future__ import division # Modified by Pere Negre and Pietro Pilolli # - -from builtins import chr -from past.utils import old_div -from builtins import object import threading import time import bluetooth +def old_div(a, b): + if isinstance(a, int) and isinstance(b, int): + return a // b + else: + return a / b + def i2bs(val): lst = [] while val: diff --git a/stuff/pywhiteboard.py b/stuff/pywhiteboard.py index ece0378..4090ec0 100644 --- a/stuff/pywhiteboard.py +++ b/stuff/pywhiteboard.py @@ -1,13 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from __future__ import division -from future import standard_library -standard_library.install_aliases() -from builtins import str -from builtins import range -from builtins import object -from past.utils import old_div from wiimote import Wiimote from cursor import FakeCursor from threads import * @@ -22,6 +15,11 @@ import hashlib from PyQt5 import QtCore, QtGui, QtWidgets, uic import PyQt5.Qt as qt +def old_div(a, b): + if isinstance(a, int) and isinstance(b, int): + return a // b + else: + return a / b class AboutDlg(QtWidgets.QDialog): diff --git a/stuff/wiimote.py b/stuff/wiimote.py index cd1bde6..5490f3a 100644 --- a/stuff/wiimote.py +++ b/stuff/wiimote.py @@ -1,12 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -from __future__ import print_function -from __future__ import division -from builtins import str -from builtins import range -from builtins import object -from past.utils import old_div import sys, re import PyQt5.Qt as qt @@ -20,6 +14,11 @@ from threads import CreateThreadClass import threading +def old_div(a, b): + if isinstance(a, int) and isinstance(b, int): + return a // b + else: + return a / b def calculateArea(points): print(points) |