[Pkg-voip-commits] [janus] 280/282: Refresh and extend patches.
Jonas Smedegaard
dr at jones.dk
Wed Dec 20 21:53:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.
commit 2034c8ddeb0b928f6d1f26164da531f07f129c91
Author: Jonas Smedegaard <dr at jones.dk>
Date: Wed Dec 20 22:38:45 2017 +0100
Refresh and extend patches.
---
.../patches/1001_try_enable_docs_by_default.patch | 4 +-
debian/patches/2003_use_packaged_javascript.patch | 62 +++++++++++++++++++++-
2 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/debian/patches/1001_try_enable_docs_by_default.patch b/debian/patches/1001_try_enable_docs_by_default.patch
index 52954a2..df7e4ed 100644
--- a/debian/patches/1001_try_enable_docs_by_default.patch
+++ b/debian/patches/1001_try_enable_docs_by_default.patch
@@ -5,7 +5,7 @@ Last-Update: 2017-03-16
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/configure.ac
+++ b/configure.ac
-@@ -35,10 +35,10 @@
+@@ -36,10 +36,10 @@
##
AC_ARG_ENABLE([docs],
@@ -19,7 +19,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
AC_ARG_ENABLE([data-channels],
[AS_HELP_STRING([--disable-data-channels],
-@@ -329,6 +329,8 @@
+@@ -342,6 +342,8 @@
[
AS_IF([test "x$enable_docs" = "xyes"],
[AC_MSG_ERROR([doxygen or dot not found. See README.md for installation instructions or remove --enable-docs])])
diff --git a/debian/patches/2003_use_packaged_javascript.patch b/debian/patches/2003_use_packaged_javascript.patch
index 4a297b1..71b13b8 100644
--- a/debian/patches/2003_use_packaged_javascript.patch
+++ b/debian/patches/2003_use_packaged_javascript.patch
@@ -288,7 +288,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+++ b/html/siptest.html
@@ -6,11 +6,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Janus WebRTC Gateway: SIP Gateway Demo</title>
+ <title>Janus WebRTC Gateway: SIP Gateway Demo (Sofia)</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>
@@ -511,3 +511,63 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.3/toastr.css"/>
</head>
<body>
+--- a/html/nosiptest.html
++++ b/html/nosiptest.html
+@@ -6,11 +6,11 @@
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Janus WebRTC Gateway: NoSIP (SDP/RTP)</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="janus.js" ></script>
+ <script type="text/javascript" src="nosiptest.js"></script>
+ <script>
+@@ -22,9 +22,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" type="text/css"/>
++<link rel="stylesheet" href="fonts/font-awesome/css/font-awesome.min.css" type="text/css"/>
+ </head>
+ <body>
+
+--- a/html/sipretest.html
++++ b/html/sipretest.html
+@@ -6,11 +6,11 @@
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Janus WebRTC Gateway: SIP Gateway Demo (libre)</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="sipretest.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" type="text/css"/>
++<link rel="stylesheet" href="fonts/font-awesome/css/font-awesome.min.css" type="text/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