- Preparing release for new upload of 2.5.19

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

diff --git a/debian/changelog b/debian/changelog
index 7840c5679e59d7eb181de5348dd8401fdb61f27b..cf3c90672ad39643f563eafee8c29e39701be72d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gosa (2.5.19-2) unstable; urgency=low
+
+  * bashism in /bin/sh script (Closes: #535872)
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Thu, 22 Oct 2009 21:52:45 +0200
+
 gosa (2.5.19-1) unstable; urgency=low
 
   * New upstream release
@@ -14,9 +20,10 @@ gosa (2.5.19-1) unstable; urgency=low
   * Applied patch to allow selecting the primary Group when copying users
   * Added a section how to report a bug
   * Added Benoit Mortier as uploader
+  * bashism in /bin/sh script (Closes: #535872)
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Thu, 22 Oct 2009 21:52:24 +0200
 
- -- Benoit Mortier <benoit.mortier@opensides.be>  Fri, 29 May 2009 18:23:00 +0100
- 
 gosa (2.5.18-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/control b/debian/control
index ee1c043ce7ea7b991fea77e541458b16ef2ccdc1..f029881ce8f3cc4e3ab019ccfa96fcb6505ee83a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,15 @@ Section: web
 Priority: optional
 Maintainer: GOsa packages mainteners group <gosa-pkg@oss.gonicus.de>
 Uploaders: Cajus Pollmeier <cajus@debian.org>, Benoit Mortier <benoit.mortier@opensides.be>
-Build-Depends: debhelper(>= 4.2.32), dpatch
-Standards-Version: 3.8.2
+Build-Depends: debhelper(>= 5.0.0), dpatch
+Standards-Version: 3.8.3
+Homepage: https://oss.gonicus.de/labs/gosa/
+Vcs-Browser: https://oss.gonicus.de/repositories/gosa/branches/2.5/
+Vcs-Svn: https://oss.gonicus.de/repositories/gosa/branches/2.5/
 
 Package: gosa
 Architecture: all
-Depends: php5, php5-cli, apache2, exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mhash, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php5-recode, wwwconfig-common, smarty-gettext
+Depends: ${misc:Depends}, php5, php5-cli, apache2, exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mhash, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php5-recode, wwwconfig-common, smarty-gettext
 Conflicts: gosa-help-en
 Suggests: cyrus22-imapd, postfix-ldap, etherwake, slapd, gosa-schema
 Description: Web Based LDAP Administration Program
@@ -21,7 +24,7 @@ Description: Web Based LDAP Administration Program
 
 Package: gosa-desktop
 Architecture: all
-Depends: iceweasel | mozilla | firefox, debconf, po-debconf
+Depends: ${misc:Depends}, iceweasel | mozilla | firefox, debconf, po-debconf
 Suggests: x11-xserver-utils
 Description: Desktop integration for GOsa
  This package includes a menu definition for your desktop
@@ -32,7 +35,7 @@ Description: Desktop integration for GOsa
 
 Package: gosa-schema
 Architecture: all
-Depends: slapd
+Depends: ${misc:Depends}, slapd
 Description: LDAP schema for GOsa
  This package includes the LDAP schema needed by GOsa.
  .
@@ -41,7 +44,7 @@ Description: LDAP schema for GOsa
 
 Package: gosa-help-de
 Architecture: all
-Depends: gosa
+Depends: ${misc:Depends}, gosa
 Description: German online help for GOsa
  This package includes the German online documentation for GOsa
  .
@@ -50,7 +53,7 @@ Description: German online help for GOsa
 
 Package: gosa-help-fr
 Architecture: all
-Depends: gosa
+Depends: ${misc:Depends}, gosa
 Description: French online help for GOsa
  This package includes the French online documentation for GOsa
  .
@@ -59,7 +62,7 @@ Description: French online help for GOsa
 
 Package: gosa-help-nl
 Architecture: all
-Depends: gosa
+Depends: ${misc:Depends}, gosa
 Description: Dutch online help for GOsa
  This package includes the Dutch online documentation for GOsa
  .

diff --git a/debian/copyright b/debian/copyright
index 4ece8f7b1176d6a800be74f7cb3e8df8ebbf8a82..bf1d0e1306162c8d13a3ceeb1433edd050d6ce2e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,4 +13,4 @@ the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.                              
                   
 On Debian systems, the complete text of the GNU General Public
-License can be found in the file `/usr/share/common-licenses/GPL'.
+License can be found in the file `/usr/share/common-licenses/GPL-2'.

diff --git a/debian/gosa-desktop.config b/debian/gosa-desktop.config
index 85204c8971bd65b9d1741b59e3f2aafd98d99b12..9bc651ce843599eb9ecd95f2276a25004f465830 100644 (file)
--- a/debian/gosa-desktop.config
+++ b/debian/gosa-desktop.config
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 # Source debconf library.
 . /usr/share/debconf/confmodule

diff --git a/debian/gosa-desktop.postinst b/debian/gosa-desktop.postinst
index 6eb0f922f0b63b60d03a231d4fc1f1410881d33f..cd8b7792ed76a9f670df26d74ff01a5ae64d4c2a 100644 (file)
--- a/debian/gosa-desktop.postinst
+++ b/debian/gosa-desktop.postinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 #DEBHELPER#
 

diff --git a/debian/gosa-desktop.postrm b/debian/gosa-desktop.postrm
index b1329005f21367729b18aa02100d89cdd4d539c8..8c3d081cfe98a7607014e0959b4c7128da0841d5 100644 (file)
--- a/debian/gosa-desktop.postrm
+++ b/debian/gosa-desktop.postrm
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 #DEBHELPER#
 

diff --git a/debian/gosa.postinst b/debian/gosa.postinst
index 0c45ec06ae20b05e5ec123ad078ad49ab6c6b92c..cbeaca0fd36fc8ef927df053eaceed62e22755e1 100644 (file)
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@ -1,6 +1,8 @@
 #! /bin/sh
 # GOsa postinst script
 
+set -e
+
 #DEBHELPER#
 
 # We exit unless the package is being configured

diff --git a/debian/gosa.postrm b/debian/gosa.postrm
index 777e1217b30c84a1a786d20d10bb756c20fceec6..e67a8a88ab4f7698f1dfc280cfb0f50a4c866f07 100644 (file)
--- a/debian/gosa.postrm
+++ b/debian/gosa.postrm
@@ -2,6 +2,8 @@
 # postrm script for GOsa
 #
 
+set -e
+
 case "$1" in
     purge|remove)
        ## PURGE!!!

diff --git a/debian/rules b/debian/rules
index ab82fdd56dd7a0c4398f0b7ef5b1865521e6a6bc..2e6ddf4f0cb960e01162ac18f14a94b64b13273c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -118,7 +118,6 @@ binary-indep: install
        dh_installdebconf
        dh_installmenu
        dh_installman
-       dh_desktop
        dh_link
        dh_strip
        dh_compress --exclude=gosa.conf