[Python-modules-commits] [django-assets] 12/17: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository django-assets.

commit 11f04dc91936565d0c30b5e373f338c77662da61
Merge: 2977df5 e2a0303
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Aug 29 10:05:08 2016 +0200

    merge patched into master

 debian/.git-dpm                           | 6 +++---
 debian/patches/01-webassets_version.patch | 2 +-
 debian/patches/02-intersphinx.patch       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index ea1936e,0000000..e364104
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
- e92257594568b53f716b6ae333f535282050a4fd
- e92257594568b53f716b6ae333f535282050a4fd
- 7720f1113291e2a8fa283ecdf6a4849a17b45212
++e2a0303b2786633d25c2010766a5ae8c0c6aaf64
++e2a0303b2786633d25c2010766a5ae8c0c6aaf64
++60ed4cc3289f12435e7dd78cbf4c67f01735bb17
 +60ed4cc3289f12435e7dd78cbf4c67f01735bb17
 +django-assets_0.12.orig.tar.gz
 +fc58d8b93ef3ac8cc283eed47e8968f427cf5bb5
 +29325
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/01-webassets_version.patch
index 6b6fc97,0000000..a4155c7
mode 100644,000000..100644
--- a/debian/patches/01-webassets_version.patch
+++ b/debian/patches/01-webassets_version.patch
@@@ -1,29 -1,0 +1,29 @@@
- From 1f548e809869bcafa902c661a276540ac7318e74 Mon Sep 17 00:00:00 2001
++From d44bd2abbb21bcddc9cdad78af9a7a2112b52384 Mon Sep 17 00:00:00 2001
 +From: Mcihael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 08:49:20 -0700
 +Subject: loosen up dependency on webassets
 +
 + Upstream uses a strict versioned dependency on webassets-library which is
 + unnecessary. This patch loosens up this dependency to also allow newer versions
 + of webassets.
 +Last-Update: 2014-09-09
 +Forwarded: no
 +
 +Patch-Name: 01-webassets_version.patch
 +---
 + setup.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
 +index 206458a..07a9ca0 100755
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -42,7 +42,7 @@ setup(
 +     platforms='any',
 +     install_requires=[
 +         'Django>=1.7',
 +-        'webassets%s' % webassets_version
 ++        'webassets>=%s' % webassets_version
 +         ],
 +     classifiers=[
 +         'Environment :: Web Environment',
diff --cc debian/patches/02-intersphinx.patch
index 52daa66,0000000..355908a
mode 100644,000000..100644
--- a/debian/patches/02-intersphinx.patch
+++ b/debian/patches/02-intersphinx.patch
@@@ -1,46 -1,0 +1,46 @@@
- From e92257594568b53f716b6ae333f535282050a4fd Mon Sep 17 00:00:00 2001
++From e2a0303b2786633d25c2010766a5ae8c0c6aaf64 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 08:49:21 -0700
 +Subject: use local objects.inv where possible
 +
 + Upstream uses intersphinx mappings that fetch the objects.inv for python
 + and webassets by HTTP from a remote host. Using the local objects.inv from
 + python and webassets enables the package to build without network connection.
 +Forwarded: not-needed
 +Last-Update: 2015-06-24
 +
 +Patch-Name: 02-intersphinx.patch
 +---
 + docs/conf.py | 19 +++++++++++++++----
 + 1 file changed, 15 insertions(+), 4 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index d0bf13d..ab26a53 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -251,10 +251,21 @@ texinfo_documents = [
 + 
 + WEBASSETS_DOC_URL = 'http://elsdoerfer.name/docs/webassets/'
 + 
 +-intersphinx_mapping = {
 +-    'python': ('http://docs.python.org/', None),
 +-    'webassets': (WEBASSETS_DOC_URL, None),
 +-}
 ++def check_object_path(key, url, path):
 ++    if os.path.isfile(path):
 ++        return {key: (url, path)}
 ++    return {}
 ++
 ++intersphinx_mapping = {}
 ++intersphinx_mapping.update(check_object_path('python',
 ++                                            'http://docs.python.org/',
 ++                                            '/usr/share/doc/python'
 ++                                              + '.'.join([str(x) for x in sys.version_info[0:2]])
 ++                                              + '/html/objects.inv'))
 ++intersphinx_mapping.update(check_object_path('webassets',
 ++                                             WEBASSETS_DOC_URL,
 ++                                             '/usr/share/doc/python-webassets-doc/html/objects.inv'))
 ++
 + 
 + extlinks = {'webassets': (WEBASSETS_DOC_URL+'%s.html', None)}
 + 

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