Switching rules to use unchanged pybuild since we're using cli-helpers now.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 3 insertions, 33 deletions

diff --git a/debian/links b/debian/links
deleted file mode 100644
index acfc263..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/mycli/console /usr/bin/mycli
diff --git a/debian/patches/0001-rename-cli-so-it-can-be-moved-to-usr-share-mycli.patch b/debian/patches/0001-rename-cli-so-it-can-be-moved-to-usr-share-mycli.patch
deleted file mode 100644
index b466ec5..0000000
--- a/debian/patches/0001-rename-cli-so-it-can-be-moved-to-usr-share-mycli.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Lennart Weller <lhw@ring0.de>
-Date: Fri, 8 May 2020 10:47:38 +0200
-Subject: rename cli so it can be moved to /usr/share/mycli
-
-diff -Naurp mycli.orig/setup.py mycli/setup.py
---- mycli.orig/setup.py
-+++ mycli/setup.py
-@@ -24,7 +24,6 @@ install_requirements = [
-     'sqlparse>=0.3.0,<0.4.0',
-     'configobj >= 5.0.5',
-     'cryptography >= 1.0.0',
--    'cli_helpers[styles] >= 2.0.1',
-     'pyperclip >= 1.8.1'
- ]
- 
-@@ -93,7 +92,7 @@ setup(
-     long_description=description,
-     install_requires=install_requirements,
-     entry_points={
--        'console_scripts': ['mycli = mycli.main:cli'],
-+        'console_scripts': ['console = mycli.main:cli'],
-     },
-     cmdclass={'lint': lint, 'test': test},
-     python_requires=">=3.6",
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1bae90e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-rename-cli-so-it-can-be-moved-to-usr-share-mycli.patch
diff --git a/debian/rules b/debian/rules
index f1146ab..da59365 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,9 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=mycli
-%:
-	dh $@ --with python3 --buildsystem=pybuild
-
-override_dh_auto_install:
-	python3 setup.py install --root=debian/mycli --install-layout=deb --install-lib=/usr/share/mycli --install-scripts=/usr/share/mycli/
 
-override_dh_auto_build:
+%:
+	dh ${@} --buildsystem=pybuild --with python3
 
 override_dh_auto_test:
-
+	# disabled, doesn't work yet