[med-svn] [snakemake] 04/04: Combine patches for local JS use

Tue Sep 15 13:58:10 UTC 2015

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

daube-guest pushed a commit to branch master
in repository snakemake.

commit 602a820bc86f47e5a87501480d3d4d5889f456e7
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Tue Sep 15 23:57:41 2015 +1000

    Combine patches for local JS use
---
 ...2-Use-local-javascript-css-as-appropriate.patch | 27 -------------------
 .../0003-Use-debian-s-mathjax-package.patch        | 30 +++++++++++++++++++---
 debian/patches/series                              |  1 -
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/debian/patches/0002-Use-local-javascript-css-as-appropriate.patch b/debian/patches/0002-Use-local-javascript-css-as-appropriate.patch
deleted file mode 100644
index 1549be7..0000000
--- a/debian/patches/0002-Use-local-javascript-css-as-appropriate.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Kevin Murray <spam at kdmurray.id.au>
-Date: Mon, 14 Sep 2015 00:12:40 +1000
-Subject: Use local javascript/css as appropriate
-
----
- snakemake/gui.html | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/snakemake/gui.html b/snakemake/gui.html
-index 22ad7af..3010462 100644
---- a/snakemake/gui.html
-+++ b/snakemake/gui.html
-@@ -1,11 +1,11 @@
- <html>
-     <head>
--        <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
-+        <script type="text/javascript" src="file://usr/share/javascript/jquery/jquery.min.js"></script>
-         <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/d3/3.4.6/d3.min.js"></script>
--        <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/js/bootstrap.min.js"></script>
-+        <script type="text/javascript" src="file://usr/share/javascript/bootstrap/js/bootstrap.min.js"></script>
-         <script type="text/javascript" src="http://cpettitt.github.io/project/dagre-d3/v0.1.5/dagre-d3.js"></script>
-         <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.min.js"></script>
--        <link rel="stylesheet" type="text/css" href="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/css/bootstrap.min.css"/>
-+        <link rel="stylesheet" type="text/css" href="file://usr/share/javascript/bootstrap/css/bootstrap.min.css"/>
-         <link rel="stylesheet" type="text/css" href="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.min.css"/>
-         <style>
-         body {
diff --git a/debian/patches/0003-Use-debian-s-mathjax-package.patch b/debian/patches/0003-Use-debian-s-mathjax-package.patch
index 2f7d9cc..2782ab2 100644
--- a/debian/patches/0003-Use-debian-s-mathjax-package.patch
+++ b/debian/patches/0003-Use-debian-s-mathjax-package.patch
@@ -1,10 +1,13 @@
 From: Kevin Murray <spam at kdmurray.id.au>
-Date: Tue, 15 Sep 2015 21:31:21 +1000
-Subject: Use debian's mathjax package
+Date: Mon, 14 Sep 2015 00:12:40 +1000
+Subject: Use local javascript/css as appropriate j
 
+
+Use debian's mathjax package
 ---
- docs/conf.py | 3 +++
- 1 file changed, 3 insertions(+)
+ docs/conf.py       | 3 +++
+ snakemake/gui.html | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/docs/conf.py b/docs/conf.py
 index 528b9f9..382744e 100644
@@ -20,3 +23,22 @@ index 528b9f9..382744e 100644
  # Add any paths that contain templates here, relative to this directory.
  templates_path = ['_templates']
  
+diff --git a/snakemake/gui.html b/snakemake/gui.html
+index 22ad7af..3010462 100644
+--- a/snakemake/gui.html
++++ b/snakemake/gui.html
+@@ -1,11 +1,11 @@
+ <html>
+     <head>
+-        <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
++        <script type="text/javascript" src="file://usr/share/javascript/jquery/jquery.min.js"></script>
+         <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/d3/3.4.6/d3.min.js"></script>
+-        <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/js/bootstrap.min.js"></script>
++        <script type="text/javascript" src="file://usr/share/javascript/bootstrap/js/bootstrap.min.js"></script>
+         <script type="text/javascript" src="http://cpettitt.github.io/project/dagre-d3/v0.1.5/dagre-d3.js"></script>
+         <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.min.js"></script>
+-        <link rel="stylesheet" type="text/css" href="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.1.1/css/bootstrap.min.css"/>
++        <link rel="stylesheet" type="text/css" href="file://usr/share/javascript/bootstrap/css/bootstrap.min.css"/>
+         <link rel="stylesheet" type="text/css" href="http://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.min.css"/>
+         <style>
+         body {
diff --git a/debian/patches/series b/debian/patches/series
index e4b7845..3f89150 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-Use-the-inbuild-sphinx.ext.napoleon.patch
-0002-Use-local-javascript-css-as-appropriate.patch
 0003-Use-debian-s-mathjax-package.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/snakemake.git

