From 8876e2c569fddac49362fed7eeac582da7955bcc Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Mon, 8 Jun 2020 17:50:00 +0200 Subject: [PATCH] Update Debian packaging With qmake now doing a more standard installation, there is less left to do in our debian/rules. Signed-off-by: Tormod Volden --- distributions/debian/changelog | 2 +- distributions/debian/copyright | 3 ++- distributions/debian/jamulus.install | 1 + distributions/debian/rules | 13 +------------ distributions/debian/source/format | 1 + 5 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 distributions/debian/jamulus.install create mode 100644 distributions/debian/source/format diff --git a/distributions/debian/changelog b/distributions/debian/changelog index efa48b11..00cd2ce2 100644 --- a/distributions/debian/changelog +++ b/distributions/debian/changelog @@ -1,4 +1,4 @@ -jamulus (3.5.2) UNRELEASED; urgency=medium +jamulus (3.5.6~git-0) UNRELEASED; urgency=medium * Initial release. diff --git a/distributions/debian/copyright b/distributions/debian/copyright index a34612a0..9e011191 100644 --- a/distributions/debian/copyright +++ b/distributions/debian/copyright @@ -9,8 +9,9 @@ License: GPL-2 Files: debian/* Copyright: + 2020 Tormod Volden 2020 Olivier Humbert - 2019 "Marc Landolt jr" + 2019 Marc Landolt jr License: GPL-2 License: GPL-2 diff --git a/distributions/debian/jamulus.install b/distributions/debian/jamulus.install new file mode 100644 index 00000000..918bab6f --- /dev/null +++ b/distributions/debian/jamulus.install @@ -0,0 +1 @@ +distributions/jamulus-server.service lib/systemd/system diff --git a/distributions/debian/rules b/distributions/debian/rules index b98816c9..2cf5eb13 100755 --- a/distributions/debian/rules +++ b/distributions/debian/rules @@ -3,19 +3,8 @@ dh $@ override_dh_auto_configure: - qmake CONFIG+=noupcasename Jamulus.pro + qmake CONFIG+=noupcasename PREFIX=/usr Jamulus.pro override_dh_auto_build: cd src/res/translation && lrelease *.ts dh_auto_build - -override_dh_usrlocal: - echo $$(pwd) - mkdir -p $$(pwd)/debian/jamulus/usr/bin/ - install -D -m 0755 jamulus $$(pwd)/debian/jamulus/usr/bin/ - mkdir -p $$(pwd)/debian/jamulus/usr/share/applications/ - install -D -m 0755 $$(pwd)/distributions/jamulus.desktop $$(pwd)/debian/jamulus/usr/share/applications/ - mkdir -p $$(pwd)/debian/jamulus/usr/share/icons/hicolor/512x512/apps/ - cp $$(pwd)/distributions/jamulus.png $$(pwd)/debian/jamulus/usr/share/icons/hicolor/512x512/apps/ - mkdir -p $$(pwd)/debian/jamulus/lib/systemd/system - cp $$(pwd)/distributions/jamulus-server.service $$(pwd)/debian/jamulus/lib/systemd/system/ diff --git a/distributions/debian/source/format b/distributions/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/distributions/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt)