[Git][debian-proftpd-team/proftpd][master] 4 commits: Trim trailing whitespace.

[Hilmar Preuße (@hilmar-guest)]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
83a41484 by Debian Janitor at 2021-08-24T07:25:12+00:00
Trim trailing whitespace.

Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html

- - - - -
6ff66e36 by Debian Janitor at 2021-08-24T07:25:55+00:00
Update renamed lintian tag names in lintian overrides.

Changes-By: lintian-brush
Fixes: lintian: renamed-tag
See-also: https://lintian.debian.org/tags/renamed-tag.html

- - - - -
90106c20 by Hilmar Preuße at 2021-08-24T16:04:48+00:00
Merge branch 'master' into 'lintian-fixes'

# Conflicts:
#   debian/changelog
- - - - -
1b6f6261 by Hilmar Preusse at 2021-08-24T18:09:58+02:00
Merge branch 'janitor-team/proposed/proftpd-lintian-fixes'

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/proftpd-core.lintian-overrides


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,14 @@
 proftpd-dfsg (1.3.7b+dfsg-2) unstable; urgency=medium
 
+  [ Hilmar Preusse ]
   * Forgot to bump abi version (needs to be done manually).
   * Updated to Standards-Version 4.6.0, no changes needed.
 
- -- Hilmar Preusse <hille42 at web.de>  Tue, 24 Aug 2021 17:56:57 +0200
+  [ Debian Janitor ]
+  * Trim trailing whitespace.
+  * Update renamed lintian tag names in lintian overrides.
+
+ -- Hilmar Preusse <hille42 at web.de>  Tue, 24 Aug 2021 09:09:55 +0200
 
 proftpd-dfsg (1.3.7b+dfsg-1) unstable; urgency=medium
 
@@ -52,7 +57,7 @@ proftpd-dfsg (1.3.7a+dfsg-9) unstable; urgency=medium
   * Using deb-systemd-invoke instead of systemctl in postinst and
     added a pre-depends on that basis to pre-dep on a recent version
     of init-system-helpers. Thanks lintian!
-  * Introduced ${misc:Depends} among p-basic deps to make lintian happy. 
+  * Introduced ${misc:Depends} among p-basic deps to make lintian happy.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 04 Jan 2021 11:23:32 +0100
 
@@ -85,7 +90,7 @@ proftpd-dfsg (1.3.7a+dfsg-5) unstable; urgency=medium
     (closes: #977853)
   * Now truly installing socket-related systemd files. Migrated to debhelper
     level 11 to finalize a working combination of dh_installsystemd/dh_installinit.
-    That triggered also a few changes to debian/rules, including the dropping 
+    That triggered also a few changes to debian/rules, including the dropping
     dh_auto_configure use.
   * Fixed postinst to add new conf files, if missing. That also caused
     breakage at postinst time :-/


=====================================
debian/control
=====================================
@@ -54,7 +54,7 @@ Suggests: openbsd-inetd | inet-superserver,
           proftpd-mod-sqlite,
           proftpd-mod-geoip,
           proftpd-mod-snmp,
-		  proftpd-mod-crypto, 
+		  proftpd-mod-crypto,
 		  proftpd-mod-wrap
 Recommends: proftpd-doc
 Description: Versatile, virtual-hosting FTP daemon - binaries
@@ -242,7 +242,7 @@ Architecture: any
 Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Enhances: proftpd-core
 Breaks: proftpd-basic (<= 1.3.7a+dfsg-3~), proftpd-core (<= 1.3.7a+dfsg-3~)
-Replaces: proftpd-basic (<= 1.3.7a+dfsg-3~), proftpd-core (<= 1.3.7a+dfsg-3~)  
+Replaces: proftpd-basic (<= 1.3.7a+dfsg-3~), proftpd-core (<= 1.3.7a+dfsg-3~)
 Description: Versatile, virtual-hosting FTP daemon - TLS/SSL/SFTP modules
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -298,4 +298,3 @@ Description: Transitional dummy package for ProFTPD
  upload/download ratios are also supported.
  .
  This is a transitional package only. It can safely be removed.
-


=====================================
debian/control.in
=====================================
@@ -54,7 +54,7 @@ Suggests: openbsd-inetd | inet-superserver,
           proftpd-mod-sqlite,
           proftpd-mod-geoip,
           proftpd-mod-snmp,
-		  proftpd-mod-crypto, 
+		  proftpd-mod-crypto,
 		  proftpd-mod-wrap
 Recommends: proftpd-doc
 Description: Versatile, virtual-hosting FTP daemon - binaries
@@ -242,7 +242,7 @@ Architecture: any
 Depends: proftpd-core (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Enhances: proftpd-core
 Breaks: proftpd-basic (<= 1.3.7a+dfsg-3~), proftpd-core (<= 1.3.7a+dfsg-3~)
-Replaces: proftpd-basic (<= 1.3.7a+dfsg-3~), proftpd-core (<= 1.3.7a+dfsg-3~)  
+Replaces: proftpd-basic (<= 1.3.7a+dfsg-3~), proftpd-core (<= 1.3.7a+dfsg-3~)
 Description: Versatile, virtual-hosting FTP daemon - TLS/SSL/SFTP modules
  ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
  Protocol daemon supports also hidden directories, virtual hosts, and
@@ -298,4 +298,3 @@ Description: Transitional dummy package for ProFTPD
  upload/download ratios are also supported.
  .
  This is a transitional package only. It can safely be removed.
-


=====================================
debian/proftpd-core.lintian-overrides
=====================================
@@ -1,2 +1,2 @@
-proftpd-core: binary-without-manpage
+proftpd-core: no-manual-page
 proftpd-core: embedded-library usr/sbin/proftpd: ltdl



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/8ab05a39e8bade17337f8cd45fd3676b3c024468...1b6f62617c4a1a42830f31b6498d90fe7813d9be

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/compare/8ab05a39e8bade17337f8cd45fd3676b3c024468...1b6f62617c4a1a42830f31b6498d90fe7813d9be
You're receiving this email because of your account on salsa.debian.org.