Use upstream's "install" targets

diff --git a/debian/jacktrip-gui.install b/debian/jacktrip-gui.install
index 5c27e3270de4a88088ccbf6018f455f9e673952a..b7c73c9c6f937f23b43e52cbf211af1315985ff0 100644 (file)
--- a/debian/jacktrip-gui.install
+++ b/debian/jacktrip-gui.install
@@ -1,2 +1,6 @@
+/usr/bin/*-gui
+/usr/share/man/*/*-gui.*
 debian/jacktrip-gui-launcher   usr/share/jacktrip/
-usr/
+/usr/share/metainfo/
+/usr/share/applications/
+/usr/share/icons/

diff --git a/debian/jacktrip-gui.manpages b/debian/jacktrip-gui.manpages
deleted file mode 100644 (file)
index a02b869..0000000
--- a/debian/jacktrip-gui.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/build/flavor-*/*-gui.1

diff --git a/debian/jacktrip.install b/debian/jacktrip.install
index b1b63ac81362ba4f502ecd7cddc5a0bfd287c533..57a98fb042426b1a089b79acfb6808de537610b1 100644 (file)
--- a/debian/jacktrip.install
+++ b/debian/jacktrip.install
@@ -1 +1,2 @@
-debian/build/flavor-*/*-cli /usr/bin/
+/usr/bin/*-cli
+/usr/share/man/*/*-cli.*

diff --git a/debian/jacktrip.manpages b/debian/jacktrip.manpages
deleted file mode 100644 (file)
index b077bbe..0000000
--- a/debian/jacktrip.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/build/flavor-*/*-cli.1

diff --git a/debian/rules b/debian/rules
index f0ad4c81b77643993ef03ab6c13d58199bb09be2..fc1b2e0d1598f9e1f5d60a511692a9917c349afa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,10 +48,6 @@ install_%:
        -mv debian/tmp/usr/share/man/man1/jacktrip.1 debian/tmp/usr/share/man/man1/jacktrip-$*.1
        -mv debian/tmp/usr/share/man/man1/jacktrip.1.gz debian/tmp/usr/share/man/man1/jacktrip-$*.1.gz
        -find debian/tmp -type f -name "*.desktop" -exec sed -e "s|^\(Exec=jacktrip\)$$|\1-$*|" -i {} ";"
-install_cli:
-       echo "skipping auto_install for flavour 'cli'"
-
-
 
 override_dh_installchangelogs:
        dh_installchangelogs docs/changelog.yml