[hamradio-commits] [dump1090-mutability] 147/172: Use the packaged versions of jquery and excanvas

Sun Jan 28 13:45:54 UTC 2018

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

mfv pushed a commit to branch master
in repository dump1090-mutability.

commit 8e95870eefc12817eb0bc1f3860a7988d6b579fe
Author: Matthew Ernisse <mernisse at ub3rgeek.net>
Date:   Fri Oct 24 10:28:15 2014 -0400

    Use the packaged versions of jquery and excanvas
---
 debian/control                   |  2 +-
 debian/dump1090-mutability.links |  5 +++++
 debian/patches/01-jquery.patch   | 19 +++++++++++++++++++
 debian/patches/02-excanvas.patch | 16 ++++++++++++++++
 debian/patches/series            |  2 ++
 debian/rules                     |  1 +
 6 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 698ba46..6b3dfb7 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: https://github.com/mutability/dump1090.git
 
 Package: dump1090-mutability
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-excanvas, libjs-jquery-ui, adduser
 Recommends: python(>=2.5), lighttpd
 Provides: fatsv-data-source
 Description: ADS-B Ground Station System for RTL-SDR
diff --git a/debian/dump1090-mutability.links b/debian/dump1090-mutability.links
new file mode 100644
index 0000000..1b35bb9
--- /dev/null
+++ b/debian/dump1090-mutability.links
@@ -0,0 +1,5 @@
+/usr/share/javascript/jquery/jquery.js /usr/share/dump1090-mutability/html/jquery.js
+/usr/share/javascript/jquery-ui/jquery-ui.js /usr/share/dump1090-mutability/html/jquery-ui.js
+/usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css /usr/share/dump1090-mutability/html/jquery-ui.min.css
+/usr/share/javascript/jquery-ui/css/smoothness/images /usr/share/dump1090-mutability/html/images
+/usr/share/javascript/excanvas/excanvas.js /usr/share/dump1090-mutability/html/excanvas.js
diff --git a/debian/patches/01-jquery.patch b/debian/patches/01-jquery.patch
new file mode 100644
index 0000000..a64385c
--- /dev/null
+++ b/debian/patches/01-jquery.patch
@@ -0,0 +1,19 @@
+Author: Matthew John Ernisse <mernisse at ub3rgeek.net>
+Description: Locally serve jQuery and jQuery-UI files.
+Forwarded: not-needed
+
+--- a/public_html/gmap.html
++++ b/public_html/gmap.html
+@@ -2,9 +2,9 @@
+ 	<head>
+ 		<meta charset="utf-8"/>
+ 		<link rel="stylesheet" type="text/css" href="style.css" />
+-		<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
+-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
+-		<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/jquery-ui.min.js"></script>
++		<link rel="stylesheet" href="jquery-ui.min.css" />
++		<script src="jquery.js"></script>
++		<script src="jquery-ui.js"></script>
+ 		<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?libraries=geometry"></script>
+ 		<script type="text/javascript" src="config.js"></script>
+ 		<script type="text/javascript" src="markers.js"></script>
diff --git a/debian/patches/02-excanvas.patch b/debian/patches/02-excanvas.patch
new file mode 100644
index 0000000..7c50a2c
--- /dev/null
+++ b/debian/patches/02-excanvas.patch
@@ -0,0 +1,16 @@
+Author: Matthew John Ernisse <mernisse at ub3rgeek.net>
+Description: Replace local version of excanvas.js with libjs-excanvas.
+Forwarded: not-needed
+Index: mutability-dump1090/public_html/gmap.html
+===================================================================
+--- mutability-dump1090.orig/public_html/gmap.html
++++ mutability-dump1090/public_html/gmap.html
+@@ -13,7 +13,7 @@
+ 		<script type="text/javascript" src="formatter.js"></script>
+ 		<script type="text/javascript" src="flags.js"></script>
+ 		<script type="text/javascript" src="script.js"></script>
+-		<script type="text/javascript" src="coolclock/excanvas.js"></script>
++		<script type="text/javascript" src="excanvas.js"></script>
+ 		<script type="text/javascript" src="coolclock/coolclock.js"></script>
+ 		<script type="text/javascript" src="coolclock/moreskins.js"></script>
+         <title>DUMP1090</title>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2547f02
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01-jquery.patch
+02-excanvas.patch
diff --git a/debian/rules b/debian/rules
index 68a0db9..ef87160 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ override_dh_install:
 	install -d debian/dump1090-mutability/usr/bin
 	cp -a dump1090 debian/dump1090-mutability/usr/bin/dump1090-mutability
 	cp -a view1090 debian/dump1090-mutability/usr/bin/view1090-mutability
+	$(RM) debian/dump1090-mutability/usr/share/dump1090-mutability/html/coolclock/excanvas.js
 
 %:
 	dh $@ --with apache2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090-mutability.git

