summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Bogatov <KAction@debian.org>2018-12-16 08:59:23 +0000
committerDmitry Bogatov <KAction@debian.org>2018-12-16 08:59:28 +0000
commit932824afbc8302949e4b3551a14b42e629a66ebc (patch)
tree0c04f6661aed2eba6376ad760f7ee8ef87efa821
parent1432d897faea22299d253b3cfad8c94cd751ed1f (diff)
Do not impose dependency on `runit' binary package
Instead, generate conflict relation with old `runit' version, not providing `runit-log' user.
-rw-r--r--debian/changelog3
-rwxr-xr-xdh_runit3
2 files changed, 5 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 0a35570..c1ce29d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ dh-runit (2.8.1) UNRELEASED; urgency=medium
3 * Make auto-generated runscripts invoke svlogd(8) as `runit-log' user. 3 * Make auto-generated runscripts invoke svlogd(8) as `runit-log' user.
4 * Impose dependency on (runit >= 2.1.2-20), which provides `runit-log' 4 * Impose dependency on (runit >= 2.1.2-20), which provides `runit-log'
5 user. 5 user.
6 * Do not impose dependency on `runit' binary package. Instead,
7 generate conflict relation with old `runit' version, not providing
8 `runit-log' user.
6 9
7 -- Dmitry Bogatov <KAction@debian.org> Wed, 12 Dec 2018 02:15:19 +0000 10 -- Dmitry Bogatov <KAction@debian.org> Wed, 12 Dec 2018 02:15:19 +0000
8 11
diff --git a/dh_runit b/dh_runit
index bf2a49a..a3e512b 100755
--- a/dh_runit
+++ b/dh_runit
@@ -102,7 +102,8 @@ HERE
102 install_dir("$tmp/var/lib/runit/log/supervise/$name"); 102 install_dir("$tmp/var/lib/runit/log/supervise/$name");
103 } 103 }
104 } 104 }
105 addsubstvar($pkg, 'misc:Depends', 'runit', '>= 2.1.2-20~'); 105 # runit=2.1.2-20 introduced 'runit-log' user
106 addsubstvar($pkg, 'runit:Conflicts', 'runit', '<< 2.1.2-20~');
106 addsubstvar($pkg, 'misc:Depends', 'runit-helper', '>= 2.8.1~'); 107 addsubstvar($pkg, 'misc:Depends', 'runit-helper', '>= 2.8.1~');
107} 108}
108 109