Dodatna prilagodba paketa, Lintian fixevi.

diff --git a/debian/README.Debian b/debian/README.Debian
index cdb3796..d1816d4 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,4 +5,4 @@ Make sure to have configured plugin in the configuration file
 enabled in SquirrelMail by default.  See the plugin's README
 file for details.
 
 enabled in SquirrelMail by default.  See the plugin's README
 file for details.
 

- -- Dragan Dosen <ddosen@ffzg.hr>  Fri, 22 Apr 2011 16:52:47 +0200
+ -- Dragan Dosen <Dragan.Dosen@CARNet.hr>  Sat, 30 Apr 2011 12:55:16 +0200

diff --git a/debian/README.source b/debian/README.source
new file mode 100644 (file)
index 0000000..0627673
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+change_pass for Debian
+----------------------
+
+ -- Dragan Dosen <Dragan.Dosen@CARNet.hr>  Sat, 30 Apr 2011 12:55:16 +0200

diff --git a/debian/changelog b/debian/changelog
index 20ecf23..a22f858 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+squirrelmail-change-pass (3.1-2) stable; urgency=low
+
+  * Changed maintainer's e-mail address.
+  * Added debian/README.source, debian/install and debian/watch.
+  * Changed Build-Depends in debian/control, modified debian/rules.
+  * Fixed lintian warnings.
+
+ -- Dragan Dosen <Dragan.Dosen@CARNet.hr>  Sat, 30 Apr 2011 18:50:10 +0200
+

 squirrelmail-change-pass (3.1-1) stable; urgency=low
 
   * New Upstream Version.
 squirrelmail-change-pass (3.1-1) stable; urgency=low
 
   * New Upstream Version.

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 277779a..3b03850 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
 Source: squirrelmail-change-pass
 Section: web
 Priority: optional
 Source: squirrelmail-change-pass
 Section: web
 Priority: optional

-Maintainer: Dragan Dosen <ddosen@ffzg.hr>
-Build-Depends: debhelper (>= 6), quilt (>= 0.40)
-Standards-Version: 3.8.0
+Maintainer: Dragan Dosen <Dragan.Dosen@CARNet.hr>
+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~)
+Standards-Version: 3.9.1

 
 Package: squirrelmail-change-pass
 Architecture: all
 Replaces: squirrelmail-change-pass-cn
 
 Package: squirrelmail-change-pass
 Architecture: all
 Replaces: squirrelmail-change-pass-cn

-Depends: squirrelmail (>= 2:1.4), squirrelmail-compatibility (>= 2.0.16-1)
+Depends: squirrelmail (>= 2:1.4), squirrelmail-compatibility (>= 2.0.16-1), ${misc:Depends}

 Conflicts: squirrelmail (>= 2:1.5)
 Homepage: http://www.squirrelmail.org/plugin_view.php?id=21
 Description: SquirrelMail plugin: Change Password
 Conflicts: squirrelmail (>= 2:1.5)
 Homepage: http://www.squirrelmail.org/plugin_view.php?id=21
 Description: SquirrelMail plugin: Change Password

diff --git a/debian/copyright b/debian/copyright
index 3a4807a..1d62ca2 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,7 +17,7 @@ License: GPL-2+
  version.
 
 Files: debian/*
  version.
 
 Files: debian/*

-Copyright: © 2010-2011 Dragan Dosen <ddosen@ffzg.hr>
+Copyright: © 2010-2011 Dragan Dosen <Dragan.Dosen@CARNet.hr>

 License: GPL-2+
  This package is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software

diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..4e8ca71
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+*.php version usr/share/squirrelmail/plugins/change_pass

diff --git a/debian/postrm b/debian/postrm
index a48df6e..3118001 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,14 +1,16 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e

 
 

-# Source debconf library.

 case "$1" in
 case "$1" in

-       remove)
-               if [ -x /usr/sbin/squirrelmail-configure ]; then
-                       /usr/sbin/squirrelmail-configure --remove-plugin change_pass
-               fi
-       ;;
-       *)
-       ;;
+    remove)
+        if [ `which squirrelmail-configure` ]
+        then
+            squirrelmail-configure --remove-plugin change_pass
+        fi
+    ;;
+    *)
+    ;;

 esac
 
 #DEBHELPER#
 esac
 
 #DEBHELPER#

diff --git a/debian/rules b/debian/rules
index c0c6322..8167c7b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,51 +1,11 @@
 #!/usr/bin/make -f
 
 #!/usr/bin/make -f
 

-include /usr/share/quilt/quilt.make
-

 PACKAGE = $(shell dh_listpackages)
 TMP     = $(CURDIR)/debian/$(PACKAGE)
 
 PACKAGE = $(shell dh_listpackages)
 TMP     = $(CURDIR)/debian/$(PACKAGE)
 

-build:
-
-clean: unpatch
-       dh_testdir
-       dh_testroot
-       dh_clean
-       rm -f install-stamp
+%:
+       dh $@ --with quilt

 
 

-install: patch build install-stamp
-install-stamp:
-       dh_testdir
-       dh_testroot
-       dh_clean
-       dh_installdirs
-       find . -type f -not \( \
-               -path '*/debian/*' -or \
-               -path '*/doc/*' -or \
-               -path '*/.git/*' -or \
-               -path '*/.pc/*' -or \
-               -name 'README' -or \
-               -name 'config_example.php' \
-               -name 'change_pass.pot' \
-               \) -exec install -D --mode=644 {} $(TMP)/usr/share/squirrelmail/plugins/change_pass/{} \;
+override_dh_install:
+       dh_install -Xconfig_example.php

        install -D --mode=644 config_example.php $(TMP)/etc/squirrelmail/config_change_pass.php
        install -D --mode=644 config_example.php $(TMP)/etc/squirrelmail/config_change_pass.php

-       touch install-stamp
-
-binary-arch: build install
-
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs
-       dh_installchangelogs
-       dh_installexamples
-       dh_link
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_installdebconf
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..7076fb5
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://squirrelmail.org/plugin_list.php http://squirrelmail.org/plugins/change_pass-([\da-zA-Z\.]+).* debian