From ad66f2042fd653ec54fb1e60e33e506ddcf8878e Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> Date: Tue, 25 Apr 2017 11:14:20 -0400 Subject: [PATCH] prepare new debian release --- debian/changelog | 7 +++++++ .../0001-fix-up-permissions-on-tmpfiles.patch | 18 ------------------ debian/patches/series | 1 - debian/rules | 5 ----- 4 files changed, 7 insertions(+), 24 deletions(-) delete mode 100644 debian/patches/0001-fix-up-permissions-on-tmpfiles.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index cba7eed..1c126bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +hddemux (0.2-1) unstable; urgency=medium + + * New upstream version + - minor service cleanup + + -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Mon, 24 Apr 2017 21:01:42 -0400 + hddemux (0.1-1) unstable; urgency=medium * Debian packaging (Closes: #861143) diff --git a/debian/patches/0001-fix-up-permissions-on-tmpfiles.patch b/debian/patches/0001-fix-up-permissions-on-tmpfiles.patch deleted file mode 100644 index 81ceb19..0000000 --- a/debian/patches/0001-fix-up-permissions-on-tmpfiles.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> -Date: Mon, 24 Apr 2017 21:58:26 -0400 -Subject: fix up permissions on tmpfiles - -(cherry picked from commit 3f7230798c585c9246ef379d2564af3441f6870a) ---- - hddemux.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hddemux.conf b/hddemux.conf -index e7caa67..2459555 100644 ---- a/hddemux.conf -+++ b/hddemux.conf -@@ -1,3 +1,3 @@ - # tmpfiles.d(5) runtime directory for hddemux - d /run/hddemux 0751 root root - - --d /run/hddemux/workdir hddemux hddemux - - -+d /run/hddemux/workdir 0750 root hddemux - - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 77d8986..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-fix-up-permissions-on-tmpfiles.patch diff --git a/debian/rules b/debian/rules index 3696243..a726a69 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,3 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ -# do not try to start hddemux.service -- it should be -# socket-activated. note that this also means that hddemux.service -# isn't stopped upon package removal, though, which i think is a bug. -override_dh_systemd_start: - dh_systemd_start hddemux.socket -- GitLab