3 commits - ucs/debian ucs/kolab-ucs-unjoin-script.sh ucs/kolab-webclient-join-script.sh

[Christoph Wickert]

 ucs/debian/kolab-ucs.postinst      |    2 +-
 ucs/kolab-ucs-unjoin-script.sh     |    2 ++
 ucs/kolab-webclient-join-script.sh |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit f7d64b9340c0ed5ee201e4430dd31c672df03447
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Tue Apr 14 15:04:20 2015 +0200

    The Kolab Webclient is now the 'Web Application' (#4966)

diff --git a/ucs/kolab-webclient-join-script.sh b/ucs/kolab-webclient-join-script.sh
index c06430d..5383503 100755
--- a/ucs/kolab-webclient-join-script.sh
+++ b/ucs/kolab-webclient-join-script.sh
@@ -140,8 +140,8 @@ fi
 ucr set \
     ucs/web/overview/entries/service/kolab-webclient/icon?"/webmail/skins/enterprise/images/kolab-ucs-logo.svg" \
     ucs/web/overview/entries/service/kolab-webclient/link?"/webmail" \
-    ucs/web/overview/entries/service/kolab-webclient/label?"Kolab Enterprise Webclient" \
-    ucs/web/overview/entries/service/kolab-webclient/label/de?"Kolab Enterprise Webklient" \
+    ucs/web/overview/entries/service/kolab-webclient/label?"Kolab Enterprise Web Application" \
+    ucs/web/overview/entries/service/kolab-webclient/label/de?"Kolab Enterprise Webanwendung" \
     ucs/web/overview/entries/service/kolab-webclient/description?"Manage mail, contacts, appointments, tasks, and notes" \
     ucs/web/overview/entries/service/kolab-webclient/description/de?"Nachrichten, Kontakte, Termine, Aufgaben und Notizen verwalten"
 


commit 1f6997f511fa48e5ae90ed98a46075462b55772f
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Sun Apr 12 18:12:15 2015 +0200

    kolab-ucs-unjoin-script: Import the whole Univention shell-lib

diff --git a/ucs/kolab-ucs-unjoin-script.sh b/ucs/kolab-ucs-unjoin-script.sh
index 9d31eeb..b4b0778 100755
--- a/ucs/kolab-ucs-unjoin-script.sh
+++ b/ucs/kolab-ucs-unjoin-script.sh
@@ -31,7 +31,9 @@
 # <http://www.gnu.org/licenses/>.
 
 VERSION=1
+
 . /usr/share/univention-join/joinscripthelper.lib
+. /usr/share/univention-lib/all.sh
 joinscript_init
 
 SERVICE="kolab"


commit 93566454a1f4fb9d690ffd5da010a4d0c67a9bd3
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Sun Apr 12 18:10:19 2015 +0200

    kolab.ucs.postinst: Don't remove the join but the unjoin script (reported by Univention)

diff --git a/ucs/debian/kolab-ucs.postinst b/ucs/debian/kolab-ucs.postinst
index 6e9de4c..8bf4f89 100755
--- a/ucs/debian/kolab-ucs.postinst
+++ b/ucs/debian/kolab-ucs.postinst
@@ -56,7 +56,7 @@ case $1 in
         fi
         
         # remove unjoin script if present
-        uinst=/usr/lib/univention-install/65kolab-ucs.inst
+        uinst=/usr/lib/univention-install/65kolab-ucs.uinst
         [ -e "$uinst" ] && rm "$uinst"
         
         # call join script