From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sat, 15 Jul 2023 12:35:08 +0000 (+1200)
Subject: Switch to dh sequencer
X-Git-Tag: 1.1.0~30
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23595c4161d9b1499fac49af8c4b89e3abf337ff;p=mythtv-status.git
Switch to dh sequencer
---
diff --git a/ChangeLog b/ChangeLog
index 94215d6..af32a76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
2023-07-16 Andrew Ruthven
Remove bashisms
+ Include my Makefile in the tarball, this allows using "make install" to install
+ mythtv-status.
+
2001-02-14 Andrew Ruthven
Release version 1.0.2.
diff --git a/Makefile b/Makefile
index d57e8b8..7904fa8 100755
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,8 @@ RELEASE_FILES=$(orig_tarball) ../build/tarball/mythtv-status-${version}.tar.gz $
TEST_VERBOSE=0
TEST_FILES=t/*.t
-all: test release
+all: test
+dist: test release
release: $(RELEASE_FILES)
@@ -36,7 +37,7 @@ $(orig_tarball): $(tarball)
$(tarball):
@mkdir -p $(@D)
- @git archive --format=tar --prefix=$(package)-$(version)/ $(version) `git ls-tree --name-only $(version) | egrep -v "(.gitignore|debian|Makefile|testing)"` | gzip > $(tarball)
+ @git archive --format=tar --prefix=$(package)-$(version)/ $(version) `git ls-tree --name-only $(version) | egrep -v "(.gitignore|debian|testing)"` | gzip > $(tarball)
@gpg -sb --armour $(tarball)
../build/$(release)/$(deb): $(orig_tarball)
@@ -79,6 +80,8 @@ test:
clean:
@rm -rf build
+
+clean_pkg:
@rm -f ../$(package)*.changes ../$(package)*.dsc ../$(package)*.tar.gz ../$(package)*.deb
-.PHONY: release clean install test
+.PHONY: release clean install test dist
diff --git a/debian/changelog b/debian/changelog
index 69b7a91..e48170f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mythtv-status (1.0.2-1) UNRELEASED; urgency=medium
* New upstream release (very minor change).
* Drop 50-mythtv-status-exit-code.patch, applied upstream.
* Bump Standards-Version to 4.6.2 (no changes).
+ * Change d/rules to use dh sequencer.
-- Andrew Ruthven <andrew@etc.gen.nz> Sun, 06 Dec 2020 22:51:12 +1300
diff --git a/debian/install b/debian/install
index 67d3033..e9c997b 100644
--- a/debian/install
+++ b/debian/install
@@ -1,6 +1,3 @@
-bin/mythtv-status usr/bin
-bin/mythtv_recording_now usr/bin
-bin/mythtv_recording_soon usr/bin
bin/mythtv-update-motd /usr/sbin
molly-guard/40-mythtv-recording-soon etc/molly-guard/run.d
update-motd.d/50-mythtv-status etc/update-motd.d
diff --git a/debian/rules b/debian/rules
index 3fc3fb0..218df65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,62 +1,8 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- dh_clean
- debconf-updatepo
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
- pod2man bin/mythtv-status > debian/mythtv-status.1
- @touch build-stamp
-
-install: build-stamp
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
-# Build architecture-independent files here.
-binary-indep: install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install
- dh_installdebconf
-# Make sure we start after mythtv-backend
-# Set --error-handler so that a failing init script (for example, no MythTV
-# backend reachable) won't cause the installation to abort.
- DH_OPTIONS="--error-handler=true" dh_installinit -- defaults 51
- dh_installsystemd
- dh_installcron
- dh_installman debian/mythtv-status.1 man/*
- dh_compress
- dh_fixperms
- dh_perl
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-
-# Build architecture-dependent files here.
-binary-arch: install
-# We have nothing to do by default.
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure
+%:
+ dh $@
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index e1fea71..88a553e 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -2,6 +2,3 @@
debian-watch-uses-insecure-uri
vcs-field-uses-insecure-uri Vcs-Browser http://git.etc.gen.nz/cgi-bin/gitweb.cgi?p=mythtv-status.git;a=summary
vcs-field-uses-insecure-uri Vcs-Git http://git.etc.gen.nz/mythtv-status.git
-
-# We generate the manpage from the pod during build
-maintainer-manual-page debian/mythtv-status.1