Sorry, it seems that I missed a B-D.
-- Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/
diff --git a/debian/changelog b/debian/changelog index a8e4e35..d6b92f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +convertall (0.7.3-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * New upstream release (Closes: #862738). + * Switch to Qt 5 (Closes: #874848). + - Build depend upon qtbase5-dev and python3-qt5. + - Export QT_SELECT = qt5 in debian/rules. + * Refresh 02_remove_module_shebang.patch. + * Add dh-python to build dependencies, as required by build system. + + -- Lisandro Damián Nicanor Pérez Meyer <lisan...@debian.org> Tue, 03 Apr 2018 11:40:25 -0300 + convertall (0.6.1-2) unstable; urgency=medium * debian/convertall.desktop: Fix icon location diff --git a/debian/control b/debian/control index 1d35ceb..efdab26 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,12 @@ Section: x11 Priority: optional Maintainer: Python Applications Packaging Team <python-apps-t...@lists.alioth.debian.org> Uploaders: Jackson Doak <nosk...@ubuntu.com> -Build-Depends: debhelper (>= 9), python3, python3-pyqt4 (>= 4.6), - libqt4-dev (>= 4.6), dpkg (>= 1.15.6~) +Build-Depends: debhelper (>= 9), + dh-python, + dpkg (>= 1.15.6~), + python3, + python3-pyqt5 (>= 4.6), + qtbase5-dev (>= 4.6) Standards-Version: 3.9.7 Homepage: http://convertall.bellz.org/ Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/convertall/trunk/ @@ -12,9 +16,9 @@ Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/convertall/t Package: convertall Architecture: all -Depends: ${python3:Depends}, ${misc:Depends}, python3-pyqt4 +Depends: python3-pyqt5, ${misc:Depends}, ${python3:Depends} Description: very flexible unit converter With ConvertAll, you can convert any unit in the large database to any other compatible unit. If you want to convert from inches per decade, that's fine. Or from meter-pounds. Or from cubic nautical miles. The units don't have to - make sense to anyone else. + make sense to anyone else. diff --git a/debian/convertall.manpages b/debian/convertall.manpages index 8f138a0..893d96e 100644 --- a/debian/convertall.manpages +++ b/debian/convertall.manpages @@ -1 +1 @@ -debian/convertall.1 \ No newline at end of file +debian/convertall.1 diff --git a/debian/copyright b/debian/copyright index afd22e4..2375fb2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -45,4 +45,3 @@ License: GPL-3+ . On Debian systems, you can find the complete text of the GNU General Public License version 3 in `/usr/share/common-licenses/GPL-3'. - diff --git a/debian/dirs b/debian/dirs index 8a53a92..294259b 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,2 +1,2 @@ -usr/share/pixmaps usr/share/applications +usr/share/pixmaps diff --git a/debian/patches/02_remove_module_shebang.patch b/debian/patches/02_remove_module_shebang.patch index 6e5ced7..3d06790 100644 --- a/debian/patches/02_remove_module_shebang.patch +++ b/debian/patches/02_remove_module_shebang.patch @@ -3,22 +3,31 @@ --- source/cmdline.py | 2 -- - source/convertdlg.py | 2 -- - source/finddlg.py | 2 -- - source/helpview.py | 2 -- - source/icondict.py | 2 -- - source/modbutton.py | 2 -- - source/numedit.py | 2 -- + source/convertall.py | 1 - + source/convertdlg.py | 1 - + source/helpview.py | 1 - + source/icondict.py | 1 - + source/numedit.py | 1 - source/option.py | 2 -- - source/optiondefaults.py | 2 -- - source/optiondlg.py | 2 -- - source/unitatom.py | 2 -- - source/unitdata.py | 2 -- - source/unitedit.py | 2 -- + source/optiondefaults.py | 1 - + source/optiondlg.py | 1 - + source/recentunits.py | 1 - + source/setup.py | 1 - + source/unitatom.py | 1 - + source/unitdata.py | 1 - + source/unitedit.py | 1 - source/unitgroup.py | 2 -- - source/unitlistview.py | 2 -- - 15 files changed, 30 deletions(-) + source/unitlistview.py | 1 - + 16 files changed, 19 deletions(-) +--- a/source/unitgroup.py ++++ b/source/unitgroup.py +@@ -1,5 +1,3 @@ +-#!/usr/bin/env python3 +- + #**************************************************************************** + # unitgroup.py, provides a group of units and does conversions + # --- a/source/cmdline.py +++ b/source/cmdline.py @@ -1,5 +1,3 @@ @@ -27,54 +36,41 @@ #**************************************************************************** # cmdline.py, provides a class to read and execute command line arguments # +--- a/source/convertall.py ++++ b/source/convertall.py +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python3 + """ + **************************************************************************** + convertall.py, the main program file --- a/source/convertdlg.py +++ b/source/convertdlg.py -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 -- + #**************************************************************************** # convertdlg.py, provides the main dialog and GUI interface - # ---- a/source/finddlg.py -+++ b/source/finddlg.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 -- - #**************************************************************************** - # finddlg.py, provides dialog interface for unit find dialog - # --- a/source/helpview.py +++ b/source/helpview.py -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 -- + #**************************************************************************** # helpview.py, provides a window for viewing an html help file - # --- a/source/icondict.py +++ b/source/icondict.py -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 -- + #**************************************************************************** # icondict.py, provides a class to load and store icons - # ---- a/source/modbutton.py -+++ b/source/modbutton.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 -- - #**************************************************************************** - # modbutton.py, provides a button that signals its text - # --- a/source/numedit.py +++ b/source/numedit.py -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 -- + #**************************************************************************** # numedit.py, provides a number entry editor - # --- a/source/option.py +++ b/source/option.py @@ -1,5 +1,3 @@ @@ -85,57 +81,57 @@ # --- a/source/optiondefaults.py +++ b/source/optiondefaults.py -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 -- + #**************************************************************************** # optiondefaults.py, provides defaults for program options - # --- a/source/optiondlg.py +++ b/source/optiondlg.py -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 -- + #**************************************************************************** # optiondlg.py, provides classes for option setting dialogs - # +--- a/source/recentunits.py ++++ b/source/recentunits.py +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python3 + + #**************************************************************************** + # recentunits.py, provides a list of recently used units +--- a/source/setup.py ++++ b/source/setup.py +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python3 + + #**************************************************************************** + # setup.py, provides a distutils script for use with cx_Freeze --- a/source/unitatom.py +++ b/source/unitatom.py -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 -- + #**************************************************************************** # unitatom.py, provides class to hold data on each available unit - # --- a/source/unitdata.py +++ b/source/unitdata.py -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 -- + #**************************************************************************** # unitdata.py, reads unit data from file - # --- a/source/unitedit.py +++ b/source/unitedit.py -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 -- + #**************************************************************************** # unitedit.py, provides a line edit for unit entry - # ---- a/source/unitgroup.py -+++ b/source/unitgroup.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 -- - #**************************************************************************** - # unitgroup.py, provides a group of units and does conversions - # --- a/source/unitlistview.py +++ b/source/unitlistview.py -@@ -1,5 +1,3 @@ +@@ -1,4 +1,3 @@ -#!/usr/bin/env python3 -- + #**************************************************************************** # unitlistview.py, provides a list view of available units - # diff --git a/debian/rules b/debian/rules index a55ba21..895cc6c 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export QT_SELECT := qt5 + %: dh $@ --with python3
