[r-cran-markdown] 10/11: Replace URL to Rlogo.jpg by local copy
Andreas Tille
tille at debian.org
Tue Oct 24 09:15:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-markdown.
commit 0c95f55ed03119ee9ea626b0ae44dc81c3f1e00b
Author: Andreas Tille <tille at debian.org>
Date: Tue Oct 24 10:44:05 2017 +0200
Replace URL to Rlogo.jpg by local copy
---
debian/changelog | 1 +
debian/install | 1 +
debian/patches/privacy_breach_fix_rlogo.patch | 287 ++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rlogo/Rlogo.jpg | Bin 0 -> 15985 bytes
debian/rlogo/get_logo | 1 +
debian/source/include-binaries | 1 +
7 files changed, 292 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 38f0888..8afde1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ r-cran-markdown (0.8-1) UNRELEASED; urgency=medium
* Convert packaging from cdbs to dh-r
* Standards-Version: 4.1.1
* Canonical homepage for CRAN packages
+ * Replace URL to Rlogo.jpg by local copy
-- Andreas Tille <tille at debian.org> Tue, 24 Oct 2017 10:12:41 +0200
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..68799ae
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+debian/rlogo/Rlogo.jpg usr/lib/R/site-library/markdown/html
diff --git a/debian/patches/privacy_breach_fix_rlogo.patch b/debian/patches/privacy_breach_fix_rlogo.patch
new file mode 100644
index 0000000..e19f47a
--- /dev/null
+++ b/debian/patches/privacy_breach_fix_rlogo.patch
@@ -0,0 +1,287 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 24 Oct 2017 10:12:41 +0200
+Description: Replace URL to Rlogo.jpg by local copy
+
+--- a/inst/doc/markdown-examples.html
++++ b/inst/doc/markdown-examples.html
+@@ -392,11 +392,11 @@ cat(markdownToHTML(text = "2^10&quo
+ tOpt <- "fragment_only"
+
+ # skip_html example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ </code></pre>
+
+-<pre><code>## <p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<pre><code>## <p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+ </code></pre>
+
+ <pre><code class="r">cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+@@ -409,20 +409,20 @@ cat(markdownToHTML(text = mkd, options =
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ </code></pre>
+
+-<pre><code>## <p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<pre><code>## <p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+ </code></pre>
+
+ <pre><code class="r">cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_style")))
+ </code></pre>
+
+-<pre><code>## <p><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<pre><code>## <p><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+ </code></pre>
+
+ <pre><code class="r"># skip_images example
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ </code></pre>
+
+-<pre><code>## <p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<pre><code>## <p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+ </code></pre>
+
+ <pre><code class="r">cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_images")))
+@@ -435,13 +435,13 @@ cat(markdownToHTML(text = mkd, options =
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ </code></pre>
+
+-<pre><code>## <p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<pre><code>## <p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+ </code></pre>
+
+ <pre><code class="r">cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_links")))
+ </code></pre>
+
+-<pre><code>## <p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg">Hello</p>
++<pre><code>## <p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg">Hello</p>
+ </code></pre>
+
+ <pre><code class="r"># safelink example
+@@ -530,7 +530,7 @@ cat(markdownToHTML(text = "foo\nbar
+ </code></pre>
+
+ <pre><code class="r"># escape example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+ </code></pre>
+
+@@ -541,7 +541,7 @@ cat(markdownToHTML(text = mkd, options =
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html", "escape")))
+ </code></pre>
+
+-<pre><code>## <p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<pre><code>## <p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+ </code></pre>
+
+ <pre><code class="r"># smartypants example
+--- a/inst/doc/markdown-output.html
++++ b/inst/doc/markdown-output.html
+@@ -376,11 +376,11 @@ cat(markdownToHTML(text = "2^10&quo
+ tOpt <- "fragment_only"
+
+ # skip_html example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ </code></pre>
+
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ <pre><code class="r">cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+ </code></pre>
+@@ -391,18 +391,18 @@ cat(markdownToHTML(text = mkd, options =
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ </code></pre>
+
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ <pre><code class="r">cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_style")))
+ </code></pre>
+
+-<p><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ <pre><code class="r"># skip_images example
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ </code></pre>
+
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ <pre><code class="r">cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_images")))
+ </code></pre>
+@@ -413,12 +413,12 @@ cat(markdownToHTML(text = mkd, options =
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ </code></pre>
+
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ <pre><code class="r">cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_links")))
+ </code></pre>
+
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg">Hello</p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg">Hello</p>
+
+ <pre><code class="r"># safelink example
+ cat(markdownToHTML(text = '[foo](http://google.com "baz")', options = c(tOpt)))
+@@ -497,7 +497,7 @@ bar</p>
+ bar</p>
+
+ <pre><code class="r"># escape example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+ </code></pre>
+
+@@ -507,7 +507,7 @@ cat(markdownToHTML(text = mkd, options =
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html", "escape")))
+ </code></pre>
+
+-<p><style></style><img src=“http://cran.rstudio.com/Rlogo.jpg”><a href=“#”>Hello</a></p>
++<p><style></style><img src=“file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg”><a href=“#”>Hello</a></p>
+
+ <pre><code class="r"># smartypants example
+ cat(markdownToHTML(text = "1/2 (c)", options = c(tOpt)))
+--- a/man/markdownHTMLOptions.Rd
++++ b/man/markdownHTMLOptions.Rd
+@@ -104,7 +104,7 @@ options(markdown.HTML.options = markdown
+ tOpt <- "fragment_only"
+
+ # skip_html example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+
+@@ -139,7 +139,7 @@ cat(markdownToHTML(text = "foo\\nbar\\n"
+ cat(markdownToHTML(text = "foo\\nbar\\n", options = c(tOpt, "hard_wrap", "use_xhtml")))
+
+ # escape example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+ # overrides all 'skip_*' options
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html", "escape")))
+--- a/tests/tests.Rout.save
++++ b/tests/tests.Rout.save
+@@ -119,31 +119,31 @@ because there is no space between # and
+
+ > tOpt <- "fragment_only"
+
+-> mkd = "<style></style><img src=\"http://cran.rstudio.com/Rlogo.jpg\"><a href=\"#\">Hello</a>"
++> mkd = "<style></style><img src=\"file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg\"><a href=\"#\">Hello</a>"
+
+ > cat(markdownToHTML(text = mkd, options = c(tOpt)))
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ > cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+ <p>Hello</p>
+
+ > cat(markdownToHTML(text = mkd, options = c(tOpt)))
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ > cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_style")))
+-<p><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ > cat(markdownToHTML(text = mkd, options = c(tOpt)))
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ > cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_images")))
+ <p><style></style><a href="#">Hello</a></p>
+
+ > cat(markdownToHTML(text = mkd, options = c(tOpt)))
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ > cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_links")))
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg">Hello</p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg">Hello</p>
+
+ > cat(markdownToHTML(text = "[foo](http://google.com \"baz\")",
+ + options = c(tOpt)))
+@@ -208,14 +208,14 @@ bar</p>
+ <p>foo<br/>
+ bar</p>
+
+-> mkd = "<style></style><img src=\"http://cran.rstudio.com/Rlogo.jpg\"><a href=\"#\">Hello</a>"
++> mkd = "<style></style><img src=\"file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg\"><a href=\"#\">Hello</a>"
+
+ > cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+ <p>Hello</p>
+
+ > cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html",
+ + "escape")))
+-<p><style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a></p>
++<p><style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a></p>
+
+ > cat(markdownToHTML(text = "1/2 (c)", options = c(tOpt)))
+ <p>1/2 (c)</p>
+--- a/inst/doc/markdown-output.R
++++ b/inst/doc/markdown-output.R
+@@ -86,7 +86,7 @@ cat(markdownToHTML(text = "2^10", extens
+ tOpt <- "fragment_only"
+
+ # skip_html example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+
+@@ -121,7 +121,7 @@ cat(markdownToHTML(text = "foo\nbar\n",
+ cat(markdownToHTML(text = "foo\nbar\n", options = c(tOpt, "hard_wrap", "use_xhtml")))
+
+ # escape example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+ # overrides all 'skip_*' options
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html", "escape")))
+--- a/inst/examples/HTMLOptions.R
++++ b/inst/examples/HTMLOptions.R
+@@ -4,7 +4,7 @@
+ tOpt <- "fragment_only"
+
+ # skip_html example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+
+@@ -39,7 +39,7 @@ cat(markdownToHTML(text = "foo\nbar\n",
+ cat(markdownToHTML(text = "foo\nbar\n", options = c(tOpt, "hard_wrap", "use_xhtml")))
+
+ # escape example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+ # overrides all 'skip_*' options
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html", "escape")))
+--- a/inst/doc/markdown-examples.R
++++ b/inst/doc/markdown-examples.R
+@@ -86,7 +86,7 @@ cat(markdownToHTML(text = "2^10", extens
+ tOpt <- "fragment_only"
+
+ # skip_html example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt)))
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+
+@@ -121,7 +121,7 @@ cat(markdownToHTML(text = "foo\nbar\n",
+ cat(markdownToHTML(text = "foo\nbar\n", options = c(tOpt, "hard_wrap", "use_xhtml")))
+
+ # escape example
+-mkd = '<style></style><img src="http://cran.rstudio.com/Rlogo.jpg"><a href="#">Hello</a>'
++mkd = '<style></style><img src="file:///usr/lib/R/site-library/markdown/html/Rlogo.jpg"><a href="#">Hello</a>'
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html")))
+ # overrides all 'skip_*' options
+ cat(markdownToHTML(text = mkd, options = c(tOpt, "skip_html", "escape")))
diff --git a/debian/patches/series b/debian/patches/series
index c520659..e4b846f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
privacy_breach_fix.patch
+privacy_breach_fix_rlogo.patch
diff --git a/debian/rlogo/Rlogo.jpg b/debian/rlogo/Rlogo.jpg
new file mode 100644
index 0000000..b19e94a
Binary files /dev/null and b/debian/rlogo/Rlogo.jpg differ
diff --git a/debian/rlogo/get_logo b/debian/rlogo/get_logo
new file mode 100755
index 0000000..37495e5
--- /dev/null
+++ b/debian/rlogo/get_logo
@@ -0,0 +1 @@
+wget http://cran.rstudio.com/Rlogo.jpg
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..1764141
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/rlogo/Rlogo.jpg
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-markdown.git
More information about the debian-science-commits
mailing list