[Python-apps-commits] r10495 - in packages/convertall/trunk/debian (6 files)
noskcaj-guest at users.alioth.debian.org
noskcaj-guest at users.alioth.debian.org
Sat Feb 8 00:50:00 UTC 2014
Date: Saturday, February 8, 2014 @ 00:50:00
Author: noskcaj-guest
Revision: 10495
* New upstream release
* Drop 01_install_python_into_usr_share.patch, fixed upstream
* Switch to python3
Modified:
packages/convertall/trunk/debian/changelog
packages/convertall/trunk/debian/control
packages/convertall/trunk/debian/patches/02_remove_module_shebang.patch
packages/convertall/trunk/debian/patches/series
packages/convertall/trunk/debian/rules
Deleted:
packages/convertall/trunk/debian/patches/01_install_python_into_usr_share.patch
Modified: packages/convertall/trunk/debian/changelog
===================================================================
--- packages/convertall/trunk/debian/changelog 2014-02-08 00:17:39 UTC (rev 10494)
+++ packages/convertall/trunk/debian/changelog 2014-02-08 00:50:00 UTC (rev 10495)
@@ -1,3 +1,11 @@
+convertall (0.6.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Drop 01_install_python_into_usr_share.patch, fixed upstream
+ * Switch to python3
+
+ -- Jackson Doak <noskcaj at ubuntu.com> Sat, 08 Feb 2014 11:29:19 +1100
+
convertall (0.5.2-1) unstable; urgency=low
* New upstream release. closes: #692964
Modified: packages/convertall/trunk/debian/control
===================================================================
--- packages/convertall/trunk/debian/control 2014-02-08 00:17:39 UTC (rev 10494)
+++ packages/convertall/trunk/debian/control 2014-02-08 00:50:00 UTC (rev 10495)
@@ -2,15 +2,14 @@
Section: x11
Priority: optional
Maintainer: Jackson Doak <noskcaj at ubuntu.com>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-qt4 (>= 4.0),
- qt4-default (>= 4.1), dpkg (>= 1.15.6~)
+Build-Depends: debhelper (>= 9), python3, python3-pyqt4 (>= 4.6),
+ qt4-default (>= 4.6), dpkg (>= 1.15.6~)
Standards-Version: 3.9.4
-X-Python-Version: >= 2.3
Homepage: http://convertall.bellz.org/
Package: convertall
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-qt4
+Depends: ${python3:Depends}, ${misc:Depends}, python3-pyqt4
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.
Deleted: packages/convertall/trunk/debian/patches/01_install_python_into_usr_share.patch
===================================================================
--- packages/convertall/trunk/debian/patches/01_install_python_into_usr_share.patch 2014-02-08 00:17:39 UTC (rev 10494)
+++ packages/convertall/trunk/debian/patches/01_install_python_into_usr_share.patch 2014-02-08 00:50:00 UTC (rev 10495)
@@ -1,27 +0,0 @@
-+From: William Grant <william at qeuni.net>
-+Subject: As they're arch. independent, install python modules to /usr/share.
-
----
- install.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-Index: convertall/install.py
-===================================================================
---- convertall.orig/install.py 2013-08-06 06:32:00.932453524 +1000
-+++ convertall/install.py 2013-08-06 06:32:00.928453502 +1000
-@@ -225,14 +225,13 @@
- if testSpell:
- spellCheck(['aspell -a', 'ispell -a'])
-
-- pythonPrefixDir = os.path.join(prefixDir, 'lib', progName)
-+ pythonPrefixDir = os.path.join(prefixDir, 'share', progName)
- pythonBuildDir = os.path.join(buildRoot, pythonPrefixDir[1:])
-
- if os.path.isdir('source'):
- compileall.compile_dir('source', ddir=os.path.join(prefixDir, 'source'))
- print 'Installing files...'
- print ' Copying python files to %s' % pythonBuildDir
-- removeDir(pythonBuildDir) # remove old?
- copyDir('source', pythonBuildDir)
- if os.path.isdir('source/plugins'):
- pluginBuildDir = os.path.join(pythonBuildDir, 'plugins')
Modified: packages/convertall/trunk/debian/patches/02_remove_module_shebang.patch
===================================================================
--- packages/convertall/trunk/debian/patches/02_remove_module_shebang.patch 2014-02-08 00:17:39 UTC (rev 10494)
+++ packages/convertall/trunk/debian/patches/02_remove_module_shebang.patch 2014-02-08 00:50:00 UTC (rev 10495)
@@ -1,152 +1,140 @@
+ From: William Grant <william at qeuni.net>
+ Subject: Remove shebang lines from modules that don't deserve them.
-Index: convertall/source/cmdline.py
-===================================================================
---- convertall.orig/source/cmdline.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/cmdline.py 2013-08-06 06:34:43.369259004 +1000
+---
+ 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/option.py | 2 --
+ source/optiondefaults.py | 2 --
+ source/optiondlg.py | 2 --
+ source/unitatom.py | 2 --
+ source/unitdata.py | 2 --
+ source/unitedit.py | 2 --
+ source/unitgroup.py | 2 --
+ source/unitlistview.py | 2 --
+ 15 files changed, 30 deletions(-)
+
+--- a/source/cmdline.py
++++ b/source/cmdline.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# cmdline.py, provides a class to read and execute command line arguments
#
-Index: convertall/source/convertdlg.py
-===================================================================
---- convertall.orig/source/convertdlg.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/convertdlg.py 2013-08-06 06:34:43.377259047 +1000
+--- a/source/convertdlg.py
++++ b/source/convertdlg.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# convertdlg.py, provides the main dialog and GUI interface
#
-Index: convertall/source/finddlg.py
-===================================================================
---- convertall.orig/source/finddlg.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/finddlg.py 2013-08-06 06:34:43.377259047 +1000
+--- a/source/finddlg.py
++++ b/source/finddlg.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# finddlg.py, provides dialog interface for unit find dialog
#
-Index: convertall/source/helpview.py
-===================================================================
---- convertall.orig/source/helpview.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/helpview.py 2013-08-06 06:34:43.377259047 +1000
+--- a/source/helpview.py
++++ b/source/helpview.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# helpview.py, provides a window for viewing an html help file
#
-Index: convertall/source/icondict.py
-===================================================================
---- convertall.orig/source/icondict.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/icondict.py 2013-08-06 06:34:43.377259047 +1000
+--- a/source/icondict.py
++++ b/source/icondict.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# icondict.py, provides a class to load and store icons
#
-Index: convertall/source/modbutton.py
-===================================================================
---- convertall.orig/source/modbutton.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/modbutton.py 2013-08-06 06:34:43.377259047 +1000
+--- a/source/modbutton.py
++++ b/source/modbutton.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# modbutton.py, provides a button that signals its text
#
-Index: convertall/source/numedit.py
-===================================================================
---- convertall.orig/source/numedit.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/numedit.py 2013-08-06 06:34:43.377259047 +1000
+--- a/source/numedit.py
++++ b/source/numedit.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# numedit.py, provides a number entry editor
#
-Index: convertall/source/option.py
-===================================================================
---- convertall.orig/source/option.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/option.py 2013-08-06 06:34:43.377259047 +1000
+--- a/source/option.py
++++ b/source/option.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# option.py, provides classes to read and set user preferences
#
-Index: convertall/source/optiondefaults.py
-===================================================================
---- convertall.orig/source/optiondefaults.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/optiondefaults.py 2013-08-06 06:34:43.389259110 +1000
+--- a/source/optiondefaults.py
++++ b/source/optiondefaults.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# optiondefaults.py, provides defaults for program options
#
-Index: convertall/source/optiondlg.py
-===================================================================
---- convertall.orig/source/optiondlg.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/optiondlg.py 2013-08-06 06:34:43.389259110 +1000
+--- a/source/optiondlg.py
++++ b/source/optiondlg.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# optiondlg.py, provides classes for option setting dialogs
#
-Index: convertall/source/unitatom.py
-===================================================================
---- convertall.orig/source/unitatom.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/unitatom.py 2013-08-06 06:34:43.389259110 +1000
+--- a/source/unitatom.py
++++ b/source/unitatom.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# unitatom.py, provides class to hold data on each available unit
#
-Index: convertall/source/unitdata.py
-===================================================================
---- convertall.orig/source/unitdata.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/unitdata.py 2013-08-06 06:34:43.389259110 +1000
+--- a/source/unitdata.py
++++ b/source/unitdata.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# unitdata.py, reads unit data from file
#
-Index: convertall/source/unitedit.py
-===================================================================
---- convertall.orig/source/unitedit.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/unitedit.py 2013-08-06 06:34:43.393259124 +1000
+--- a/source/unitedit.py
++++ b/source/unitedit.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# unitedit.py, provides a line edit for unit entry
#
-Index: convertall/source/unitgroup.py
-===================================================================
---- convertall.orig/source/unitgroup.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/unitgroup.py 2013-08-06 06:34:43.393259124 +1000
+--- a/source/unitgroup.py
++++ b/source/unitgroup.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# unitgroup.py, provides a group of units and does conversions
#
-Index: convertall/source/unitlistview.py
-===================================================================
---- convertall.orig/source/unitlistview.py 2013-08-06 06:34:43.401259165 +1000
-+++ convertall/source/unitlistview.py 2013-08-06 06:34:43.393259124 +1000
+--- a/source/unitlistview.py
++++ b/source/unitlistview.py
@@ -1,5 +1,3 @@
--#!/usr/bin/env python
+-#!/usr/bin/env python3
-
#****************************************************************************
# unitlistview.py, provides a list view of available units
Modified: packages/convertall/trunk/debian/patches/series
===================================================================
--- packages/convertall/trunk/debian/patches/series 2014-02-08 00:17:39 UTC (rev 10494)
+++ packages/convertall/trunk/debian/patches/series 2014-02-08 00:50:00 UTC (rev 10495)
@@ -1,2 +1 @@
-01_install_python_into_usr_share.patch
02_remove_module_shebang.patch
Modified: packages/convertall/trunk/debian/rules
===================================================================
--- packages/convertall/trunk/debian/rules 2014-02-08 00:17:39 UTC (rev 10494)
+++ packages/convertall/trunk/debian/rules 2014-02-08 00:50:00 UTC (rev 10495)
@@ -4,10 +4,10 @@
#export DH_VERBOSE=1
%:
- dh $@ --with python2
+ dh $@ --with python3
override_dh_install:
dh_install
- python install.py -p /usr -b $(CURDIR)/debian/convertall -i share/pixmaps/convertall
+ python3 install.py -p /usr -b $(CURDIR)/debian/convertall -i share/pixmaps/convertall
rm debian/convertall/usr/share/doc/convertall/LICENSE
rm debian/convertall/usr/share/doc/convertall/INSTALL
More information about the Python-apps-commits
mailing list