From e24e75734209a6b7266aada1a4795a71a16015fa Mon Sep 17 00:00:00 2001
From: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>
Date: Sat, 3 Oct 2015 23:54:23 +0200
Subject: [PATCH] Moved most of install logic to makefile

Makefile has again a make install target. The install targets
are split because it is easier for the rules file to install
the files for the different packages inside different destinations
directly.
---
 Makefile                  | 19 +++++++++++++++++--
 debian/changelog          |  6 ++++++
 debian/relational.install |  2 --
 debian/rules              | 18 ++++++------------
 4 files changed, 29 insertions(+), 16 deletions(-)
 delete mode 100644 debian/relational.install

diff --git a/Makefile b/Makefile
index 720b958..40564f4 100644
--- a/Makefile
+++ b/Makefile
@@ -32,5 +32,20 @@ clean:
 	rm -f relational_gui/rel_edit.py
 	rm -f relational_gui/resources.py
 
-debian:
-	dpkg-buildpackage
+install-relational-cli:
+	python3 setup/relational-cli.setup.py install --root=$${DESTDIR:-/};
+	rm -rf build;
+	install -D relational_gui.py $${DESTDIR:-/}/usr/bin/relational-cli
+
+install-python3-relational:
+	python3 setup/python3-relational.setup.py install --root=$${DESTDIR:-/};
+	rm -rf build;
+
+install-relational:
+	python3 setup/relational.setup.py install --root=$${DESTDIR:-/};
+	rm -rf build;
+	install -D relational_gui.py $${DESTDIR:-/}/usr/bin/relational
+	install -m0644 -D relational.desktop $${DESTDIR:-/}/usr/share/applications/relational.desktop
+	install -m0644 -D relational_gui/resources/relational.png $${DESTDIR:-/}/usr/share/pixmaps/relational.png
+
+install: install-relational-cli install_module_gui install-relational
diff --git a/debian/changelog b/debian/changelog
index c2e7671..7496b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+relational (2.2-1) UNRELEASED; urgency=medium
+
+  * Fixed debian/rules to run testsuite just once
+
+ -- Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>  Sun, 04 Oct 2015 00:22:27 +0200
+
 relational (2.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/relational.install b/debian/relational.install
deleted file mode 100644
index 4e87795..0000000
--- a/debian/relational.install
+++ /dev/null
@@ -1,2 +0,0 @@
-relational.desktop usr/share/applications
-relational_gui/resources/relational.png usr/share/pixmaps
diff --git a/debian/rules b/debian/rules
index 180ff6f..31c91f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,22 +2,16 @@
 SHELL=sh -e
 
 %:
-	make
-	./driver.py
 	dh $@ --with python3
 
+override_dh_auto_test:
+	./driver.py
+
 clean:
 	rm -rf build *.egg-info
 	dh $@
 
-override_dh_auto_build:
 override_dh_auto_install:
-	for pkg in relational-cli python3-relational relational; do \
-	  python3 setup/$${pkg}.setup.py install --root=$(CURDIR)/debian/$${pkg}; \
-	  rm -rf build; \
-	done
-
-override_dh_install:
-	install -D relational_gui.py debian/relational/usr/bin/relational
-	install -D relational_gui.py debian/relational-cli/usr/bin/relational-cli
-	dh_install
+	DESTDIR=debian/relational-cli make install-relational-cli
+	DESTDIR=debian/python3-relational make install-python3-relational
+	DESTDIR=debian/relational make install-relational