From: Dinko Korunic <kreator@carnet.hr>
Date: Fri, 11 Apr 2008 19:18:07 +0000 (+0200)
Subject: - update maintainer dokumentacije
X-Git-Tag: v2.6.4-1~15
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=amavisd-cn.git;a=commitdiff_plain;h=f79a8b07f4b60324b7663f33ba10d057a7fa5e26

- update maintainer dokumentacije
- revert update_conf da koristi MASTTMPLVERSION
- chmod +x na src/*sh
- update version.sh da reflektira zadnju verziju paketa
Signed-off-by: Dinko Korunic <kreator@carnet.hr>
---

diff --git a/README.maintainer b/README.maintainer
index e3b40ad..59aa028 100644
--- a/README.maintainer
+++ b/README.maintainer
@@ -1,4 +1,6 @@
 Before commiting a build candidate, remember to update version.sh!
+
 VERSION must be same as the latest changelog entry, stripped of epoch.
-POSTTMPLVERSION,
-MASTTMPLVERSION should indicate when a particular template was last updated.
+
+POSTTMPLVERSION, MASTTMPLVERSION should indicate when a particular
+template was last updated (Postfix template or Amavis master template).
diff --git a/debian/postinst b/debian/postinst
index cdeb66c..9e3b82e 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -33,7 +33,7 @@ update_conf() {
   # placeholder.
   # remember to set changed_config=1 and restart_daemon=1 if necessary
   #:
-  if dpkg --compare-versions "$1" lt 3:2.4.2-3; then
+  if dpkg --compare-versions "$1" lt $MASTTMPLVERSION; then
     conf_from_template
   fi
 }
diff --git a/src/functions.sh b/src/functions.sh
old mode 100644
new mode 100755
diff --git a/src/postfix.sh b/src/postfix.sh
old mode 100644
new mode 100755
diff --git a/src/sendmail.sh b/src/sendmail.sh
old mode 100644
new mode 100755
diff --git a/src/variables.sh b/src/variables.sh
old mode 100644
new mode 100755
diff --git a/version.sh b/version.sh
index 6045577..e9d15fd 100644
--- a/version.sh
+++ b/version.sh
@@ -1,3 +1,3 @@
-VERSION=2.4.2-1
+VERSION=2.4.2-4
 POSTTMPLVERSION=3:2.4.2-1
 MASTTMPLVERSION=3:2.4.2-1