Prilagodba paketa za Debian squeeze.

diff --git a/README.CARNet b/README.CARNet
index 5a3b025..429d5ae 100644 (file)
--- a/README.CARNet
+++ b/README.CARNet
@@ -1,5 +1,5 @@
 squirrelmail-change-pass-cn
----------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Ovaj paket sadrzi dodatne CARNetove postavke za SquirrelMail
 change_pass dodatak (plugin).
@@ -45,4 +45,4 @@ Izvorni odrzavatelj paketa: Zoran Dzelajlija <jelly+paketi@srce.hr>.
 Trenutno odrzava: Dragan Dosen <ddosen@ffzg.hr>.
 
 
- -- Dragan Dosen <ddosen@ffzg.hr>  Fri, 26 Mar 2010 19:50:12 +0100
+ -- Dragan Dosen <ddosen@ffzg.hr>  Fri, 22 Apr 2011 18:01:42 +0200

diff --git a/changelog.CARNet b/changelog.CARNet
deleted file mode 120000 (symlink)
index 194579e..0000000
--- a/changelog.CARNet
+++ /dev/null
@@ -1 +0,0 @@
-changelog.Debian
\ No newline at end of file

diff --git a/debian/changelog b/debian/changelog
index 68d68c9..00fa620 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+squirrelmail-change-pass-cn (3.1.0) stable; urgency=low
+
+  * Prilagodba paketa za Debian squeeze.
+  * Nova debian/rules datoteka.
+  * Azurirane ovisnosti unutar debian/control.
+  * Razni Lintian popravci.
+
+ -- Dragan Dosen <ddosen@ffzg.hr>  Fri, 22 Apr 2011 18:01:42 +0200
+
 squirrelmail-change-pass-cn (3.0.2) stable; urgency=low
 
   * Dio paketa koji sadrzi sam change_pass dodatak odvojen je

diff --git a/debian/compat b/debian/compat
index 1e8b314..7f8f011 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7

diff --git a/debian/control b/debian/control
index f1d3d5a..f55b72e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: squirrelmail-change-pass-cn
 Section: web
 Priority: optional
 Maintainer: Dragan Dosen <ddosen@ffzg.hr>
-Build-Depends: debhelper (>= 6)
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.9.1
 
 Package: squirrelmail-change-pass-cn
 Architecture: all
-Depends: squirrelmail-cn (>= 2:1.4.15-2lenny1), squirrelmail-change-pass (>= 3.0-1), xinetd-cn (>= 1:2.3.14-3lenny1), poppassd (>= 1.8.5-3.2), carnet-tools-cn (>= 2.8.1)
+Depends: squirrelmail-cn (>= 2:1.4.21+1), squirrelmail-change-pass (>= 3.1-1), xinetd-cn (>= 1:2.3.14+1), poppassd (>= 1.8.5-4), carnet-tools-cn (>= 3.0.0), ${misc:Depends}
 Description: SquirrelMail plugin: Change Password
  Change passwords using a poppass daemon.
  .

diff --git a/debian/copyright b/debian/copyright
index f8ecf9e..81d8006 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 squirrelmail-change-pass-cn
 
 Copyright: © 2004 Zoran Dzelajlija <jelly+paketi@srce.hr>
-Copyright: © 2007-2010 Dragan Dosen <ddosen@ffzg.hr>
+Copyright: © 2007-2011 Dragan Dosen <ddosen@ffzg.hr>
 
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify it under

diff --git a/debian/docs b/debian/docs
index d92e2d1..8f6e250 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1 @@
 README.CARNet
-changelog.CARNet

diff --git a/debian/postinst b/debian/postinst
index dc5c3bd..a885448 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -9,7 +9,7 @@ set -e
 . /usr/share/carnet-tools/functions.sh
 
 PKG="squirrelmail-change-pass-cn"
-VERSION="3.0.2"
+VERSION="3.1.0"
 SQCONFDIR="/etc/squirrelmail"
 SQCONF="$SQCONFDIR/config.php"
 need_restart=0
@@ -35,7 +35,7 @@ fi
 # Enable change_pass plugin in SquirrelMail config.php.
 #
 if ! egrep -q '^\$plugins\[[0-9]+\][\ ]*=[\ ]*'\''change_pass'\' "$SQCONF"; then
-    /usr/sbin/squirrelmail-configure --install-plugin change_pass
+    squirrelmail-configure --install-plugin change_pass
 fi
 
 
@@ -43,7 +43,6 @@ fi
 # Service configuration is saved in /etc/xinetd.d/ directory.
 #
 if [ -x /etc/init.d/xinetd -a -d /etc/xinetd.d -a -x /usr/sbin/itox ]; then
-
     if egrep -q '^poppassd' /etc/inetd.conf && \
         [ ! -f /etc/xinetd.d/poppassd ]; then
 
@@ -62,7 +61,6 @@ fi
 # Restart xinetd if needed.
 #
 if [ $need_restart -eq 1 ]; then
-
     if [ -x "/etc/init.d/xinetd" ]; then
         if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
             invoke-rc.d xinetd restart || exit $?

diff --git a/debian/prerm b/debian/prerm
index 70b8c88..dfeafa4 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -5,71 +5,68 @@ set -e
 case "$1" in
   remove|deconfigure)
 
-       # Include CARNet functions
-       . /usr/share/carnet-tools/functions.sh
-       
-       PKG="squirrelmail-change-pass-cn"
-       SQCONFDIR="/etc/squirrelmail"
-       SQCONF="$SQCONFDIR/config.php"
-       need_restart=0
-       
-       # Remove CARNet configuration from /etc/hosts.allow and
-       # /etc/hosts.deny.
-       #
-       if [ -f /etc/hosts.allow ]; then
-               cp-update -r "$PKG" /etc/hosts.allow
-       fi
-       if [ -f /etc/hosts.deny ]; then
-               cp-update -r "$PKG" /etc/hosts.deny
-       fi
+    # Include CARNet functions
+    . /usr/share/carnet-tools/functions.sh
 
-       # Remove SquirrelMail change_pass plugin from SquirrelMail
-       # configuration.
-       #
-       if egrep -q '^\$plugins\[[0-9]+\][\ ]*=[\ ]*'\''change_pass'\' "$SQCONF"; then
-               /usr/sbin/squirrelmail-configure --remove-plugin change_pass
-       fi
+    PKG="squirrelmail-change-pass-cn"
+    SQCONFDIR="/etc/squirrelmail"
+    SQCONF="$SQCONFDIR/config.php"
+    need_restart=0
 
-       # Remove poppassd service from xinetd.
-       #
-       if [ -f /etc/xinetd.d/poppassd ]; then
-       
-               if egrep -q "^# Begin update by CARNet package " /etc/xinetd.d/poppassd; then
-               
-                       cp_echo "CN: Removing poppassd service from xinetd configuration"
-                       rm -f /etc/xinetd.d/poppassd
-                       need_restart=1
-               fi
-       fi
+    # Remove CARNet configuration from /etc/hosts.allow and
+    # /etc/hosts.deny.
+    #
+    if [ -f /etc/hosts.allow ]; then
+        cp-update -r "$PKG" /etc/hosts.allow
+    fi
+    if [ -f /etc/hosts.deny ]; then
+        cp-update -r "$PKG" /etc/hosts.deny
+    fi
 
-       # Restart xinetd if needed.
-       #
-       if [ $need_restart -eq 1 ]; then
+    # Remove SquirrelMail change_pass plugin from SquirrelMail
+    # configuration.
+    #
+    if egrep -q '^\$plugins\[[0-9]+\][\ ]*=[\ ]*'\''change_pass'\' "$SQCONF"; then
+        squirrelmail-configure --remove-plugin change_pass
+    fi
 
-            if [ -x "/etc/init.d/xinetd" ]; then
-                if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-                        invoke-rc.d xinetd restart || exit $?
-                else
-                        /etc/init.d/xinetd restart || exit $?
-                fi
+    # Remove poppassd service from xinetd.
+    #
+    if [ -f /etc/xinetd.d/poppassd ]; then
+        if egrep -q "^# Begin update by CARNet package " /etc/xinetd.d/poppassd; then
+            cp_echo "CN: Removing poppassd service from xinetd configuration"
+            rm -f /etc/xinetd.d/poppassd
+            need_restart=1
+        fi
+    fi
+
+    # Restart xinetd if needed.
+    #
+    if [ $need_restart -eq 1 ]; then
+        if [ -x "/etc/init.d/xinetd" ]; then
+            if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+                    invoke-rc.d xinetd restart || exit $?
+            else
+                    /etc/init.d/xinetd restart || exit $?
             fi
-       fi
-       
-       # Mail root.
-       #
-       cp_mail "$PKG"
+        fi
+    fi
+
+    # Mail root.
+    #
+    cp_mail "$PKG"
 
-       break
-       ;;
+    break
+    ;;
   upgrade)
-       :
-       ;;
+    :
+    ;;
   failed-upgrade)
-       ;;
+    ;;
   *)
-       echo "prerm called with unknown argument \$1'" >&2
-       exit 0
-       ;;
+    echo "prerm called with unknown argument \$1'" >&2
+    exit 0
+    ;;
 esac
 
 #DEBHELPER#

diff --git a/debian/rules b/debian/rules
index f27dc58..cbe925d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,37 +1,3 @@
 #!/usr/bin/make -f
-
-PACKAGE = $(shell dh_listpackages)
-TMP     = $(CURDIR)/debian/$(PACKAGE)
-
-build:
-
-clean:
-       dh_testdir
-       dh_testroot
-       dh_clean
-       rm -f install-stamp
-
-install: build install-stamp
-install-stamp:
-       dh_testdir
-       dh_testroot
-       dh_clean
-       touch install-stamp
-
-binary-arch: build install
-
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs
-       dh_installchangelogs
-       dh_link
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
+%:
+       dh $@