Other distros have systemd under /usr/lib, install there.

diff --git a/ChangeLog b/ChangeLog
index 4c35e142db1df27cb076ee298fd9c4d23d1fe7b2..1dd53de70f53f126ce1ce0ffdf8efea64373c338 100644 (file)
--- 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 31a9d3989a704ad81f905481e6dcd287740b3ee9..463f1a74d1969604a3cddfb5ee95db4de49ba036 100755 (executable)
--- 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 63d119e3c661e3b2c1f8d592821ea19ce8f15116..b521d8c79a90c5921613aa3d9f29fd990d48c315 100644 (file)
--- 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 <andrew@etc.gen.nz>  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 4055a49436a5ba41b9dc149f04768195c9a38ad9..2f5d2bfe8b84fa811df07b3a636eceb4e72fc85e 100644 (file)
--- 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 <andrew@etc.gen.nz>
 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 5eca6b1fab72011261da7ef2d1b84881e7e907f6..28f24fa07187efc1e42656f7b3d33c54f58f6f27 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-makefile-man-path.patch
+makefile-debian-paths.patch