Depend on libjs-jquery instead of shipping jquery files

Although they are bundled in the Python package, the jQuery files are
removed from the final Debian package. The dependency on libjs-jquery is
used to provide an up-to-date jQuery library.

Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>

9 files changed, 8 insertions, 5 deletions

diff --git a/debian/control b/debian/control
index bdb5941..6cd5231 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,6 @@ Standards-Version: 3.9.1
 Package: swiftstory
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${python3:Depends}, python3-websockets, python3-pkg-resources
+Depends: ${misc:Depends}, ${python3:Depends}, python3-websockets, python3-pkg-resources, libjs-jquery
 Description: SwiftStory game: We're not out of the woods yet.
 
diff --git a/debian/rules b/debian/rules
index 6f7eaf3..57ca10b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@
 # Thu, 18 Aug 2016 12:48:06 +0000
 export PYBUILD_NAME=swiftstory
 export PYBUILD_TEST_PYTEST=1
+export PYBUILD_AFTER_INSTALL=rm -r {destdir}/usr/share/swiftstory/www/javascript
 %:
 	dh $@ --with python3,sysuser --buildsystem=pybuild
 
diff --git a/setup.cfg b/setup.cfg
index 5b94f00..2133e54 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,8 +25,9 @@ share/swiftstory/www/ =
     usr/share/swiftstory/www/swiftstory-mobile.css
     usr/share/swiftstory/www/swiftstory-mobile.html
     usr/share/swiftstory/www/swiftstory-mobile.js
-# TODO install jQuery using libjs-jquery
-    usr/share/swiftstory/www/jquery.js
+share/swiftstory/www/javascript/jquery/ =
+    usr/share/swiftstory/www/javascript/jquery/jquery.min.js
+    usr/share/swiftstory/www/javascript/jquery/jquery.js
 
 [options.package_data]
 swiftstory = data/lang/*/cards/*.json
diff --git a/usr/share/swiftstory/www/jquery-2.1.3.js b/usr/share/swiftstory/www/javascript/jquery/jquery-2.1.3.js
index 79d631f..79d631f 100644
--- a/usr/share/swiftstory/www/jquery-2.1.3.js
+++ b/usr/share/swiftstory/www/javascript/jquery/jquery-2.1.3.js
diff --git a/usr/share/swiftstory/www/jquery-2.1.3.min.js b/usr/share/swiftstory/www/javascript/jquery/jquery-2.1.3.min.js
index 25714ed..25714ed 100644
--- a/usr/share/swiftstory/www/jquery-2.1.3.min.js
+++ b/usr/share/swiftstory/www/javascript/jquery/jquery-2.1.3.min.js
diff --git a/usr/share/swiftstory/www/jquery.js b/usr/share/swiftstory/www/javascript/jquery/jquery.js
index 957f262..957f262 120000
--- a/usr/share/swiftstory/www/jquery.js
+++ b/usr/share/swiftstory/www/javascript/jquery/jquery.js
diff --git a/usr/share/swiftstory/www/javascript/jquery/jquery.min.js b/usr/share/swiftstory/www/javascript/jquery/jquery.min.js
new file mode 120000
index 0000000..8d8a7ee
--- /dev/null
+++ b/usr/share/swiftstory/www/javascript/jquery/jquery.min.js
@@ -0,0 +1 @@
+jquery-2.1.3.min.js
\ No newline at end of file
diff --git a/usr/share/swiftstory/www/swiftstory-desktop.html b/usr/share/swiftstory/www/swiftstory-desktop.html
index 10706af..9d4fe87 100644
--- a/usr/share/swiftstory/www/swiftstory-desktop.html
+++ b/usr/share/swiftstory/www/swiftstory-desktop.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>SwiftStory</title>
     <link rel="stylesheet" href="swiftstory-common.css">
-    <script src="jquery.js"></script>
+    <script src="/javascript/jquery/jquery.min.js"></script>
     <script src="swiftstory-common.js"></script>
     <script src="swiftstory-desktop.js"></script>
   </head>
diff --git a/usr/share/swiftstory/www/swiftstory-mobile.html b/usr/share/swiftstory/www/swiftstory-mobile.html
index a0407d4..206d3a9 100644
--- a/usr/share/swiftstory/www/swiftstory-mobile.html
+++ b/usr/share/swiftstory/www/swiftstory-mobile.html
@@ -6,7 +6,7 @@
     <title>SwiftStory</title>
     <link rel="stylesheet" href="swiftstory-common.css">
     <link rel="stylesheet" href="swiftstory-mobile.css">
-    <script src="jquery.js"></script>
+    <script src="/javascript/jquery/jquery.min.js"></script>
     <script src="swiftstory-common.js"></script>
     <script src="swiftstory-config.js"></script>
     <script src="swiftstory-mobile.js"></script>