[Python-modules-commits] r33414 - in packages/python-werkzeug/trunk/debian (10 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Mon Jul 20 19:43:29 UTC 2015
Date: Monday, July 20, 2015 @ 19:43:28
Author: piotr
Revision: 33414
* New upstream release (closes: 792802)
- drop no longer needed 13218de4.patch and 0bad0c25.patch
- add missing docs/_themes to the upstream tarball
* Remove ubuntu.ttf, jquery.js and Werkzeug.egg-info via Files-Excluded in
debian/copyright (egg-info one closes: 671254)
* debian/watch: user pypi.debian.net redirector
* debian/rules: remove no longer needed get-orig-source and use
debian/python{3,}-werkzeug.links files instead of override_dh_python
* Replace Noah with DPMT in Maintainer (thanks Noah for all your work)
* Standards-Version bumped to 3.9.6 (no changes needed)
Added:
packages/python-werkzeug/trunk/debian/python-werkzeug.links
packages/python-werkzeug/trunk/debian/python3-werkzeug.links
Modified:
packages/python-werkzeug/trunk/debian/changelog
packages/python-werkzeug/trunk/debian/control
packages/python-werkzeug/trunk/debian/copyright
packages/python-werkzeug/trunk/debian/patches/series
packages/python-werkzeug/trunk/debian/rules
packages/python-werkzeug/trunk/debian/watch
Deleted:
packages/python-werkzeug/trunk/debian/patches/0bad0c25.patch
packages/python-werkzeug/trunk/debian/patches/13218de4.patch
Modified: packages/python-werkzeug/trunk/debian/changelog
===================================================================
--- packages/python-werkzeug/trunk/debian/changelog 2015-07-20 19:29:36 UTC (rev 33413)
+++ packages/python-werkzeug/trunk/debian/changelog 2015-07-20 19:43:28 UTC (rev 33414)
@@ -1,3 +1,18 @@
+python-werkzeug (0.10.4+dfsg1-1) unstable; urgency=medium
+
+ * New upstream release (closes: 792802)
+ - drop no longer needed 13218de4.patch and 0bad0c25.patch
+ - add missing docs/_themes to the upstream tarball
+ * Remove ubuntu.ttf, jquery.js and Werkzeug.egg-info via Files-Excluded in
+ debian/copyright (egg-info one closes: 671254)
+ * debian/watch: user pypi.debian.net redirector
+ * debian/rules: remove no longer needed get-orig-source and use
+ debian/python{3,}-werkzeug.links files instead of override_dh_python
+ * Replace Noah with DPMT in Maintainer (thanks Noah for all your work)
+ * Standards-Version bumped to 3.9.6 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org> Mon, 20 Jul 2015 21:09:06 +0200
+
python-werkzeug (0.9.6+dfsg-1) unstable; urgency=medium
* New upstream release
Modified: packages/python-werkzeug/trunk/debian/control
===================================================================
--- packages/python-werkzeug/trunk/debian/control 2015-07-20 19:29:36 UTC (rev 33413)
+++ packages/python-werkzeug/trunk/debian/control 2015-07-20 19:43:28 UTC (rev 33414)
@@ -1,10 +1,9 @@
Source: python-werkzeug
Section: python
Priority: optional
-Maintainer: Noah Slater <nslater at tumbolia.org>
-Uploaders: Piotr Ożarowski <piotr at debian.org>,
- Python Modules Packaging Team <python-modules-team at lists.alioth.debian.org>
-Standards-Version: 3.9.5
+Maintainer: Python Modules Packaging Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Piotr Ożarowski <piotr at debian.org>
+Standards-Version: 3.9.6
Build-Depends: debhelper (>= 9), dh-python, python-sphinx (>= 1.0.7+dfsg-1~),
python-all, python3-all,
python-setuptools (>= 0.6b3), python3-setuptools (>= 0.6b3),
Modified: packages/python-werkzeug/trunk/debian/copyright
===================================================================
--- packages/python-werkzeug/trunk/debian/copyright 2015-07-20 19:29:36 UTC (rev 33413)
+++ packages/python-werkzeug/trunk/debian/copyright 2015-07-20 19:43:28 UTC (rev 33414)
@@ -1,11 +1,12 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=180
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Werkzeug
-Upstream-Maintainer: Armin Ronacher <armin.ronacher at active-4.com>
+Upstream-Contact: Armin Ronacher <armin.ronacher at active-4.com>
Upstream-Source: http://werkzeug.pocoo.org/download
+Files-Excluded: ubuntu.ttf FONT_LICENSE werkzeug/debug/shared/jquery.js Werkzeug.egg-info
Files: *
-Copyright: Copyright 2009-2010, the Werkzeug Team
-License: BSD
+Copyright: Copyright 2009-2015, the Werkzeug Team
+License: BSD-3-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
@@ -40,33 +41,3 @@
Copying and distribution of this package, with or without modification, are
permitted in any medium without royalty provided the copyright notice and this
notice are preserved.
-
-Files: werkzeug/debug/shared/jquery.js
-Copyright: Copyright 2008, John Resig
-License: MIT | GPL-2
-
-License: MIT
- Copyright (c) 2008 John Resig, http://jquery.com/
- .
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-License: GPL-2
- On Debian systems the full text of the GNU General Public License (Version 2)
- can be found in the `/usr/share/common-licenses/GPL-2' file.
Deleted: packages/python-werkzeug/trunk/debian/patches/0bad0c25.patch
===================================================================
--- packages/python-werkzeug/trunk/debian/patches/0bad0c25.patch 2015-07-20 19:29:36 UTC (rev 33413)
+++ packages/python-werkzeug/trunk/debian/patches/0bad0c25.patch 2015-07-20 19:43:28 UTC (rev 33414)
@@ -1,24 +0,0 @@
-# taken from commit 0bad0c25f7d04da98328907d1c94a9b72fe57c57
-# Author: Daniel Neuhäuser <dasdasich at gmail.com>
-# Date: Tue Sep 3 20:42:42 2013 +0200
-#
-# Use maxsize in generate_adhoc_ssl_pair
-#
-# maxint is not available on Python 3.x because integers have no maximum
-# size on 3.x.
-#
-# The test I added fails because of a bug in pyopenssl.
-
-diff --git a/werkzeug/serving.py b/werkzeug/serving.py
-index 2fb8660..43c4c71 100644
---- a/werkzeug/serving.py
-+++ b/werkzeug/serving.py
-@@ -277,7 +277,7 @@ def generate_adhoc_ssl_pair(cn=None):
- cn = '*'
-
- cert = crypto.X509()
-- cert.set_serial_number(int(random() * sys.maxint))
-+ cert.set_serial_number(int(random() * sys.maxsize))
- cert.gmtime_adj_notBefore(0)
- cert.gmtime_adj_notAfter(60 * 60 * 24 * 365)
-
Deleted: packages/python-werkzeug/trunk/debian/patches/13218de4.patch
===================================================================
--- packages/python-werkzeug/trunk/debian/patches/13218de4.patch 2015-07-20 19:29:36 UTC (rev 33413)
+++ packages/python-werkzeug/trunk/debian/patches/13218de4.patch 2015-07-20 19:43:28 UTC (rev 33414)
@@ -1,47 +0,0 @@
-commit 13218deae25b6ee77d8dbab8af98ff1d38712ae4
-Author: Daniel Neuhäuser <dasdasich at gmail.com>
-Date: Fri Mar 21 21:45:41 2014 +0100
-
- Fix #502
-
- The code so far made far too many assumptions about the format used by
- pickle, the changes introduced by PEP 3154 finally caused this to become
- a real issue. This changes the code to make no assumptions about the
- representation whatsoever, making it work with protocol 4, all future
- protocols.
-
-diff --git a/werkzeug/testsuite/datastructures.py b/werkzeug/testsuite/datastructures.py
-index 28441ea..fdbda45 100644
---- a/werkzeug/testsuite/datastructures.py
-+++ b/werkzeug/testsuite/datastructures.py
-@@ -64,16 +64,26 @@ class MutableMultiDictBaseTestCase(WerkzeugTestCase):
- def test_pickle(self):
- cls = self.storage_class
-
-- for protocol in range(pickle.HIGHEST_PROTOCOL + 1):
-- d = cls()
-+ def create_instance(module=None):
-+ if module is None:
-+ d = cls()
-+ else:
-+ old = cls.__module__
-+ cls.__module__ = module
-+ d = cls()
-+ cls.__module__ = old
- d.setlist(b'foo', [1, 2, 3, 4])
- d.setlist(b'bar', b'foo bar baz'.split())
-+ return d
-+
-+ for protocol in range(pickle.HIGHEST_PROTOCOL + 1):
-+ d = create_instance()
- s = pickle.dumps(d, protocol)
- ud = pickle.loads(s)
- self.assert_equal(type(ud), type(d))
- self.assert_equal(ud, d)
-- self.assert_equal(pickle.loads(
-- s.replace(b'werkzeug.datastructures', b'werkzeug')), d)
-+ alternative = pickle.dumps(create_instance('werkzeug'), protocol)
-+ self.assert_equal(pickle.loads(alternative), d)
- ud[b'newkey'] = b'bla'
- self.assert_not_equal(ud, d)
-
Modified: packages/python-werkzeug/trunk/debian/patches/series
===================================================================
--- packages/python-werkzeug/trunk/debian/patches/series 2015-07-20 19:29:36 UTC (rev 33413)
+++ packages/python-werkzeug/trunk/debian/patches/series 2015-07-20 19:43:28 UTC (rev 33414)
@@ -1,3 +1 @@
drop_ubuntu_font.patch
-13218de4.patch
-0bad0c25.patch
Added: packages/python-werkzeug/trunk/debian/python-werkzeug.links
===================================================================
--- packages/python-werkzeug/trunk/debian/python-werkzeug.links (rev 0)
+++ packages/python-werkzeug/trunk/debian/python-werkzeug.links 2015-07-20 19:43:28 UTC (rev 33414)
@@ -0,0 +1 @@
+/usr/share/javascript/jquery/jquery.js /usr/lib/python2.7/dist-packages/werkzeug/debug/shared/jquery.js
Added: packages/python-werkzeug/trunk/debian/python3-werkzeug.links
===================================================================
--- packages/python-werkzeug/trunk/debian/python3-werkzeug.links (rev 0)
+++ packages/python-werkzeug/trunk/debian/python3-werkzeug.links 2015-07-20 19:43:28 UTC (rev 33414)
@@ -0,0 +1 @@
+/usr/share/javascript/jquery/jquery.js /usr/lib/python3/dist-packages/werkzeug/debug/shared/jquery.js
Modified: packages/python-werkzeug/trunk/debian/rules
===================================================================
--- packages/python-werkzeug/trunk/debian/rules 2015-07-20 19:29:36 UTC (rev 33413)
+++ packages/python-werkzeug/trunk/debian/rules 2015-07-20 19:43:28 UTC (rev 33414)
@@ -6,8 +6,7 @@
# permitted in any medium without royalty provided the copyright notice and this
# notice are preserved.
-export PYBUILD_DESTDIR_python2=debian/python-werkzeug/
-export PYBUILD_DESTDIR_python3=debian/python3-werkzeug/
+export PYBUILD_NAME=werkzeug
%:
dh $@ --with python2,python3,sphinxdoc --buildsystem pybuild
@@ -28,25 +27,6 @@
dh_auto_install
make documentation
-override_dh_python2:
- dh_python2
- dh_link -p python-werkzeug /usr/share/javascript/jquery/jquery.js \
- /usr/share/pyshared/werkzeug/debug/shared/jquery.js
-
-override_dh_python3:
- dh_python3
- dh_link -p python3-werkzeug /usr/share/javascript/jquery/jquery.js \
- /usr/lib/python3/dist-packages/werkzeug/debug/shared/jquery.js
-
override_dh_fixperms:
find debian/ -name '*\.png' -exec chmod -x '{}' \;
dh_fixperms
-
-get-orig-source:
- trap 'rm -rf $(CURDIR)/.werkzeug-tarball' EXIT;\
- VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-+]+).*,\1,p') &&\
- mkdir -p .werkzeug-tarball &&\
- uscan --force-download --rename --destdir=.werkzeug-tarball --upstream-version=$$VER &&\
- cd .werkzeug-tarball &&\
- tar xf python-werkzeug*tar.gz --exclude ubuntu.ttf --exclude FONT_LICENSE &&\
- tar Jcf ../python-werkzeug_$$VER+dfsg.orig.tar.xz Werkzeug-$$VER
Modified: packages/python-werkzeug/trunk/debian/watch
===================================================================
--- packages/python-werkzeug/trunk/debian/watch 2015-07-20 19:29:36 UTC (rev 33413)
+++ packages/python-werkzeug/trunk/debian/watch 2015-07-20 19:43:28 UTC (rev 33414)
@@ -1,3 +1,3 @@
version=3
-opts=dversionmangle=s/\+dfsg// \
-http://pypi.python.org/packages/source/W/Werkzeug/Werkzeug-(.*)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/,dversionmangle=s/\+dfsg\d*$//,repacksuffix=+dfsg1 \
+http://pypi.debian.net/Werkzeug/Werkzeug-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
More information about the Python-modules-commits
mailing list