From 66ab87ab3b527bdf6982d7c356392528530ea99b Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Wed, 30 Aug 2023 11:05:53 +0200 Subject: [PATCH] Use upstream's "install" targets --- debian/jacktrip-gui.install | 6 +++++- debian/jacktrip-gui.manpages | 1 - debian/jacktrip.install | 3 ++- debian/jacktrip.manpages | 1 - debian/rules | 4 ---- 5 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 debian/jacktrip-gui.manpages delete mode 100644 debian/jacktrip.manpages diff --git a/debian/jacktrip-gui.install b/debian/jacktrip-gui.install index 5c27e32..b7c73c9 100644 --- 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 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 b1b63ac..57a98fb 100644 --- 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 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 f0ad4c8..fc1b2e0 100755 --- 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 -- 2.30.2