[debian-edu-commits] debian-edu/pkg-team/ 14/25: Stop using embedded Scriptaculous.js library. Use Debian's version instead.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa.

commit d716ff4343320a26f4c27ebf3155c3c074864a4d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 11 18:36:54 2014 +0200

    Stop using embedded Scriptaculous.js library. Use Debian's version instead.
---
 debian/control                |  1 +
 debian/gosa.lintian-overrides |  2 --
 debian/rules                  | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 7fa9459..922ca71 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Depends:
  libapache2-mod-php5 | php5-cgi | php5-fpm,
  php5-curl,
  fonts-liberation,
+ libjs-scriptaculous,
 Recommends:
  ${misc:Recommends},
 Suggests:
diff --git a/debian/gosa.lintian-overrides b/debian/gosa.lintian-overrides
index 54d964c..ef41c7e 100644
--- a/debian/gosa.lintian-overrides
+++ b/debian/gosa.lintian-overrides
@@ -1,4 +1,2 @@
 # license files are displayed during GOsa2 setup on screen
 gosa: extra-license-file usr/share/gosa/setup/license.txt
-gosa: embedded-javascript-library usr/share/gosa/html/include/prototype.js
-gosa: embedded-javascript-library usr/share/gosa/html/include/scriptaculous.js
diff --git a/debian/rules b/debian/rules
index d46c3f9..61d53d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,17 @@ override_dh_install:
 	ln -sf /usr/share/fonts/truetype/liberation/LiberationSans-BoldItalic.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
 	ln -sf /usr/share/fonts/truetype/liberation/LiberationMono-BoldItalic.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
 	ln -sf /usr/share/fonts/truetype/liberation/LiberationSerif-Bold.ttf debian/gosa/usr/share/gosa/html/themes/default/fonts
+	# symlink to Debian's libjs-scriptaculous package
+	mkdir -p debian/gosa/usr/share/gosa/html/include
+	ln -sf /usr/share/javascript/scriptaculous/effects.js debian/gosa/usr/share/gosa/html/include/
+	ln -sf /usr/share/javascript/scriptaculous/controls.js debian/gosa/usr/share/gosa/html/include/
+	ln -sf /usr/share/javascript/scriptaculous/dragdrop.js debian/gosa/usr/share/gosa/html/include/
+	ln -sf /usr/share/javascript/scriptaculous/unittest.js debian/gosa/usr/share/gosa/html/include/
+	ln -sf /usr/share/javascript/scriptaculous/slider.js debian/gosa/usr/share/gosa/html/include/
+	ln -sf /usr/share/javascript/scriptaculous/scriptaculous.js debian/gosa/usr/share/gosa/html/include/
+	ln -sf /usr/share/javascript/scriptaculous/sound.js debian/gosa/usr/share/gosa/html/include/
+	ln -sf /usr/share/javascript/scriptaculous/builder.js debian/gosa/usr/share/gosa/html/include/
+	ln -sf /usr/share/javascript/scriptaculous/prototype.js debian/gosa/usr/share/gosa/html/include/
 
 override_dh_installchangelogs:
 	dh_installchangelogs -k gosa-core/Changelog
@@ -54,6 +65,9 @@ get-orig-source: $(patsubst %,$(PKG)-%_$(VER)$(DTYPE).orig.tar.gz,$(PLUGINS))
 	    rm -fv  include/smartyAddons/block.t.php \
 	    rm -f   html/include/prototype.js \
 	    rm -f   html/include/scriptaculous.js \
+	    rm -f   html/include/slider.js \
+	    rm -f   html/include/sound.js \
+	    rm -f   html/include/unittest.js \
 	    rm -f   html/themes/fonts/*.ttf \
 	    $(NULL)
 	rm ../$(PKG)_$(VER)$(DTYPE).orig-gosa-core.tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa.git