[pkg-fgfs-crew] [flightgear-data] 01/01: Add patch use-system-jslibs.diff to deal with the version-less jquery file name of libjs-jquery.

Markus Wanner markus_wanner-guest at moszumanska.debian.org
Wed Feb 18 15:01:56 UTC 2015


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

markus_wanner-guest pushed a commit to branch experimental
in repository flightgear-data.

commit d00ceb3e5770819b39944ee013128e2a79968d81
Author: Markus Wanner <markus at bluegap.ch>
Date:   Wed Feb 18 16:01:35 2015 +0100

    Add patch use-system-jslibs.diff to deal with the version-less jquery
    file name of libjs-jquery.
---
 debian/changelog                      |  4 +-
 debian/patches/series                 |  1 +
 debian/patches/use-system-jslibs.diff | 84 +++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 55f235a..3a2ef71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,9 @@ flightgear-data (3.4.0+dfsg-0~exp1) UNRELEASED; urgency=medium
   * Repack upstream's tarball: remove jquery, flot and leaflet from
     webgui's 3rdparty. Also strip the unneeded copies of tzdata and the
     liberation font.
-  * Add the necessary JavaScript dependencies, instead.
+  * Add the necessary JavaScript dependencies, instead. Add patch
+    use-system-jslibs.diff to deal with the version-less jquery file
+    name of libjs-jquery.
   * Add missing-sources for the sprintf js library.
   * Bump S-V: no changes needed.
   * Update the watch file.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b6b3e18
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-system-jslibs.diff
diff --git a/debian/patches/use-system-jslibs.diff b/debian/patches/use-system-jslibs.diff
new file mode 100644
index 0000000..afe3018
--- /dev/null
+++ b/debian/patches/use-system-jslibs.diff
@@ -0,0 +1,84 @@
+Description: Correct all references to jquery.
+ The original sources provide a versioned JavaScript file, where
+ as the libjs-jquery package's file is just jquery.min.js.
+Author: Markus Wanner <markus at bluegap.ch>
+Last-Update: 2015-02-18
+Forwarded: not-needed
+
+--- a/Aircraft/SenecaII/WebPanel/Left.html
++++ b/Aircraft/SenecaII/WebPanel/Left.html
+@@ -33,7 +33,7 @@
+ </style>
+ 
+ <script type="text/javascript" charset="utf-8"
+-	src="/gui/3rdparty/jquery/jquery-1.11.1.min.js"></script>
++	src="/gui/3rdparty/jquery/jquery.min.js"></script>
+ <script type="text/javascript" charset="utf-8" src="fgfs.js"></script>
+ <script type="text/javascript" charset="utf-8" src="jquery.fganimate.js"></script>
+ <script type="text/javascript" charset="utf-8">
+--- a/Aircraft/SenecaII/WebPanel/Panel1.html
++++ b/Aircraft/SenecaII/WebPanel/Panel1.html
+@@ -76,7 +76,7 @@
+ </style>
+ 
+ <script type="text/javascript" charset="utf-8"
+-	src="/gui/3rdparty/jquery/jquery-1.11.1.min.js"></script>
++	src="/gui/3rdparty/jquery/jquery.min.js"></script>
+ <script type="text/javascript" charset="utf-8" src="/gui/lib/jquery.fganimate.js"></script>
+ <script type="text/javascript" charset="utf-8" src="/gui/lib/fgfs.js"></script>
+ <script type="text/javascript" charset="utf-8">
+--- a/webgui/examples/FGPanel-Sample.html
++++ b/webgui/examples/FGPanel-Sample.html
+@@ -33,7 +33,7 @@
+ </style>
+ 
+ <script type="text/javascript" charset="utf-8"
+-	src="/gui/3rdparty/jquery/jquery-1.11.1.min.js"></script>
++	src="/gui/3rdparty/jquery/jquery.min.js"></script>
+ <script type="text/javascript" charset="utf-8" src="/gui/lib/jquery.fganimate.js"></script>
+ <script type="text/javascript" charset="utf-8" src="/gui/lib/fgfs.js"></script>
+ </head>
+--- a/webgui/instruments/kingradio.html
++++ b/webgui/instruments/kingradio.html
+@@ -22,7 +22,7 @@
+ 		<div style="clear: both"></div>
+ 	</div>
+ 
+-	<script src="../3rdparty/jquery/jquery-1.11.1.min.js"
++	<script src="../3rdparty/jquery/jquery.min.js"
+ 		type="text/javascript"></script>
+ 	<script src="../lib/fgcommand.js" type="text/javascript"></script>
+   <script src="../lib/props.js" type="text/javascript"></script>
+--- a/webgui/map/index-2.0.html
++++ b/webgui/map/index-2.0.html
+@@ -13,7 +13,7 @@
+ <link rel="shortcut icon" sizes="200x200" href="/img/FlightGear_logo.png">
+ <link rel="icon" sizes="200x200" href="/img/FlightGear_logo.png">
+ 
+-<script src="../3rdparty/jquery/jquery-1.11.1.min.js" type="text/javascript"></script>
++<script src="../3rdparty/jquery/jquery.min.js" type="text/javascript"></script>
+ <link rel="stylesheet" href="../3rdparty/leaflet-0.7.3/leaflet.css" />
+ <script src="../3rdparty/leaflet-0.7.3/leaflet.js" type="text/javascript"></script>
+ <script src="../lib/fgfs.js" type="text/javascript"></script>
+--- a/webgui/map/index.html
++++ b/webgui/map/index.html
+@@ -1,7 +1,7 @@
+ <!doctype html>
+ <html>
+ <head>
+-<script src="../3rdparty/jquery/jquery-1.11.1.min.js"
++<script src="../3rdparty/jquery/jquery.min.js"
+ 	type="text/javascript"></script>
+ <link rel="stylesheet"
+ 	href="../3rdparty/leaflet-0.7.3/leaflet.css" />
+--- a/webgui/radio.html
++++ b/webgui/radio.html
+@@ -79,7 +79,7 @@
+       <div id="footer">
+       </div>
+     </div>
+-    <script src="3rdparty/jquery/jquery-1.11.1.min.js" type="text/javascript"></script>
++    <script src="3rdparty/jquery/jquery.min.js" type="text/javascript"></script>
+     <script src="lib/fgcommand.js" type="text/javascript"></script>
+     <script src="lib/props.js" type="text/javascript"></script>
+     <script src="radio.js" type="text/javascript"></script>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/flightgear-data.git



More information about the pkg-fgfs-crew mailing list