From c9d462e48426985399aa5abb6fd3eff9bf055258 Mon Sep 17 00:00:00 2001 From: Salvo 'LtWorf' Tomaselli Date: Mon, 1 Jun 2015 11:50:29 +0200 Subject: [PATCH] Debian build updated --- debian/changelog | 16 ++++++++++++-- debian/control | 15 +++++++------ debian/copyright | 22 ++----------------- ...l.examples => python3-relational.examples} | 0 debian/relational-cli.links | 2 +- debian/relational.links | 2 +- debian/rules | 6 ++--- 7 files changed, 29 insertions(+), 34 deletions(-) rename debian/{python-relational.examples => python3-relational.examples} (100%) diff --git a/debian/changelog b/debian/changelog index def7f2f..99852c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +relational (2.0-1) unstable; urgency=medium + + * New upstream release + * Now uses Python3 + * Now uses PyQt5 + * Bump standards version + * Recommends python3-pyqt5.qtwebkit to open the documentation from the UI but + it is not a necessity + + + -- Salvo 'LtWorf' Tomaselli Mon, 01 Jun 2015 09:40:09 +0200 + relational (1.2-2) unstable; urgency=medium * Fix problem in relational-cli that made it crash when exceptions @@ -17,7 +29,7 @@ relational (1.2-1) unstable; urgency=medium relational (1.1-1) unstable; urgency=low * New upstream release - * Can use either PyQt or PySide + * Can use either PyQt or PySide * python-relational now uses unicode instead of utf-8 encoded strings -- Salvo 'LtWorf' Tomaselli Sat, 22 Oct 2011 15:27:01 +0200 @@ -34,7 +46,7 @@ relational (1.0-1) unstable; urgency=low relational (0.11-2) unstable; urgency=low * New package relational-cli - * Creates menu entry for relational + * Creates menu entry for relational * Ships examples with the python-relational package * Links examples from python-relational into /usr/share/doc/relational and /usr/share/doc/relational-cli diff --git a/debian/control b/debian/control index 2f74a4a..719a06e 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,14 @@ Source: relational Section: math Priority: optional Maintainer: Salvo 'LtWorf' Tomaselli -Build-Depends: debhelper (>= 7.0.50~), python, python-support, python-xtermcolor -Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 7.0.50~), python3, dh-python, python3-xtermcolor +Standards-Version: 3.9.6 Homepage: http://ltworf.github.io/relational/ -Package: python-relational +Package: python3-relational Architecture: all Section: python -Depends: ${misc:Depends}, ${python:Depends} +Depends: ${misc:Depends}, ${python3:Depends} Description: Educational tool for relational algebra (standalone module) Relational is primarily a tool to provide a workspace for experimenting with relational algebra, an offshoot of first-order logic. @@ -19,7 +19,8 @@ Description: Educational tool for relational algebra (standalone module) Package: relational Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-relational (>= ${binary:Version}), python-qt4 +Depends: ${misc:Depends}, ${python3:Depends}, python3-relational (>= ${binary:Version}), python3-pyqt5 +Recommends: python3-pyqt5.qtwebkit Description: Educational tool for relational algebra (graphical user interface) Relational is primarily a tool to provide a workspace for experimenting with relational algebra, an offshoot of first-order logic. @@ -29,8 +30,8 @@ Description: Educational tool for relational algebra (graphical user interface) Package: relational-cli Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, python-relational (>= ${binary:Version}), - python-xtermcolor +Depends: ${misc:Depends}, ${python3:Depends}, python3-relational (>= ${binary:Version}), + python3-xtermcolor Description: Educational tool for relational algebra (command line interface) Relational is primarily a tool to provide a workspace for experimenting with relational algebra, an offshoot of first-order logic. diff --git a/debian/copyright b/debian/copyright index 18a0a8b..207b8e9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,26 +3,8 @@ Author: Salvo "LtWorf" Tomaselli Source: http://ltworf.github.io/relational/ Files: * -Copyright: © 2008 Salvo "LtWorf" Tomaselli -License: GPL-3+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General Public License - can be found in the /usr/share/common-licenses/GPL-3 file. - -Files: debian/* -Copyright: © 2009 Chris Lamb +Copyright: © 2008 Salvo "LtWorf" Tomaselli , + © 2009 Chris Lamb License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/python-relational.examples b/debian/python3-relational.examples similarity index 100% rename from debian/python-relational.examples rename to debian/python3-relational.examples diff --git a/debian/relational-cli.links b/debian/relational-cli.links index 293c57a..af9f00a 100644 --- a/debian/relational-cli.links +++ b/debian/relational-cli.links @@ -1 +1 @@ -usr/share/doc/python-relational/examples/ usr/share/doc/relational-cli/examples +usr/share/doc/python3-relational/examples/ usr/share/doc/relational-cli/examples diff --git a/debian/relational.links b/debian/relational.links index e6966ef..de57edd 100644 --- a/debian/relational.links +++ b/debian/relational.links @@ -1 +1 @@ -usr/share/doc/python-relational/examples/ usr/share/doc/relational/examples +usr/share/doc/python3-relational/examples/ usr/share/doc/relational/examples diff --git a/debian/rules b/debian/rules index 515c0af..d9abc27 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ SHELL=sh -e %: ./driver.py - dh $@ + dh $@ --with python3 clean: rm -rf build *.egg-info @@ -11,8 +11,8 @@ clean: override_dh_auto_build: override_dh_auto_install: - for pkg in relational-cli python-relational relational; do \ - python setup/$${pkg}.setup.py install --root=$(CURDIR)/debian/$${pkg}; \ + for pkg in relational-cli python3-relational relational; do \ + python3 setup/$${pkg}.setup.py install --root=$(CURDIR)/debian/$${pkg}; \ rm -rf build; \ done