[Python-modules-commits] [django-ajax-selects] 02/04: 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 3a5edb6cf59b16b116203e2fb081b2ac1872057e
Merge: ba8ccee 58706a9
Author: Brian May <bam at debian.org>
Date:   Tue Dec 15 16:41:17 2015 +1100

    merge patched into master

 ajax_select/fields.py                              | 10 +---
 ajax_select/static/ajax_select/js/bootstrap.js     |  7 ---
 debian/.git-dpm                                    |  4 +-
 .../0001-Remove-upstream-s-bootstrap.js.patch      | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 5 files changed, 59 insertions(+), 18 deletions(-)

diff --cc debian/.git-dpm
index 7c21da2,0000000..63b173a
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
- 42c6a83029fbb3204cdc18f1683c8df48ae8ed5f
- 42c6a83029fbb3204cdc18f1683c8df48ae8ed5f
++58706a976a9dc80dc25d0e361140237fee1a4ac5
++58706a976a9dc80dc25d0e361140237fee1a4ac5
 +42c6a83029fbb3204cdc18f1683c8df48ae8ed5f
 +42c6a83029fbb3204cdc18f1683c8df48ae8ed5f
 +django-ajax-selects_1.4.1.orig.tar.gz
 +299070a45053e3203d4f8efd62f145bf7fd86a7c
 +33071
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-upstream-s-bootstrap.js.patch
index 0000000,0000000..9cb01c9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-upstream-s-bootstrap.js.patch
@@@ -1,0 -1,0 +1,55 @@@
++From 58706a976a9dc80dc25d0e361140237fee1a4ac5 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
++--- 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" />');
++-}
diff --cc debian/patches/series
index 0000000,0000000..d5be0c8
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-upstream-s-bootstrap.js.patch

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