Package: src:python-weberror Followup-For: Bug #735237 Hello,
Here is a simple patch that should fix the bug. >From the changelog: * Add patch to remove embedded minified JS (Closes: #735237) * Bump Standards-Version to 3.9.5 (no changes needed) * Add Pybuild dependencies * Install evaldemo.py example Bye, Federico -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (600, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 3.13-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
>From 5926d995133d15fcf6606f7cd0cdca54c002c6d1 Mon Sep 17 00:00:00 2001 From: Federico Ceratto <federico.cera...@gmail.com> Date: Mon, 21 Apr 2014 19:37:36 +0100 Subject: [PATCH 1/1] Patch --- debian/changelog | 6 ++++++ debian/control | 8 +++++--- ...001-Remove-embedded-and-minified-JS-files.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + debian/python-weberror.examples | 1 + debian/python-weberror.links | 1 + debian/rules | 11 +++++------ 7 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 debian/patches/0001-Remove-embedded-and-minified-JS-files.patch create mode 100644 debian/patches/series create mode 100644 debian/python-weberror.examples create mode 100644 debian/python-weberror.links diff --git a/debian/changelog b/debian/changelog index 9026481..d08a8f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,12 @@ python-weberror (0.10.3-2) UNRELEASED; urgency=low * Bump debhelper version to 9 * debian/rules: Use dh + [ Federico Ceratto ] + * Add patch to remove embedded minified JS (Closes: #735237) + * Bump Standards-Version to 3.9.5 (no changes needed) + * Add Pybuild dependencies + * Install evaldemo.py example + -- Jackson Doak <nosk...@ubuntu.com> Fri, 28 Feb 2014 19:34:24 +1100 python-weberror (0.10.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 8129841..6c665f3 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,12 @@ Section: python Priority: optional Maintainer: Debian Python Modules Team <python-modules-t...@lists.alioth.debian.org> Uploaders: Christoph Haas <h...@debian.org>, Piotr Ożarowski <pi...@debian.org> -Build-Depends: debhelper (>= 9) +Build-Depends: debhelper (>= 9~) Build-Depends-Indep: python (>= 2.3.3), python-setuptools (>= 0.6b3-1~), + dh-python, python-all, python-paste (>= 1.7.1), python-webob, python-tempita, python-pygments, python-nose, python-webtest -Standards-Version: 3.9.2 +Standards-Version: 3.9.5 X-Python-Version: >= 2.4 Homepage: http://pypi.python.org/pypi/WebError Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-weberror/trunk/ @@ -17,7 +18,8 @@ Package: python-weberror Architecture: all Depends: ${python:Depends}, ${misc:Depends}, python-paste (>= 1.7.1), python-pastedeploy, python-pkg-resources, - python (>= 2.6) | python-simplejson + python (>= 2.6) | python-simplejson, + libjs-jquery Description: Python web error handling and exception catching module This Python module provides error handling and exception catching functionality for WSGI web applications. It is primarily used by Pylons diff --git a/debian/patches/0001-Remove-embedded-and-minified-JS-files.patch b/debian/patches/0001-Remove-embedded-and-minified-JS-files.patch new file mode 100644 index 0000000..ada5454 --- /dev/null +++ b/debian/patches/0001-Remove-embedded-and-minified-JS-files.patch @@ -0,0 +1,22 @@ +From: Federico Ceratto <federico.cera...@gmail.com> +Date: Sun, 16 Mar 2014 12:47:38 +0000 +Subject: Remove embedded and minified JS files. + +--- + weberror/eval_template.html | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/weberror/eval_template.html b/weberror/eval_template.html +index cdb772a..47e2d1d 100644 +--- a/weberror/eval_template.html ++++ b/weberror/eval_template.html +@@ -96,7 +96,8 @@ + <div class="hr"><hr class="clear" /></div> + </div> + <!-- Footer --> +- <script type="text/javascript" src="{{prefix}}/media/jquery-1.2.3.pack.js"></script> ++ <script type="text/javascript" src="{{prefix}}/media/jquery.js"></script> ++ <script type="text/javascript" src="{{prefix}}/media/jquery.scrollTo.js"></script> + <script type="text/javascript" src="{{prefix}}/media/debug.js"></script> + <div id="footer">{{footer_html|html}}</div> + </body> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..31ac228 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Remove-embedded-and-minified-JS-files.patch diff --git a/debian/python-weberror.examples b/debian/python-weberror.examples new file mode 100644 index 0000000..9204d39 --- /dev/null +++ b/debian/python-weberror.examples @@ -0,0 +1 @@ +tests/evaldemo.py diff --git a/debian/python-weberror.links b/debian/python-weberror.links new file mode 100644 index 0000000..5d7a136 --- /dev/null +++ b/debian/python-weberror.links @@ -0,0 +1 @@ +usr/share/javascript/jquery/jquery.min.js usr/share/pyshared/weberror/eval-media/jquery.js diff --git a/debian/rules b/debian/rules index 7dd0870..6915d11 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,12 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 +export DH_VERBOSE=1 +package=python-weberror override_dh_clean: rm -rf build build-* tests/reporter_output/test_logger.log find . -name *\.py[co] -exec rm -f {} \; dh_clean install-stamp test-stamp install-python* -# python$* setup.py install \ -# --install-layout=deb \ -# --single-version-externally-managed \ -# --root $(CURDIR)/debian/$(package) override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) @@ -22,6 +19,8 @@ override_dh_installchangelogs: override_dh_auto_install: find debian/*/ -type f -perm 755 | xargs -r chmod 644 dh_auto_install + find debian/python-weberror -name jquery-1.2.1.min.js -delete + find debian/python-weberror -name jquery-1.2.3.pack.js -delete %: - dh $@ --with python2 --buildsystem=pybuild \ No newline at end of file + dh $@ --with python2 --buildsystem=pybuild -- 1.9.2
