Resync with branches/2.5

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5974 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/debian/changelog b/debian/changelog
index a15a74b647dd2ca485429161e643e3b6accaa15b..a70276620e9985d7b76de6d9ddc85e2382626ada 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,59 @@
+gosa (2.5.9-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Cajus Pollmeier <cajus@debian.org>  Mon,  5 Mar 2007 09:21:05 +0100
+
+gosa (2.5.8-1) unstable; urgency=high
+
+  * New upstream release fixes security problem
+
+ -- Cajus Pollmeier <cajus@debian.org>  Mon, 15 Jan 2007 11:49:16 +0100
+
+gosa (2.5.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Cajus Pollmeier <cajus@debian.org>  Wed, 20 Dec 2006 09:10:16 +0100
+
+gosa (2.5.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Cajus Pollmeier <cajus@debian.org>  Wed, 15 Nov 2006 09:43:09 +0100
+
+gosa (2.5.5-1) unstable; urgency=low
+
+  * New upstrame release
+  * Added binary-arch to debian/rules (Closes: #395605)
+
+ -- Cajus Pollmeier <cajus@debian.org>  Sun, 29 Oct 2006 08:02:11 +0100
+
+gosa (2.5.4-1) unstable; urgency=low
+
+  * New stable upstream release (Closes: #284718)
+
+ -- Cajus Pollmeier <cajus@debian.org>  Mon, 11 Sep 2006 10:06:47 +0200
+
+gosa (2.5.3-1) unstable; urgency=low
+
+  * New upstream release with bugfixes
+
+ -- Cajus Pollmeier <cajus@debian.org>  Tue, 11 Jul 2006 16:07:47 +0200
+
+gosa (2.5.2-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Cajus Pollmeier <cajus@debian.org>  Mon, 26 Jun 2006 12:28:04 +0200
+
+gosa (2.5.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixes problems with NFS terminal handling
+
+ -- Cajus Pollmeier <cajus@debian.org>  Wed,  7 Jun 2006 18:16:27 +0200
+
 gosa (2.5-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/control b/debian/control
index d27ec4c022b58d494c8e3a880eb2d528c0b43d4b..4b38c16806f0f5df05c552973ca68e7fa3d8b8e1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,13 @@ Source: gosa
 Section: web
 Priority: optional
 Maintainer: Cajus Pollmeier <cajus@debian.org>
-Build-Depends-Indep: debhelper(>= 4.1.16)
+Build-Depends-Indep: debhelper(>= 4.1.16), dpatch
 Standards-Version: 3.7.2.0
 
 Package: gosa
 Architecture: all
-Depends: php4 (>= 4:4.3.10-16) | php5, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php4-gd | php5-gd, php4-imap | php5-imap, php4-ldap | php5-ldap, php4-mhash | php5-mhash, php4-mysql | php5-mysql, php4-imagick | php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php4-recode | php5-recode, wwwconfig-common
-Conflicts: smarty-gettext
-Suggests: cupsys-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, php4-kadm5, php4-cups, etherwake, slapd, gosa-schema
+Depends: php4 (>= 4:4.3.10-16) | php5, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php4-gd | php5-gd, php4-imap | php5-imap, php4-ldap | php5-ldap, php4-mhash | php5-mhash, php4-mysql | php5-mysql, php4-imagick | php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php4-recode | php5-recode, wwwconfig-common, smarty-gettext
+Suggests: cyrus21-imapd (>= 2.1.11), postfix-ldap, php4-kadm5, etherwake, slapd, gosa-schema
 Description: Web Based LDAP Administration Program
  Provided is access to posix, shadow, samba, proxy, fax, pureftp and
  kerberos accounts. It is able to manage the postfix/cyrus server

diff --git a/debian/rules b/debian/rules
index a2b07abe4d382e91d26b0b07369379e4f12f10e9..71d6555bff68018c2673f12b868361551e186098 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,16 +7,21 @@ export DH_COMPAT=4
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-build: 
+build: patch 
        #**** Off we go... ****
 
-clean:
+clean: clean-patched unpatch
+clean-patched: clean-patched
        dh_testdir
        rm -f install-stamp 
        -rm -f debian/files
        -rm -f debian/substvars
        dh_clean
 
+unpatch:
+       dpatch deapply-all
+       rm -rf patch-stamp debian/patched
+
 install: install-stamp
 install-stamp: 
        dh_testdir
@@ -80,8 +85,6 @@ install-stamp:
        -rm -rf debian/gosa/usr/share/gosa/gen_function_list.php
        -rm -rf debian/gosa/usr/share/gosa/update.sh
        -rm -rf debian/gosa/usr/share/doc/gosa/guide*
-       -mkdir -p debian/gosa/usr/share/php/smarty/libs/plugins
-       -cp include/smarty/plugins/block.t.php debian/gosa/usr/share/php/smarty/libs/plugins
        -rm -rf debian/gosa/usr/share/gosa/include/smarty
        -sed 's%"CONFIG_TEMPLATE_DIR", "../contrib/"%"CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/"%g' debian/gosa/usr/share/gosa/include/functions.inc > debian/gosa/usr/share/gosa/include/functions.inc.new
        -mv debian/gosa/usr/share/gosa/include/functions.inc.new debian/gosa/usr/share/gosa/include/functions.inc
@@ -89,6 +92,11 @@ install-stamp:
        -mv debian/gosa/usr/share/gosa/include/php_setup.inc.new debian/gosa/usr/share/gosa/include/php_setup.inc
        touch install-stamp
 
+patch: patch-stamp
+patch-stamp:
+       dpatch apply-all
+       dpatch cat-all >patch-stamp
+
 binary-indep: install
        dh_testdir
        dh_testroot