[debian-edu-commits] debian-edu/sankore.git (#44) - master (branch) updated: upstream/2.00_git20130309-42-ga75f1b8

[Mike Gabriel]

The branch, master has been updated
       via  a75f1b8c0f521ef488d56ce85fe8961d914d7e71 (commit)
      from  2888939b1180756b56d8fc95e9622cb84c1cde43 (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 a75f1b8c0f521ef488d56ce85fe8961d914d7e71
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat May 4 12:34:27 2013 +0200

    Use bin:package libjs-query as jquery.js/jquery.min.js provider.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 debian/control   |    1 +
 debian/rules     |   13 +++++++++++++
 3 files changed, 15 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 586dbd7..a3808d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,5 +17,6 @@ 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.
 
  -- Miriam Ruiz <miriam at debian.org>  Wed, 06 Mar 2013 13:05:21 +0100
diff --git a/debian/control b/debian/control
index 6ab862b..8d995ad 100644
--- a/debian/control
+++ b/debian/control
@@ -63,6 +63,7 @@ Package: sankore-data
 Architecture: all
 Depends:
  ${misc:Depends},
+ libjs-jquery,
 Suggests:
  sankore (= ${binary:Version}),
 Description: interactive digital whiteboard software - data
diff --git a/debian/rules b/debian/rules
index c1b46ba..4516d14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -159,6 +159,19 @@ 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
+
+	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
+
+	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
+
 	# 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).