From 9b31bbc1c81a6f27dd956c3c0fa9a8265640eea5 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Thu, 27 Jul 2023 00:16:58 +1200 Subject: [PATCH] Other distros have systemd under /usr/lib, install there. --- ChangeLog | 4 ++++ Makefile | 2 +- debian/changelog | 8 ++++++++ ...file-man-path.patch => makefile-debian-paths.patch} | 10 ++++++---- debian/patches/series | 2 +- 5 files changed, 20 insertions(+), 6 deletions(-) rename debian/patches/{makefile-man-path.patch => makefile-debian-paths.patch} (66%) diff --git a/ChangeLog b/ChangeLog index 4c35e14..1dd53de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2023-07-27 Andrew Ruthven + Install the systemd files into the UsrMerge location so we'll work with + more distributions, thanks to Göran Uddeborgfor pointing this out. + 2023-07-27 Göran Uddebor Install update-update-motd diff --git a/Makefile b/Makefile index 31a9d39..463f1a7 100755 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ BINDIR=$(DESTDIR)/usr/bin SBINDIR=$(DESTDIR)/usr/sbin LIBEXECDIR=$(DESTDIR)/usr/libexec/mythtv-status MANDIR=$(DESTDIR)/usr/man -SYSTEMDDIR=$(DESTDIR)/lib/systemd/system +SYSTEMDDIR=$(DESTDIR)/usr/lib/systemd/system package=mythtv-status releases=sid diff --git a/debian/changelog b/debian/changelog index 63d119e..b521d8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mythtv-status (1.1.1-1) UNRELEASED; urgency=medium + + * New upstream release. + * Refresh patch makefile-man-path.patch for Debian specific paths and + rename to makefile-debian-paths.patch. + + -- Andrew Ruthven Thu, 27 Jul 2023 00:14:18 +1200 + mythtv-status (1.1.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/makefile-man-path.patch b/debian/patches/makefile-debian-paths.patch similarity index 66% rename from debian/patches/makefile-man-path.patch rename to debian/patches/makefile-debian-paths.patch index 4055a49..2f5d2bf 100644 --- a/debian/patches/makefile-man-path.patch +++ b/debian/patches/makefile-debian-paths.patch @@ -1,4 +1,4 @@ -Description: Install man pages to Debian location +Description: Use Debian paths Author: Andrew Ruthven Forwarded: not-needed Last-Update: 2023-07-16 @@ -6,12 +6,14 @@ Last-Update: 2023-07-16 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Makefile +++ b/Makefile -@@ -2,7 +2,7 @@ - +@@ -3,8 +3,8 @@ BINDIR=$(DESTDIR)/usr/bin + SBINDIR=$(DESTDIR)/usr/sbin LIBEXECDIR=$(DESTDIR)/usr/libexec/mythtv-status -MANDIR=$(DESTDIR)/usr/man +-SYSTEMDDIR=$(DESTDIR)/usr/lib/systemd/system +MANDIR=$(DESTDIR)/usr/share/man - SYSTEMDDIR=$(DESTDIR)/lib/systemd/system ++SYSTEMDDIR=$(DESTDIR)/lib/systemd/system package=mythtv-status + releases=sid diff --git a/debian/patches/series b/debian/patches/series index 5eca6b1..28f24fa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -makefile-man-path.patch +makefile-debian-paths.patch -- 2.30.2