[Python-modules-commits] [django-guardian] 14/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 c346e6630cc217ec023986f0026502688aec79e1
Merge: c128523 7361b9c
Author: Brian May <bam at debian.org>
Date:   Sat Nov 14 14:22:38 2015 +1100

    merge patched into master

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

diff --cc debian/.git-dpm
index 4099f75,0000000..33030da
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
- af21cb55fa412df15a80e4f9f4abc33c75e86a6b
- af21cb55fa412df15a80e4f9f4abc33c75e86a6b
++7361b9c49e539c5959df0b28542733ab9f733c1c
++7361b9c49e539c5959df0b28542733ab9f733c1c
 +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 a067dd8,0000000..d980c51
mode 100644,000000..100644
--- a/debian/patches/0003-Use-local-js-files.patch
+++ b/debian/patches/0003-Use-local-js-files.patch
@@@ -1,36 -1,0 +1,36 @@@
- From af21cb55fa412df15a80e4f9f4abc33c75e86a6b Mon Sep 17 00:00:00 2001
++From 7361b9c49e539c5959df0b28542733ab9f733c1c 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 +-
 + 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
++index 87337a9..57ad31c 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>
+++  <script src="{{ pathto('_static/modernizr.min.js', 1) }}"></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