[hamradio-commits] [dump1090] 369/373: Use libjs-excanvas instead of the shipped excanvas.js

[Matthew Ernisse]

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

mernisse-guest pushed a commit to branch backport
in repository dump1090.

commit aa64253e2b05ac41a7a86ab4997b76e395ab5a52
Author: Matthew Ernisse <mernisse at ub3rgeek.net>
Date:   Sun Oct 19 19:16:31 2014 +0000

    Use libjs-excanvas instead of the shipped excanvas.js
---
 debian/changelog                 |  6 ++++++
 debian/control                   |  6 +++---
 debian/dump1090.install          | 10 +++++++++-
 debian/dump1090.links            |  9 +++++----
 debian/patches/03-excanvas.patch | 14 ++++++++++++++
 debian/patches/series            |  1 +
 6 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3055e44..e1d90da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dump1090 (1.09.1007.14+dfsg-3) unstable; urgency=low
+
+  * Replace shipped version of excanvas.js with libjs-excanvas
+
+ -- Matthew Ernisse <mernisse at ub3rgeek.net>  Sun, 19 Oct 2014 15:01:42 -0400
+
 dump1090 (1.09.1007.14+dfsg-2) unstable; urgency=low
 
   * Add buffering to the HTTP server so we can serve jQuery and associated
diff --git a/debian/control b/debian/control
index 65a2b6b..6254e70 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,12 @@ Uploaders: Matthew Ernisse <mernisse at ub3rgeek.net>
 Build-Depends: debhelper (>= 9), librtlsdr-dev, libusb-1.0-0-dev, pkg-config
 Standards-Version: 3.9.6
 Homepage: https://github.com/MalcolmRobb/dump1090
-Vcs-Git: https://github.com/MalcolmRobb/dump1090.git
-Vcs-Browser: https://github.com/MalcolmRobb/dump1090
+Vcs-Git: https://github.com/mernisse/dump1090.git
+Vcs-Browser: https://github.com/mernisse/dump1090
 
 Package: dump1090
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery-ui, librtlsdr0
+Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-excanvas, libjs-jquery-ui, librtlsdr0
 Description: Mode S decoder specifically designed for RTLSDR devices
  The main features are:
   * Robust decoding of weak messages, with mode1090 many users observed
diff --git a/debian/dump1090.install b/debian/dump1090.install
index a41cd11..1605271 100644
--- a/debian/dump1090.install
+++ b/debian/dump1090.install
@@ -1,3 +1,11 @@
 dump1090 /usr/sbin
 view1090 /usr/bin
-public_html/* /usr/share/dump1090/public_html
+public_html/config.js /usr/share/dump1090/public_html
+public_html/extension.js /usr/share/dump1090/public_html
+public_html/gmap.html /usr/share/dump1090/public_html
+public_html/options.js /usr/share/dump1090/public_html
+public_html/planeObject.js /usr/share/dump1090/public_html
+public_html/script.js /usr/share/dump1090/public_html
+public_html/style.css /usr/share/dump1090/public_html
+public_html/coolclock/coolclock.js /usr/share/dump1090/public_html/coolclock
+public_html/coolclock/moreskins.js /usr/share/dump1090/public_html/coolclock
diff --git a/debian/dump1090.links b/debian/dump1090.links
index 2d722fa..2a44db9 100644
--- a/debian/dump1090.links
+++ b/debian/dump1090.links
@@ -1,4 +1,5 @@
-usr/share/javascript/jquery/jquery.js usr/share/dump1090/public_html/jquery.js
-usr/share/javascript/jquery-ui/jquery-ui.js usr/share/dump1090/public_html/jquery-ui.js
-usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css usr/share/dump1090/public_html/jquery-ui.min.css
-usr/share/javascript/jquery-ui/css/smoothness/images usr/share/dump1090/public_html/images
+/usr/share/javascript/jquery/jquery.js /usr/share/dump1090/public_html/jquery.js
+/usr/share/javascript/jquery-ui/jquery-ui.js /usr/share/dump1090/public_html/jquery-ui.js
+/usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.min.css /usr/share/dump1090/public_html/jquery-ui.min.css
+/usr/share/javascript/jquery-ui/css/smoothness/images /usr/share/dump1090/public_html/images
+/usr/share/javascript/excanvas/excanvas.js /usr/share/dump1090/public_html/excanvas.js
diff --git a/debian/patches/03-excanvas.patch b/debian/patches/03-excanvas.patch
new file mode 100644
index 0000000..5fa3d99
--- /dev/null
+++ b/debian/patches/03-excanvas.patch
@@ -0,0 +1,14 @@
+Author: Matthew John Ernisse <mernisse at ub3rgeek.net>
+Description: Replace local version of excanvas.js with libjs-excanvas.
+Forwarded: not-needed
+--- a/public_html/gmap.html
++++ b/public_html/gmap.html
+@@ -10,7 +10,7 @@
+ 		<script type="text/javascript" src="options.js"></script>
+ 		<script type="text/javascript" src="extension.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>
+ 	</head>
diff --git a/debian/patches/series b/debian/patches/series
index cfa9b0a..64202c1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 00-makefile.patch
 01-jquery.patch
 02-http-buffer.patch
+03-excanvas.patch

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