Debian build updated

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 <tiposchi@tiscali.it>  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 <tiposchi@tiscali.it>  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

debian/control

@@ -2,14 +2,14 @@ Source: relational
 Section: math
 Priority: optional
 Maintainer: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>
-Build-Depends: debhelper (>= 7.0.50~), python, python-support, python-xtermcolor
+Build-Depends: debhelper (>= 7.0.50~), python3, dh-python, python3-xtermcolor
-Standards-Version: 3.9.5
+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}),
+Depends: ${misc:Depends}, ${python3:Depends}, python3-relational (>= ${binary:Version}),
- python-xtermcolor
+ 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.

debian/copyright

@@ -3,26 +3,8 @@ Author: Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
 Source: http://ltworf.github.io/relational/
 
 Files: *
-Copyright: © 2008 Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
+Copyright: © 2008 Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>,
-License: GPL-3+
+ © 2009 Chris Lamb <lamby@debian.org>
- 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 <http://www.gnu.org/licenses/>.
- .
- 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 <lamby@debian.org>
 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

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

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

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 \
+	for pkg in relational-cli python3-relational relational; do \
-	  python setup/$${pkg}.setup.py install --root=$(CURDIR)/debian/$${pkg}; \
+	  python3 setup/$${pkg}.setup.py install --root=$(CURDIR)/debian/$${pkg}; \
 	  rm -rf build; \
 	done