[Python-modules-commits] [django-guardian] 09/14: merge patched into master

[Brian May]

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

bam pushed a commit to branch master
in repository django-guardian.

commit 8893487c20b24502d85b92670b9b520bdc74c80d
Merge: f3af431 a5e64b4
Author: Brian May <bam at debian.org>
Date:   Sat Nov 14 14:02:15 2015 +1100

    merge patched into master

 debian/.git-dpm                              |  4 ++--
 debian/patches/0003-Use-local-js-files.patch | 22 ++++++++++++++++++++++
 debian/patches/series                        |  1 +
 docs/theme/rtd_theme/layout.html             |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 97bb686,0000000..9a27567
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 996cf54251e656f895e80819a2634d8a8f394a06
- 996cf54251e656f895e80819a2634d8a8f394a06
++a5e64b4471deef175531b9293ae25e69ad9cfd05
++a5e64b4471deef175531b9293ae25e69ad9cfd05
 +5f8470ff0f7419b67905b358555e1777f072f409
 +5f8470ff0f7419b67905b358555e1777f072f409
 +django-guardian_1.3.2.orig.tar.gz
 +d352603d13f24b978081dad9de712e0b9e3c4401
 +352416
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Use-local-js-files.patch
index 0000000,0000000..4b1f242
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Use-local-js-files.patch
@@@ -1,0 -1,0 +1,22 @@@
++From a5e64b4471deef175531b9293ae25e69ad9cfd05 Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Sat, 14 Nov 2015 14:02:06 +1100
++Subject: Use local js files.
++
++---
++ docs/theme/rtd_theme/layout.html | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/theme/rtd_theme/layout.html b/docs/theme/rtd_theme/layout.html
++index 87337a9..44a1f1a 100644
++--- a/docs/theme/rtd_theme/layout.html
+++++ b/docs/theme/rtd_theme/layout.html
++@@ -85,7 +85,7 @@
++   {%- endblock %}
++   {%- block extrahead %} {% endblock %}
++ 
++-  <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
+++  <script src="_static/modernizr.min.js"></script>
++ 
++ </head>
++ 
diff --cc debian/patches/series
index a9a1181,0000000..2f685b5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Append-uncompressed-JavaScript-libraries.patch
 +0002-Remove-nonlocal-image-for-Travis-ci.patch
++0003-Use-local-js-files.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-guardian.git