From 769486bfdf841be2143514182d1297b644664b34 Mon Sep 17 00:00:00 2001
From: Ivan Rako <ivan.rako@srce.hr>
Date: Sat, 14 Jul 2018 23:35:44 +0200
Subject: [PATCH] izmjene za stretch

---
 debian/changelog |    6 ++++++
 debian/control   |    8 ++++----
 debian/postinst  |   10 ++--------
 debian/prerm     |   12 ++----------
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eb68c03..b4afd05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+amavisd-cn (3:2.10.1~cn2) stable; urgency=low
+
+  * Prva verzija za stretch
+
+ -- Ivan Rako <Ivan.Rako@CARNet.hr>  Wed, 11 Jul 2018 16:02:42 +0200
+
 amavisd-cn (3:2.10.1~cn1) stable; urgency=low
 
   * Cisti staru skriptu za pokretanje /etc/init.d/amavisd-cn i softlink
diff --git a/debian/control b/debian/control
index 81a78c0..78e3231 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: amavisd-cn
 Section: mail
 Priority: optional
 Maintainer: Ivan Rako <Ivan.Rako@CARNet.hr>
-Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.8
 
 Package: amavisd-cn
 Architecture: all
 Provides: amavisd-new-cn
-Depends: ${misc:Depends}, postfix, clamav-cn (>= 4:0.99), spamassassin-cn (>= 2:3.2.5-6), debianutils (>= 3.4), carnet-tools-cn (>= 2.8.1), procps, arj | unarj, rar | unrar | unrar-free, zoo, nomarch, cpio, lzop, cabextract, zip, unzip, bzip2
-Pre-Depends: amavisd-new (>= 1:2.10.1)
+Depends: ${misc:Depends}, postfix, clamav-cn (>= 4:0.99.4~cn0), spamassassin-cn (>= 2:3.4.1~cn0), debianutils (>= 3.4), carnet-tools-cn (>= 3.2.1), procps, arj | unarj, rar | unrar | unrar-free, zoo, nomarch, cpio, lzop, cabextract, zip, unzip, bzip2
+Pre-Depends: amavisd-new (>= 1:2.10.1-4)
 Recommends: postfix-cn
 Conflicts: libsavi-perl (<< 0.15), bunch-perl-modules-cn
 Description: Easy setup for a postfix/amavisd-new/clamav/spamassassin configuration
diff --git a/debian/postinst b/debian/postinst
index 01c8da1..ddf4581 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -114,14 +114,8 @@ if [ -n "$chown_ahome" ]; then
 fi
 
 restart_daemon="1"
-if [ "$restart_daemon" -a -x /etc/init.d/amavis ]; then
-  if [ -x "/etc/init.d/amavis" ]; then
-    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-      invoke-rc.d amavis restart
-    else
-      /etc/init.d/amavis restart
-    fi
-  fi
+if [ "$restart_daemon" ]; then
+  service amavis restart
 fi
 # always check that the daemons are running
 
diff --git a/debian/prerm b/debian/prerm
index 4b4be03..f756ca3 100755
--- a/debian/prerm
+++ b/debian/prerm
@@ -36,18 +36,10 @@ if [ "$1" = remove ]; then
     cp-update -r $PKG $master_cf >&-
     del_postconf content_filter
     echo "Removed postfix configuration for ${PKG}."
-    if [ -x /etc/init.d/postfix ]; then
-      if [ -x /usr/sbin/invoke-rc.d ]; then
-        invoke-rc.d postfix restart
-      else
-        /etc/init.d/postfix restart
-      fi
-    fi
+    service postfix restart
   fi
   cp-update -r $PKG $ALIASES >&-
-  if [ -x /usr/bin/newaliases ]; then
-    newaliases
-  fi
+  newaliases
 fi
 
 exit 0
-- 
1.7.10.4