[Python-modules-commits] [django-guardian] 12/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 c1285239ff79ef3b07d85d526e20d2a395765623
Merge: 422f814 af21cb5
Author: Brian May <bam at debian.org>
Date:   Sat Nov 14 14:10:09 2015 +1100

    merge patched into master

 debian/.git-dpm                              |  4 ++--
 debian/patches/0003-Use-local-js-files.patch | 20 +++++++++++++++++---
 example_project/templates/base.html          |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 9a27567,0000000..4099f75
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
- a5e64b4471deef175531b9293ae25e69ad9cfd05
- a5e64b4471deef175531b9293ae25e69ad9cfd05
++af21cb55fa412df15a80e4f9f4abc33c75e86a6b
++af21cb55fa412df15a80e4f9f4abc33c75e86a6b
 +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 4b1f242,0000000..a067dd8
mode 100644,000000..100644
--- a/debian/patches/0003-Use-local-js-files.patch
+++ b/debian/patches/0003-Use-local-js-files.patch
@@@ -1,22 -1,0 +1,36 @@@
- From a5e64b4471deef175531b9293ae25e69ad9cfd05 Mon Sep 17 00:00:00 2001
++From af21cb55fa412df15a80e4f9f4abc33c75e86a6b 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(-)
++ docs/theme/rtd_theme/layout.html    | 2 +-
++ example_project/templates/base.html | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +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 --git a/example_project/templates/base.html b/example_project/templates/base.html
++index 9b774de..e3eda3a 100644
++--- a/example_project/templates/base.html
+++++ b/example_project/templates/base.html
++@@ -50,7 +50,7 @@
++             </div>
++             {% endblock %}
++         </div>
++-        <script src="http://code.jquery.com/jquery.js"></script>
+++        <script src="{{ STATIC_URL }}js/jquery.js"></script>
++         <script src="{{ STATIC_URL }}js/bootstrap.min.js"></script>
++     </body>
++ </html>

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