[Minor] debian: Update BD and refresh packaging

6 files changed, 23 insertions, 61 deletions

diff --git a/ChangeLog b/ChangeLog
index b311e75dc..4bb4059c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -271,7 +271,7 @@
 	* [Feature] Apply DCT using AAN for fuzzy signature
 	* [Feature] Avira SAVAPI support
 	* [Feature] Cache and simplify DCT and jpeg decode
-	* [Feature] Cache libicu convertors
+	* [Feature] Cache libicu converters
 	* [Feature] Detect URLs with suspicious omographs
 	* [Feature] Do not increase score for duplicate options
 	* [Feature] Do not trust CTE, check base64 and qp strictly
diff --git a/debian/control b/debian/control
index d13bb8aa0..e660e2c6e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,24 @@ Source: rspamd
 Section: mail
 Priority: extra
 Maintainer: Mikhail Gusarov <dottedmag@debian.org>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), cmake, libevent-dev (>= 1.3), libglib2.0-dev (>= 2.16.0), libluajit-5.1-dev [amd64 armel armhf i386 kfreebsd-i386 mips mipsel powerpc powerpcspe] | liblua5.1-dev, libpcre3-dev, libssl-dev (>= 1.0), libcurl4-openssl-dev, libsqlite3-dev, libmagic-dev, perl, dh-systemd, libjemalloc-dev, ragel
+Build-Depends: cmake,
+               debhelper (>= 9),
+               dh-systemd,
+               dpkg-dev (>= 1.16.1~),
+               libcurl4-openssl-dev,
+               libevent-dev (>= 1.3),
+               libfann-dev,
+               libgd-dev,
+               libglib2.0-dev (>= 2.16.0),
+               libicu-dev,
+               libjemalloc-dev,
+               libluajit-5.1-dev [amd64 armel armhf i386 kfreebsd-i386 mips mipsel powerpc powerpcspe] | liblua5.1-dev,
+               libmagic-dev,
+               libpcre3-dev,
+               libsqlite3-dev,
+               libssl-dev (>= 1.0),
+               perl,
+               ragel
 Standards-Version: 3.9.6
 Homepage: https://rspamd.com
 Vcs-Git: git://github.com/vstakhov/rspamd.git
@@ -10,15 +27,15 @@ Vcs-Browser: https://github.com/vstakhov/rspamd
 
 Package: rspamd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, ca-certificates
+Depends: adduser, lsb-base, ca-certificates, ${misc:Depends}, ${shlibs:Depends}
 Description: Rapid spam filtering system
  Rspamd is a rapid, modular and lightweight spam filter. It is designed to work
  with big amount of mail and can be easily extended with own filters written in
- lua.
+ Lua.
 
 Package: rspamd-dbg
 Architecture: any
 Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends}, rspamd (= ${binary:Version})
+Depends: rspamd (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: debugging symbols for rspamd
  This package contains the debugging symbols for rspamd.
diff --git a/debian/copyright b/debian/copyright
index 06c5af766..851544057 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,10 +40,6 @@ Copyright: Ted Krovetz <ted@krovetz.net>
            D. J. Bernstein
 License: public-domain
 
-Files: contrib/blake2/*
-Copyright: Samuel Neves <sneves@dei.uc.pt>
-License: public-domain
-
 Files: contrib/lua-fun/*
 Copyright: 2013 Roman Tsisyk <roman@tsisyk.com>
 License: MIT
@@ -85,11 +81,6 @@ Copyright: 2011-2015, Vsevolod Stakhov <vsevolod@highsecure.ru>
            2013-2015, Andrew Lewis <nerf@judo.za.org>
 License: Apache-2.0
 
-Files: conf/lua/hfilter.lua
-Copyright: 2011-2015, Vsevolod Stakhov <vsevolod@highsecure.ru>
-           2013-2015, Alexey Savelyev <info@homeweb.ru>
-License: Apache-2.0
-
 Files: doc/doxydown/*
 Copyright: 2014, Vsevolod Stakhov <vsevolod@highsecure.ru>
 License: MIT
@@ -177,34 +168,6 @@ License: BSD-2-Clause
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-License: BSD-3-Clause-RotUoC
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- 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.
- .
- 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: BSD-3-Clause-Google
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
diff --git a/debian/postinst b/debian/postinst
index 374209ce7..3d4322117 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -29,16 +29,6 @@ case "$1" in
     ;;
 esac
 
-if [ -x /etc/init.d/rspamd ]; then
-    update-rc.d rspamd defaults >/dev/null
-    if [ -d /run/systemd/system ]; then
-        deb-systemd-invoke --system daemon-reload >/dev/null || true
-        deb-systemd-invoke --system stop rspamd.service 2>/dev/null || true
-    else
-        invoke-rc.d rspamd start || exit $?
-    fi
-fi
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/postrm b/debian/postrm
index 333f2b5af..10a84805e 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,15 +1,6 @@
 #!/bin/sh
 set -e
 
-if [ "$1" = "purge" ]; then
-   update-rc.d rspamd remove >/dev/null
-fi
-
-if [ -d /run/systemd/system ]; then
-    deb-systemd-invoke --system daemon-reload >/dev/null || true
-    deb-systemd-invoke --system stop rspamd.service 2>/dev/null || true
-fi
-
 #DEBHELPER#
 
 case "$1" in
diff --git a/rspamd.service b/rspamd.service
index b5dce69dc..4a823be05 100644
--- a/rspamd.service
+++ b/rspamd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=rapid spam filtering system
 After=nss-lookup.target
+Documentation=https://rspamd.com/doc/
 
 [Service]
 LimitNOFILE=1048576