[Minor] debian: Fix lintian issues and refresh packaging

* duplicate-long-description
* vcs-field-uses-insecure-uri
* unversioned-copyright-format-uri
* wildcard-matches-nothing-in-dep5-copyright
* unused-file-paragraph-in-dep5-copyright
* debian-changelog-has-wrong-day-of-week
* spelling-error-in-binary
* duplicate-updaterc.d-calls-in-postinst
* duplicate-updaterc.d-calls-in-postrm
* binary-without-manpage
* systemd-service-file-missing-documentation-key

debian/changelog

@@ -2,7 +2,7 @@ rmilter (1.6.7) unstable; urgency=low
 
   * New release.
 
- -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Tue, 18 Nov 2015 22:11:32 +0000
+ -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Wed, 18 Nov 2015 22:11:32 +0000
 
 rmilter (1.6.5) unstable; urgency=low
 

debian/control

@@ -2,15 +2,25 @@ Source: rmilter
 Section: mail
 Priority: extra
 Maintainer: Mikhail Gusarov <dottedmag@debian.org>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), cmake, libpcre3-dev, libssl-dev (>= 1.0), libopendkim-dev, libmilter-dev, bison, flex, dh-systemd, libglib2.0-dev
+Build-Depends: bison,
+               cmake,
+               debhelper (>= 9),
+               dh-systemd,
+               dpkg-dev (>= 1.16.1~),
+               flex,
+               libglib2.0-dev,
+               libmilter-dev,
+               libopendkim-dev,
+               libpcre3-dev,
+               libssl-dev (>= 1.0)
 Standards-Version: 3.9.6
 Homepage: https://github.com/vstakhov/rmilter
-Vcs-Git: git://github.com/vstakhov/rmilter.git
+Vcs-Git: https://github.com/vstakhov/rmilter.git
 Vcs-Browser: https://github.com/vstakhov/rmilter
 
 Package: rmilter
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libmilter1.0.1
+Depends: adduser, libmilter1.0.1, lsb-base, ${misc:Depends}, ${shlibs:Depends}
 Recommends: sendmail | postfix
 Description: Another sendmail milter for different mail checks
  rmilter is a standalone application that provides the following features:
@@ -29,7 +39,7 @@ Description: Another sendmail milter for different mail checks
 Package: rmilter-dbg
 Architecture: any
 Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends}, rmilter (= ${binary:Version})
+Depends: rmilter (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: Debuginfo for another sendmail milter for different mail checks
  rmilter is a standalone application that provides the following features:
   SPF checks;
@@ -43,3 +53,5 @@ Description: Debuginfo for another sendmail milter for different mail checks
  .
  Rmilter uses sendmail milter interface and is compatible with Sendmail
  and Postfix MTA  as well as with other MTA that supports milter interface.
+ .
+ This package contains the debugging information for rmilter package.

debian/copyright

@@ -1,5 +1,6 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rmilter
+Upstream-Contact: Vsevolod Stakhov <vsevolod@highsecure.ru>
 Source: https://bitbucket.org/vstakhov/rmilter
 
 Files: *
@@ -14,10 +15,6 @@ Files: compat/blake2*
 Copyright: 2012 Samuel Neves <sneves@dei.uc.pt>
 License: CC0
 
-Files: compat/queue.h
-Copyright: 1991, 1993 The Regents of the University of California
-License: BSD-3-clause
-
 Files: debian/*
 Copyright: 2014-2015 Mikhail Gusarov <dottedmag@debian.org>
 License: BSD-2-clause
@@ -65,34 +62,6 @@ License: BSD-2-clause
  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- .
- 3. Neither the name of the University nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
 License: CC0
  To the extent possible under law, the author(s) have dedicated all copyright
  and related and neighboring rights to this software to the public domain

debian/postinst

@@ -23,15 +23,6 @@ case "$1" in
     ;;
 esac
 
-if [ -x /etc/init.d/rmilter ]; then
-    update-rc.d rmilter defaults >/dev/null
-    if [ -d /run/systemd/system ]; then
-        systemctl --system daemon-reload >/dev/null || true
-    else
-        invoke-rc.d rmilter start || exit $?
-    fi
-fi
-
 #DEBHELPER#
 
 exit 0

debian/postrm

@@ -1,10 +1,6 @@
 #!/bin/sh
 set -e
 
-if [ "$1" = "purge" ]; then
-   update-rc.d rmilter remove >/dev/null
-fi
-
 if [ -d /run/systemd/system ]; then
     systemctl --system daemon-reload >/dev/null || true
 fi

debian/rmilter.manpages

@@ -0,0 +1 @@
+doc/rmilter.8

debian/rmilter.service

@@ -1,10 +1,12 @@
 [Unit]
 Description=Another sendmail milter for different mail checks
+Documentation=https://rspamd.com/rmilter/
 
 [Service]
-ExecStart=/usr/sbin/rmilter -c /etc/rmilter.conf -n
-ExecReload=/bin/kill -USR1 $MAINPID
 User=_rmilter
+ExecStart=/usr/sbin/rmilter -n -c /etc/rmilter/rmilter.conf
+ExecReload=/bin/kill -USR1 $MAINPID
+Restart=always
 RuntimeDirectory=rmilter
 RuntimeDirectoryMode=0755
 

rmilter.service

@@ -1,5 +1,6 @@
 [Unit]
 Description=Another sendmail milter for different mail checks
+Documentation=https://rspamd.com/rmilter/
 
 [Service]
 User=_rmilter