[Python-modules-commits] [python-mongoengine] 10/13: merge patched into master

[Orestis Ioannou]

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

oorestisime-guest pushed a commit to branch master
in repository python-mongoengine.

commit f10d42fc16da06a468f61b3b633fa6e1afd2addc
Merge: 5893ad9 3e6eec8
Author: Orestis Ioannou <orestis at oioannou.com>
Date:   Wed Mar 9 01:55:11 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-local-modernizr.js-than-the-one-from-cdn.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/_themes/sphinx_rtd_theme/layout.html          |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index e8882b7,0000000..179e2c0
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
- dee8f65c630add7886c28ec95948712fcdc6c620
- dee8f65c630add7886c28ec95948712fcdc6c620
++3e6eec8392a208b1284dab6c988b1f64c354f630
++3e6eec8392a208b1284dab6c988b1f64c354f630
 +dee8f65c630add7886c28ec95948712fcdc6c620
 +dee8f65c630add7886c28ec95948712fcdc6c620
 +python-mongoengine_0.10.6.orig.tar.gz
 +a3080adf1e4e9ad6756a4c08f1219044d1ae5150
 +346293
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-local-modernizr.js-than-the-one-from-cdn.patch
index 0000000,0000000..f98086d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-local-modernizr.js-than-the-one-from-cdn.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 3e6eec8392a208b1284dab6c988b1f64c354f630 Mon Sep 17 00:00:00 2001
++From: Orestis Ioannou <orestis at oioannou.com>
++Date: Wed, 9 Mar 2016 01:55:04 +0100
++Subject: Use local modernizr.js than the one from cdn
++
++---
++ docs/_themes/sphinx_rtd_theme/layout.html | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/_themes/sphinx_rtd_theme/layout.html b/docs/_themes/sphinx_rtd_theme/layout.html
++index febe8eb..92089c6 100755
++--- a/docs/_themes/sphinx_rtd_theme/layout.html
+++++ b/docs/_themes/sphinx_rtd_theme/layout.html
++@@ -89,7 +89,7 @@
++   {%- endblock %}
++   {%- block extrahead %} {% endblock %}
++ 
++-  <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
+++  <script src="static/js/modernizr.min.js"></script>
++ 
++ </head>
++ 
diff --cc debian/patches/series
index 0000000,0000000..9f070e0
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-local-modernizr.js-than-the-one-from-cdn.patch

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