[Pkg-voip-commits] [janus] 160/163: Extend patch 2003 to cover jquery.blockUI. Have janus-doc depend on libjs-jquery-blockui.
Jonas Smedegaard
dr at jones.dk
Sat Oct 28 01:22:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag debian/0.2.5-1
in repository janus.
commit df84d29b9cdf41c9f094cefbbcfaffc497e0e0a8
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sat Oct 28 02:22:12 2017 +0200
Extend patch 2003 to cover jquery.blockUI. Have janus-doc depend on libjs-jquery-blockui.
---
debian/control | 1 +
debian/patches/2003_use_packaged_javascript.patch | 80 +++++++++++++++++------
2 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/debian/control b/debian/control
index b1d3406..e50c0cb 100644
--- a/debian/control
+++ b/debian/control
@@ -95,6 +95,7 @@ Architecture: all
Depends:
${misc:Depends},
libjs-jquery,
+ libjs-jquery-blockui,
libjs-bootstrap,
libjs-bootswatch,
Description: Open Source, general purpose, WebRTC gateway - documentation
diff --git a/debian/patches/2003_use_packaged_javascript.patch b/debian/patches/2003_use_packaged_javascript.patch
index 0c39950..4a297b1 100644
--- a/debian/patches/2003_use_packaged_javascript.patch
+++ b/debian/patches/2003_use_packaged_javascript.patch
@@ -53,9 +53,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<title>Janus WebRTC Gateway: Audio Bridge Demo</title>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
-+<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
+<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
@@ -126,9 +127,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<title>Janus WebRTC Gateway: Echo Test</title>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
-+<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
+<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
@@ -177,9 +179,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<title>Janus WebRTC Gateway: Echo Test</title>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
-+<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
+<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
@@ -228,9 +231,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<title>Janus WebRTC Gateway: Recorder/Playout Demo</title>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
-+<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
+<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
@@ -257,9 +261,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<title>Janus WebRTC Gateway: Screen Sharing Demo</title>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
-+<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
+<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
@@ -286,9 +291,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<title>Janus WebRTC Gateway: SIP Gateway Demo</title>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
-+<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
+<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
@@ -365,9 +371,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<title>Janus WebRTC Gateway: Text Room</title>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
-+<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
+<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
@@ -394,9 +401,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<title>Janus WebRTC Gateway: Video Call Demo</title>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
-+<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
+<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
@@ -423,9 +431,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<title>Janus WebRTC Gateway: Video Room Demo</title>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
-+<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
+<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
@@ -452,9 +461,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<title>Janus WebRTC Gateway: Voice Mail Demo</title>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
-+<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
- <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
+<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
@@ -471,3 +481,33 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<link rel="stylesheet" href="css/demo.css" type="text/css"/>
</head>
<body>
+--- a/html/vp9svctest.html
++++ b/html/vp9svctest.html
+@@ -6,11 +6,11 @@
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Janus WebRTC Gateway: VP9-SVC Video Room Demo</title>
+ <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/webrtc-adapter/5.0.1/adapter.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.2/jquery.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.blockUI/2.70/jquery.blockUI.min.js" ></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.0.2/js/bootstrap.min.js"></script>
++<script type="text/javascript" src="javascript/jquery/jquery.min.js" ></script>
++<script type="text/javascript" src="javascript/jquery-blockui/jquery.blockUI.js" ></script>
++<script type="text/javascript" src="javascript/bootstrap/js/bootstrap.min.js"></script>
+ <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/bootbox.js/4.1.0/bootbox.min.js"></script>
+-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js"></script>
++<script type="text/javascript" src="javascript/spin.js/spin.min.js"></script>
+ <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.3/toastr.min.js"></script>
+ <script type="text/javascript" src="janus.js" ></script>
+ <script type="text/javascript" src="vp9svctest.js"></script>
+@@ -23,9 +23,9 @@
+ $(".footer").load("footer.html");
+ });
+ </script>
+-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.7/cerulean/bootstrap.min.css" type="text/css"/>
++<link rel="stylesheet" href="javascript/bootswatch/cerulean/bootstrap.min.css" type="text/css"/>
+ <link rel="stylesheet" href="css/demo.css" type="text/css"/>
+-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.6.2/css/font-awesome.min.css"/>
++<link rel="stylesheet" href="fonts/font-awesome/css/font-awesome.min.css"/>
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.3/toastr.css"/>
+ </head>
+ <body>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git
More information about the Pkg-voip-commits
mailing list