[debian-edu-commits] debian-edu/sankore.git (#50) - master (branch) updated: upstream/2.00_git20130309-48-g6909cba
Mike Gabriel
sunweaver at alioth.debian.org
Sat May 4 11:57:02 UTC 2013
The branch, master has been updated
via 6909cbaf0b32c134e79170a59b1cda3fd0ae2335 (commit)
from 34a244ff391599ad46320d6d630eb140b676af0f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6909cbaf0b32c134e79170a59b1cda3fd0ae2335
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat May 4 13:56:55 2013 +0200
Use bin:package libjs-openlayers as OpenLayers.js library provider. Replace more libjs-query library files by symlinks.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 +-
debian/control | 1 +
debian/rules | 62 +++++++++++++++++++++++++++++++++++++++++++----------
3 files changed, 53 insertions(+), 13 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index a3808d6..0dee410 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ sankore (2.00~git20130309-1) UNRELEASED; urgency=low
[ Mike Gabriel ]
* Include upstream changelog (release notes) into package.
- * Use bin:package libjs-query as jquery.js/jquery.min.js provider.
+ * Use bin:package libjs-query as jquery.js/jquery.min.js library provider.
+ * Use bin:package libjs-openlayers as OpenLayers.js library provider.
-- Miriam Ruiz <miriam at debian.org> Wed, 06 Mar 2013 13:05:21 +0100
diff --git a/debian/control b/debian/control
index b65ca8d..29b7f69 100644
--- a/debian/control
+++ b/debian/control
@@ -63,6 +63,7 @@ Architecture: all
Depends:
${misc:Depends},
libjs-jquery,
+ libjs-openlayers,
Suggests:
sankore (= ${binary:Version}),
Description: interactive digital whiteboard software - data
diff --git a/debian/rules b/debian/rules
index 5d8653c..646e0e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -160,18 +160,56 @@ binary-arch: install
> "$(CURDIR)/debian/sankore/usr/bin/Open-Sankore"
chmod 755 "$(CURDIR)/debian/sankore/usr/bin/Open-Sankore"
- # use jquery.js and jquery.min.js from Debian package libjs-query
- rm -f $(CURDIR)/debian/sankore-data/usr/share/open-sankore/library/applications/Editeur HTML.wgt/jquery.pack.js
- ln -s /usr/share/javascript/jquery/jquery.js $(CURDIR)/debian/sankore-data/usr/share/open-sankore/library/applications/Editeur HTML.wgt/jquery.pack.js
+ # use jquery.js from Debian package libjs-query
+ cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && for jsfile in \
+ library/applications/Editeur HTML.wgt/jquery.pack.js \
+ library/applications/Nuancier.wgt/js/jquery.js \
+ ; do \
+ rm -f $fsfile; ln -s /usr/share/javascript/jquery/jquery.js $$jsfile; \
+ done
- rm -f $(CURDIR)/debian/sankore-data/usr/share/open-sankore/library/applications/Nuancier.wgt/js/jquery.js
- ln -s /usr/share/javascript/jquery/jquery.js $(CURDIR)/debian/sankore-data/usr/share/open-sankore/library/applications/Nuancier.wgt/js/jquery.js
+ # use jquery.min.js from Debian package libjs-query
+ cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && for jsfile in \
+ library/applications/Wikipedia.wgt/script/jquery.min.js \
+ library/applications/Wiktionnaire.wgt/script/jquery.min.js \
+ library/applications/Calculatrice.wgt/js/jquery-1.3.2.min.js \
+ library/applications/GeoInfo.wgt/js/jquery-1.6.2.min.js \
+ library/applications/Grapheur.wgt/JavaScript/jquery-1.3.2.min.js \
+ library/applications/Minuteur.wgt/js/jquery-1.3.2.min.js \
+ library/applications/Navigateur Web.wgt/scripts/jquery-1.3.2.min.js \
+ library/applications/Notes.wgt/js/jquery-1.3.2.min.js \
+ library/applications/Sel video.wgt/scripts/jquery-1.3.2.min.js \
+ library/applications/Wikipedia.wgt/script/jquery.min.js \
+ library/applications/Wiktionnaire.wgt/script/jquery.min.js \
+ library/interactivities/Ass images.wgt/js/jquery-1.6.2.min.js \
+ library/interactivities/Ass sons.wgt/js/jquery-1.6.2.min.js \
+ library/interactivities/Cat images.wgt/js/jquery-1.6.2.min.js \
+ library/interactivities/Cat text.wgt/js/jquery-1.6.2.min.js \
+ library/interactivities/Choisir.wgt/scripts/jquery-1.6.2.min.js \
+ library/interactivities/Contraste.wgt/scripts/jquery-1.6.2.min.js \
+ library/interactivities/Etudier.wgt/js/jquery-1.6.2.min.js \
+ library/interactivities/Ordre images.wgt/js/jquery-1.6.2.min.js \
+ library/interactivities/Ordre mots.wgt/scripts/jquery-1.6.2.min.js \
+ library/interactivities/Ordre phrase.wgt/scripts/jquery-1.6.2.min.js \
+ library/interactivities/Selectionner.wgt/js/jquery-1.6.2.min.js \
+ library/interactivities/Separe phrase.wgt/scripts/jquery-1.6.2.min.js \
+ library/interactivities/Separe texte.wgt/scripts/jquery-1.6.2.min.js \
+ library/interactivities/Syllabes.wgt/scripts/jquery-1.6.2.min.js \
+ library/search/Audio Planete.wgs/scripts/jquery-1.6.2.min.js \
+ library/search/Flash Planete.wgs/scripts/jquery-1.6.2.min.js \
+ library/search/Google images.wgs/scripts/jquery-1.6.2.min.js \
+ library/search/Image Planete.wgs/scripts/jquery-1.6.2.min.js \
+ library/search/Video Planete.wgs/scripts/jquery-1.6.2.min.js \
+ ; do \
+ rm -f $fsfile; ln -s /usr/share/javascript/jquery/jquery.min.js $(CURDIR)/debian/sankore-data/usr/share/open-sankore/$$jsfile; \
+ done
- rm -f $(CURDIR)/debian/sankore-data/usr/share/open-sankore/library/applications/Wikipedia.wgt/script/jquery.min.js
- ln -s /usr/share/javascript/jquery/jquery.min.js $(CURDIR)/debian/sankore-data/usr/share/open-sankore/library/applications/Wikipedia.wgt/script/jquery.min.js
-
- rm -f $(CURDIR)/debian/sankore-data/usr/share/open-sankore/library/applications/Wiktionnaire.wgt/script/jquery.min.js
- ln -s /usr/share/javascript/jquery/jquery.min.js $(CURDIR)/debian/sankore-data/usr/share/open-sankore/library/applications/Wiktionnaire.wgt/script/jquery.min.js
+ # use OpenLayers.js from Debian package libjs-openstreetmap
+ cd $(CURDIR)/debian/sankore-data/usr/share/open-sankore/ && for jsfile in \
+ library/applications/OpenStreetMap.wgt/api/OpenLayers.js
+ ; do \
+ rm -f $fsfile; ln -s /usr/share/javascript/openlayers/OpenLayers.js $(CURDIR)/debian/sankore-data/usr/share/open-sankore/$$jsfile; \
+ done
# convert ReleaseNotes.pdf into a Changelog plain text file
pdf2txt Sankore-3.1/ReleaseNotes.pdf > Sankore-3.1/changelog
hooks/post-receive
--
sankore.git (Debian package sankore)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "sankore.git" (Debian package sankore).
More information about the debian-edu-commits
mailing list