[proftpd-dfsg] 01/01: Policy bumped to 4.1.3
Francesco Lovergine
frankie at moszumanska.debian.org
Thu Jan 4 15:47:44 UTC 2018
This is an automated email from the git hooks/post-receive script.
frankie pushed a commit to branch master
in repository proftpd-dfsg.
commit 1e3bae531299015360e4821425cb0778e41e1d85
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Thu Jan 4 16:47:38 2018 +0100
Policy bumped to 4.1.3
---
debian/changelog | 5 +++++
debian/control | 4 ++--
debian/control.in | 4 ++--
debian/proftpd-basic.postinst | 2 +-
debian/proftpd-basic.postrm | 2 +-
debian/proftpd-basic.preinst | 27 +++++++++++----------------
debian/proftpd-basic.prerm | 8 +-------
debian/proftpd-basic.proftpd.init | 2 +-
8 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 85f0401..b7aebb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ proftpd-dfsg (1.3.5e-1) UNRELEASED; urgency=medium
* At postinst change permissions of some *.conf files
(closes: #638955)
* Removed autotools_dev b-d, now obsoleted by current debhelper.
+ * Removed explicit path for update-inetd in postinst and postrm to make
+ lintian happy
+ * Policy bumped to 4.1.3.
+ - Recommends proftpd-doc as for 4.0.0.
+ - Do not invoke /etc/init.d script even as fallback as for 4.0.0
-- Francesco Paolo Lovergine <frankie at debian.org> Fri, 07 Jul 2017 12:06:53 +0200
diff --git a/debian/control b/debian/control
index fdc1b23..fcba69d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
Priority: optional
Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
Build-Depends: debhelper (>= 9.20160114),
libacl1-dev,
libattr1-dev,
@@ -42,13 +42,13 @@ Replaces: proftpd (<< 1.3.2)
Provides: ftp-server, proftpd, proftpd-abi-1.3.5e
Suggests: openbsd-inetd | inet-superserver,
openssl,
- proftpd-doc,
proftpd-mod-ldap,
proftpd-mod-mysql,
proftpd-mod-odbc,
proftpd-mod-pgsql,
proftpd-mod-sqlite,
proftpd-mod-geoip
+Recommends: proftpd-doc
Description: Versatile, virtual-hosting FTP daemon - binaries
ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
Protocol daemon supports also hidden directories, virtual hosts, and
diff --git a/debian/control.in b/debian/control.in
index 7e5a33f..e8ff105 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: net
Priority: optional
Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
Build-Depends: debhelper (>= 9.20160114),
libacl1-dev,
libattr1-dev,
@@ -42,13 +42,13 @@ Replaces: proftpd (<< 1.3.2)
Provides: ftp-server, proftpd, proftpd-abi- at VERSION@
Suggests: openbsd-inetd | inet-superserver,
openssl,
- proftpd-doc,
proftpd-mod-ldap,
proftpd-mod-mysql,
proftpd-mod-odbc,
proftpd-mod-pgsql,
proftpd-mod-sqlite,
proftpd-mod-geoip
+Recommends: proftpd-doc
Description: Versatile, virtual-hosting FTP daemon - binaries
ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
Protocol daemon supports also hidden directories, virtual hosts, and
diff --git a/debian/proftpd-basic.postinst b/debian/proftpd-basic.postinst
index 3d8f196..17d847e 100644
--- a/debian/proftpd-basic.postinst
+++ b/debian/proftpd-basic.postinst
@@ -120,7 +120,7 @@ DONTSTART=0
. /usr/share/debconf/confmodule
# update-ined is used if found, else you are on your own
-if [ -x /usr/sbin/update-inetd ]; then
+if [ ! -z `which update-inetd` ]; then
UPDATE_INETD=update-inetd
else
UPDATE_INETD=/bin/true
diff --git a/debian/proftpd-basic.postrm b/debian/proftpd-basic.postrm
index 7c55f71..b3a4c86 100644
--- a/debian/proftpd-basic.postrm
+++ b/debian/proftpd-basic.postrm
@@ -4,7 +4,7 @@ set -e
if [ "$1" = "disappear" -o "$1" = "remove" ]
then
- if [ -x /usr/sbin/update-inetd ]
+ if [ ! -z `which update-inetd` ]
then
update-inetd --disable ftp
fi
diff --git a/debian/proftpd-basic.preinst b/debian/proftpd-basic.preinst
index 5559210..9a1d2e3 100644
--- a/debian/proftpd-basic.preinst
+++ b/debian/proftpd-basic.preinst
@@ -10,22 +10,17 @@ set -e
#
if [ "$1" = "upgrade" ]; then
- if [ -e /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d proftpd stop >/dev/null 2>&1 || true
- else
- /etc/init.d/proftpd stop >/dev/null 2>&1 || true
- fi
-
- # Scoreboard file format changed in 1.2.9
- # Now stopping all inetd sessions and removing it to ensure
- # a clean upgrade
- if dpkg --compare-versions "$2" lt "1.2.9-1"; then
- if [ `pgrep proftpd|wc -l` -ne 0 ]; then
- pkill proftpd
- sleep 2
- fi
- rm -f /run/proftpd/proftpd.scoreboard
- fi
+ invoke-rc.d proftpd stop >/dev/null 2>&1 || true
+ # Scoreboard file format changed in 1.2.9
+ # Now stopping all inetd sessions and removing it to ensure
+ # a clean upgrade
+ if dpkg --compare-versions "$2" lt "1.2.9-1"; then
+ if [ `pgrep proftpd|wc -l` -ne 0 ]; then
+ pkill proftpd
+ sleep 2
+ fi
+ rm -f /run/proftpd/proftpd.scoreboard
+ fi
fi
exit 0
diff --git a/debian/proftpd-basic.prerm b/debian/proftpd-basic.prerm
index c8b570d..408a65b 100644
--- a/debian/proftpd-basic.prerm
+++ b/debian/proftpd-basic.prerm
@@ -2,12 +2,6 @@
set -e
-if [ -x "/usr/sbin/invoke-rc.d" ]; then
- invoke-rc.d proftpd stop || true
-else
- if [ -x "/etc/init.d/proftpd" ]; then
- /etc/init.d/proftpd stop || true
- fi
-fi
+invoke-rc.d proftpd stop || true
#DEBHELPER#
diff --git a/debian/proftpd-basic.proftpd.init b/debian/proftpd-basic.proftpd.init
index cf48512..e79deea 100755
--- a/debian/proftpd-basic.proftpd.init
+++ b/debian/proftpd-basic.proftpd.init
@@ -65,7 +65,7 @@ then
fi
fi
-# /var/run could be on a tmpfs
+# /run could be on a tmpfs
[ ! -d /run/proftpd ] && mkdir /run/proftpd
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-dfsg.git
More information about the Pkg-proftpd-maintainers
mailing list