[Python-modules-commits] [django-ajax-selects] 04/05: 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-ajax-selects.

commit 1dbacda3c2aefa81c26fa1016c9f359a049e75a7
Merge: 5c1d6b7 40732d7
Author: Brian May <bam at debian.org>
Date:   Wed Apr 6 12:27:01 2016 +1000

    merge patched into master

 CHANGELOG.md                                          | 19 ++++++++++++++++---
 PKG-INFO                                              |  4 ++--
 README.md                                             |  3 ++-
 ajax_select/__init__.py                               |  2 +-
 ajax_select/fields.py                                 |  2 +-
 ajax_select/static/ajax_select/js/ajax_select.js      |  4 ++--
 debian/.git-dpm                                       |  6 +++---
 .../patches/0001-Remove-upstream-s-bootstrap.js.patch |  4 ++--
 django_ajax_selects.egg-info/PKG-INFO                 |  4 ++--
 requirements-test.txt                                 |  1 +
 requirements.txt                                      |  2 +-
 setup.cfg                                             |  2 +-
 setup.py                                              |  4 ++--
 13 files changed, 36 insertions(+), 21 deletions(-)

diff --cc debian/.git-dpm
index 14b9af9,0000000..09a5e83
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
- b86901aa48e055b19dbd4eb98cd01080c1d88df0
- b86901aa48e055b19dbd4eb98cd01080c1d88df0
- fc9a3efbbe762d0c8e73d6fd7147cb6b1dd51e16
++40732d7e8ec6d3e9c9326a96b24d77b4677f9b79
++40732d7e8ec6d3e9c9326a96b24d77b4677f9b79
++b0561185af8c5d9b2e6d82fd4e260db3e7a95383
 +b0561185af8c5d9b2e6d82fd4e260db3e7a95383
 +django-ajax-selects_1.4.3.orig.tar.gz
 +861c478ebf7a91abba8d17295162a0eb7a3082d7
 +36926
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-upstream-s-bootstrap.js.patch
index 795c41d,0000000..45f3d53
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-upstream-s-bootstrap.js.patch
+++ b/debian/patches/0001-Remove-upstream-s-bootstrap.js.patch
@@@ -1,55 -1,0 +1,55 @@@
- From b86901aa48e055b19dbd4eb98cd01080c1d88df0 Mon Sep 17 00:00:00 2001
++From 40732d7e8ec6d3e9c9326a96b24d77b4677f9b79 Mon Sep 17 00:00:00 2001
 +From: Brian May <bam at debian.org>
 +Date: Tue, 15 Dec 2015 16:18:04 +1100
 +Subject: Remove upstream's bootstrap.js
 +
 +Contains privacy invading URLs, and I can't think of a better solution.
 +
 +I raised issues I was having with lintian on debian-devel:
 +https://lists.debian.org/debian-devel/2015/11/msg00249.html
 +
 +Discussions are continuing this month:
 +https://lists.debian.org/debian-devel/2015/12/msg00011.html
 +
 +And on debian-python:
 +https://lists.debian.org/debian-python/2015/12/msg00009.html
 +---
 + ajax_select/fields.py                          | 10 +---------
 + ajax_select/static/ajax_select/js/bootstrap.js |  7 -------
 + 2 files changed, 1 insertion(+), 16 deletions(-)
 + delete mode 100644 ajax_select/static/ajax_select/js/bootstrap.js
 +
 +diff --git a/ajax_select/fields.py b/ajax_select/fields.py
- index 5056426..d76921e 100644
++index 15edda3..fc89fd4 100644
 +--- a/ajax_select/fields.py
 ++++ b/ajax_select/fields.py
 +@@ -22,15 +22,7 @@ as_default_help = 'Enter text to search.'
 + 
 + 
 + def _media(self):
 +-    # unless AJAX_SELECT_BOOTSTRAP == False
 +-    # then load jquery and jquery ui + default css
 +-    # where needed
 +-    js = ('ajax_select/js/bootstrap.js', 'ajax_select/js/ajax_select.js')
 +-    try:
 +-        if not settings.AJAX_SELECT_BOOTSTRAP:
 +-            js = ('ajax_select/js/ajax_select.js',)
 +-    except AttributeError:
 +-        pass
 ++    js = ('ajax_select/js/ajax_select.js', )
 +     return forms.Media(css={'all': ('ajax_select/css/ajax_select.css',)}, js=js)
 + 
 + 
 +diff --git a/ajax_select/static/ajax_select/js/bootstrap.js b/ajax_select/static/ajax_select/js/bootstrap.js
 +deleted file mode 100644
 +index f2f02d8..0000000
 +--- a/ajax_select/static/ajax_select/js/bootstrap.js
 ++++ /dev/null
 +@@ -1,7 +0,0 @@
 +-// load jquery and jquery-ui if needed
 +-// into window.jQuery
 +-if (typeof window.jQuery === 'undefined') {
 +-  document.write('<script type="text/javascript"  src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"><\/script><script type="text/javascript"  src="//code.jquery.com/ui/1.10.3/jquery-ui.js"><\/script><link type="text/css" rel="stylesheet" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />');
 +-} else if(typeof window.jQuery.ui === 'undefined' || typeof window.jQuery.ui.autocomplete === 'undefined') {
 +-  document.write('<script type="text/javascript"  src="//code.jquery.com/ui/1.10.3/jquery-ui.js"><\/script><link type="text/css" rel="stylesheet" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />');
 +-}

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