From 6736b5d20d40793c5156a033024dd89df9abaf79 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 14 Aug 2017 12:14:42 -0700 Subject: [PATCH] debian: clarify choice between git-daemon-run, git-daemon-sysvinit Standards-Version 4.0.1 eliminates the "extra" priority. That means git-daemon-sysvinit get priority "optional", removing the illusion that we've provided enough information for administrators to pick which git-daemon service to install via the priority field. Add some text to allow administrators to make an informed choice. We should have done this long ago. Signed-off-by: Jonathan Nieder --- debian/changelog | 9 ++++++--- debian/control | 11 +++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2a89ee6a43..fd0ff7385d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ -git (1:2.14.1-1.1) unstable; urgency=low +git (1:2.14.1-2) unstable; urgency=low - * update upstream changelog. + * debian/control: git-daemon-sysvinit: Priority: optional. + * debian/control: clarify how to decide between git-daemon-run and + git-daemon-sysvinit in package descriptions. + * debian/control: Standards-Version: 4.0.1.0. - -- Jonathan Nieder Thu, 10 Aug 2017 13:33:47 -0700 + -- Jonathan Nieder Mon, 14 Aug 2017 12:14:32 -0700 git (1:2.14.1-1) unstable; urgency=high diff --git a/debian/control b/debian/control index db65fee1cf..5c2eb2064a 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: libz-dev, gettext, dh-apache2, dpkg-dev (>= 1.16.2~) Build-Depends-Indep: asciidoc, xmlto, docbook-xsl -Standards-Version: 4.0.0.0 +Standards-Version: 4.0.1.0 Homepage: https://git-scm.com/ Vcs-Git: https://repo.or.cz/r/git/debian.git/ Vcs-Browser: http://repo.or.cz/w/git/debian.git/ @@ -221,10 +221,11 @@ Description: fast, scalable, distributed revision control system (git-daemon ser git-daemon, as provided by the git package, is a simple server for git repositories, ideally suited for read-only updates, i.e. pulling from git repositories through the network. This package provides a runit service - for running git-daemon permanently. + for running git-daemon permanently. This configuration is simpler and + more reliable than git-daemon-sysvinit, at a cost of being less + familiar for administrators accustomed to sysvinit. Package: git-daemon-sysvinit -Priority: extra Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, git (>> ${source:Upstream-Version}), git (<< ${source:Upstream-Version}-.), adduser, lsb-base (>= 3.0-6) @@ -242,7 +243,9 @@ Description: fast, scalable, distributed revision control system (git-daemon ser git-daemon, as provided by the git package, is a simple server for git repositories, ideally suited for read-only updates, i.e. pulling from git repositories through the network. This package provides a sysvinit service - for running git-daemon permanently. + for running git-daemon permanently. Unlike git-daemon-run, this + package provides the usual sysvinit service management commands + ("service git-daemon start/stop") for git-daemon. Package: git-gui Architecture: all -- 2.11.4.GIT