- Updated fro new Debian upload

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

diff --git a/debian/README.source b/debian/README.source
new file mode 100644 (file)
index 0000000..48b599a
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,2 @@
+/usr/share/doc/dpatch/README.source.gz
+

diff --git a/debian/changelog b/debian/changelog
index cf3c90672ad39643f563eafee8c29e39701be72d..5282040d5f8fdb1745704a5d107e4ea9f7b9a21f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ 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
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Sun, 08 Nov 2009 23:08:37 +0100
 
 gosa (2.5.19-1) unstable; urgency=low
 
@@ -20,10 +20,9 @@ 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/gosa-desktop.desktop b/debian/gosa-desktop.desktop
index b5293cc05e99e875a06afcb8a20762ca33d7d90d..20da76200744d63aaa77f2941276672ec8e03782 100644 (file)
--- a/debian/gosa-desktop.desktop
+++ b/debian/gosa-desktop.desktop
@@ -1,6 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-MimeType=text/plain
+MimeType=text/plain;
 GenericName=GOsa²
 Exec=/usr/bin/gosa
 Icon=gosa
@@ -9,4 +8,4 @@ Type=Application
 Terminal=false
 Name=GOsa
 X-KDE-StartupNotify=true
-Categories=Qt;KDE;Utility;System
+Categories=Qt;KDE;Utility;System;

diff --git a/debian/gosa.postinst b/debian/gosa.postinst
index cbeaca0fd36fc8ef927df053eaceed62e22755e1..698789202ff9118981919fde8d70764bcfa7ca42 100644 (file)
--- a/debian/gosa.postinst
+++ b/debian/gosa.postinst
@@ -1,7 +1,7 @@
 #! /bin/sh
 # GOsa postinst script
 
-set -e
+set -e 
 
 #DEBHELPER#
 

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

diff --git a/debian/patches/00list b/debian/patches/00list
index 92ee79b5976a40fb6a648d042ef59bff371ac63c..c060744b39350286448747a856f696d70c111a8c 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,2 @@
-# This file has been left intentionally blank
-
+01_update-config-bashisms
+02_net-resolver.sh-bashisms

diff --git a/debian/patches/01_update-config-bashisms.dpatch b/debian/patches/01_update-config-bashisms.dpatch
new file mode 100644 (file)
index 0000000..c71a75a
--- /dev/null
+++ b/debian/patches/01_update-config-bashisms.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_update-config bashisms.dpatch by  <benoit.mortier@opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix update-config bashims
+
+@DPATCH@
+
+--- gosa-2.5.19/update-config  2008-01-08 20:01:49.000000000 +0100
++++ gosa-2.5.19/update-config  2009-10-22 21:32:43.000000000 +0200
+@@ -8,8 +8,8 @@
+ created.
+ 
+ EOF
+-read -n1 -sp "Do you want to continue? (y/n)" answer
+-echo
++printf "Do you want to continue? (y/n) " "$answer"
++read answer
+ 
+ if [ "$answer" != "y" -a "$answer" != "Y" ]; then
+       echo "Aborted."

diff --git a/debian/patches/02_net-resolver.sh-bashisms.dpatch b/debian/patches/02_net-resolver.sh-bashisms.dpatch
new file mode 100644 (file)
index 0000000..afc4159
--- /dev/null
+++ b/debian/patches/02_net-resolver.sh-bashisms.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_net-resolver.sh bashisms.dpatch by  <benoit.mortier@opensides.be>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix net-resolver.sh bashims
+
+@DPATCH@
+
+--- gosa_2.5.19/contrib/scripts/net-resolver.sh        2006-11-06 10:08:18.000000000 +0100
++++ gosa_2.5.19/contrib/scripts/net-resolver.sh        2009-10-22 21:48:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ 
+ mac=""
+ ip=$(LANG=C $host $1 | grep address | head -n1 | sed 's/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/g')
+-if $fping -c1 -r3 -t500 $ip &> /dev/null; then
++if $fping -c1 -r3 -t500 $ip >/dev/null 2>&1; then
+       mac=$($arp -n | awk "/^$ip/ {print \$3}")
+ fi
+ echo "$ip;$mac"