[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 4167ca3bca1d7ef8e6051cd27397477d5cd78401
Merge: a314871 b86901a
Author: Brian May <bam at debian.org>
Date:   Sat Jan 23 17:52:26 2016 +1100

    merge patched into master

 CHANGELOG.md                                       | 204 +++++++++++++++++++++
 PKG-INFO                                           |   2 +-
 ajax_select/__init__.py                            |   2 +-
 ajax_select/fields.py                              |   8 +-
 ajax_select/static/ajax_select/js/ajax_select.js   |  12 +-
 debian/.git-dpm                                    |   6 +-
 .../0001-Remove-upstream-s-bootstrap.js.patch      |   4 +-
 django_ajax_selects.egg-info/PKG-INFO              |   2 +-
 django_ajax_selects.egg-info/SOURCES.txt           |   3 +-
 setup.py                                           |   2 +-
 tests/test_admin.py                                |   0
 tests/test_fields.py                               |   8 +
 tests/test_lookup_channel.py                       |   0
 13 files changed, 237 insertions(+), 16 deletions(-)

diff --cc debian/.git-dpm
index f8d5e18,0000000..295ca1d
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
- 58706a976a9dc80dc25d0e361140237fee1a4ac5
- 58706a976a9dc80dc25d0e361140237fee1a4ac5
- 42c6a83029fbb3204cdc18f1683c8df48ae8ed5f
++b86901aa48e055b19dbd4eb98cd01080c1d88df0
++b86901aa48e055b19dbd4eb98cd01080c1d88df0
++fc9a3efbbe762d0c8e73d6fd7147cb6b1dd51e16
 +fc9a3efbbe762d0c8e73d6fd7147cb6b1dd51e16
 +django-ajax-selects_1.4.2.orig.tar.gz
 +a874aee7c016c350e1771e2a35b503484e13ff6d
 +36720
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-upstream-s-bootstrap.js.patch
index 9cb01c9,0000000..795c41d
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 58706a976a9dc80dc25d0e361140237fee1a4ac5 Mon Sep 17 00:00:00 2001
++From b86901aa48e055b19dbd4eb98cd01080c1d88df0 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 a50317e..d848b07 100644
++index 5056426..d76921e 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