From: Wilfried Göesgens <willi@citadel.org>
Date: Wed, 23 Apr 2008 06:25:21 +0000 (+0000)
Subject: * busting the prototype package isn't that easy as its swapping places.
X-Git-Tag: v7.86~2315
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=03cfa1436312a98b9d9745264cebc3ce3338d00c;p=citadel.git

* busting the prototype package isn't that easy as its swapping places.
---

diff --git a/webcit/debian/citadel-webcit.postinst b/webcit/debian/citadel-webcit.postinst
index 63d6bf9ab..e836598d5 100644
--- a/webcit/debian/citadel-webcit.postinst
+++ b/webcit/debian/citadel-webcit.postinst
@@ -22,7 +22,11 @@ case "$1" in
 	fi
 	#DEBHELPER#
 	if test ! -L /usr/share/citadel-webcit/static/; then
-	    ln -sf /usr/share/prototypejs/prototype.js /usr/share/citadel-webcit/static/	
+	    if test -d /usr/share/prototypejs; then 
+		ln -sf /usr/share/prototypejs/prototype.js /usr/share/citadel-webcit/static/	
+	    else
+		ln -sf /usr/share/javascript/prototype/prototype.js /usr/share/citadel-webcit/static/	
+	    fi
 	fi
 # update the webserver, if needed
 	case "$WWWTYPE" in
diff --git a/webcit/debian/control b/webcit/debian/control
index 2cd42d627..04e26e504 100644
--- a/webcit/debian/control
+++ b/webcit/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
 
 Package: citadel-webcit
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, tinymce, citadel-common, openssl, locales, prototypejs
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, tinymce, citadel-common, openssl, locales, libjs-prototype
 Suggests: citadel-server, apache2 | apache, localepurge, gnome-icon-theme
 Recommends: shared-mime-info
 Description: web-based frontend to Citadel groupware server