[Python-modules-commits] r33454 - in packages/pylons/trunk/debian (8 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Wed Jul 22 20:39:12 UTC 2015
Date: Wednesday, July 22, 2015 @ 20:39:11
Author: piotr
Revision: 33454
* New upstream release
* dont_use_removed_exception_attribute patch removed, applied upstream
* debian/rules uses now dh sequencer + pybuild build system
* debian/watch: use pypi.debian.net redirector
* Standards-Version bumped to 3.9.6 (no changes needed)
Modified:
packages/pylons/trunk/debian/changelog
packages/pylons/trunk/debian/compat
packages/pylons/trunk/debian/control
packages/pylons/trunk/debian/copyright
packages/pylons/trunk/debian/patches/series
packages/pylons/trunk/debian/rules
packages/pylons/trunk/debian/watch
Deleted:
packages/pylons/trunk/debian/patches/dont_use_removed_exception_attribute.patch
Modified: packages/pylons/trunk/debian/changelog
===================================================================
--- packages/pylons/trunk/debian/changelog 2015-07-22 19:55:18 UTC (rev 33453)
+++ packages/pylons/trunk/debian/changelog 2015-07-22 20:39:11 UTC (rev 33454)
@@ -1,3 +1,13 @@
+pylons (1.0.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * dont_use_removed_exception_attribute patch removed, applied upstream
+ * debian/rules uses now dh sequencer + pybuild build system
+ * debian/watch: use pypi.debian.net redirector
+ * Standards-Version bumped to 3.9.6 (no changes needed)
+
+ -- Piotr Ożarowski <piotr at debian.org> Wed, 22 Jul 2015 22:11:25 +0200
+
pylons (1.0.1-3) unstable; urgency=medium
* Replace the WebOb exception patch by a more complete one from
Modified: packages/pylons/trunk/debian/compat
===================================================================
--- packages/pylons/trunk/debian/compat 2015-07-22 19:55:18 UTC (rev 33453)
+++ packages/pylons/trunk/debian/compat 2015-07-22 20:39:11 UTC (rev 33454)
@@ -1 +1 @@
-5
+9
Modified: packages/pylons/trunk/debian/control
===================================================================
--- packages/pylons/trunk/debian/control 2015-07-22 19:55:18 UTC (rev 33453)
+++ packages/pylons/trunk/debian/control 2015-07-22 20:39:11 UTC (rev 33454)
@@ -3,22 +3,26 @@
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Piotr Ożarowski <piotr at debian.org>, Oleksandr Moskalenko <malex at debian.org>
-Build-Depends: debhelper (>= 5), dh-python
-Build-Depends-Indep: python-all (>= 2.6.6-3), python-setuptools
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), dh-python
+Build-Depends-Indep: python-all, python-setuptools,
+# tests:
+ python-coverage, python-routes,
+ python-paste (>= 1.7.5.1), python-pastedeploy (>= 1.5.0), python-pastescript (>= 1.7.4),
+ python-webob (>= 1.1.1), python-weberror (>= 0.10.3), python-webtest (>= 1.3.1),
+ python-beaker (>= 1.5.4), python-mako (>= 0.5.0), python-tempita (>= 0.5.1),
+ python-formencode (>= 1.2.4), python-webhelpers (>= 0.6.4), python-decorator (>= 3.3.2),
+ python-simplejson (>= 2.2.1), python-nose (>= 1.1.2), python-pkg-resources,
+ python-markupsafe (>= 0.15), python-jinja2, python-genshi (>= 0.6), python-cheetah (>= 1.0-1.1),
+ python-kid (>= 0.9.1-3), python-myghty (>= 1.1), python-pygments (>= 0.7),
+ python-migrate, python-docutils (>= 0.4)
+Standards-Version: 3.9.6
Homepage: http://pylonshq.com/
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pylons/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pylons/trunk/
Package: python-pylons
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-routes (>= 1.12.3),
- python-paste (>= 1.7.5.1), python-pastedeploy (>= 1.5.0), python-pastescript (>= 1.7.4),
- python-webob (>= 1.1.1), python-weberror (>= 0.10.3), python-webtest (>= 1.3.1),
- python-beaker (>= 1.5.4), python-mako (>= 0.5.0), python-tempita (>= 0.5.1),
- python-formencode (>= 1.2.4), python-webhelpers (>= 0.6.4), python-decorator (>= 3.3.2),
- python-simplejson (>= 2.2.1), python-nose (>= 1.1.2), python-pkg-resources,
- python-markupsafe (>= 0.15)
+Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources
Recommends: python-sqlalchemy (>= 0.5) | python-sqlobject
Suggests: python-jinja2, python-genshi (>= 0.6), python-cheetah (>= 1.0-1.1),
python-kid (>= 0.9.1-3), python-myghty (>= 1.1), python-pygments (>= 0.7),
Modified: packages/pylons/trunk/debian/copyright
===================================================================
--- packages/pylons/trunk/debian/copyright 2015-07-22 19:55:18 UTC (rev 33453)
+++ packages/pylons/trunk/debian/copyright 2015-07-22 20:39:11 UTC (rev 33454)
@@ -6,7 +6,7 @@
Upstream Authors: Ben Bangert <ben at groovie.org> and James Gardner
<james at 3aims.com>.
-Copyright (c) 2005-2009 Ben Bangert, James Gardner, Philip Jenvey
+Copyright (c) 2005-2015 Ben Bangert, James Gardner, Philip Jenvey
and contributors.
All rights reserved.
Deleted: packages/pylons/trunk/debian/patches/dont_use_removed_exception_attribute.patch
===================================================================
--- packages/pylons/trunk/debian/patches/dont_use_removed_exception_attribute.patch 2015-07-22 19:55:18 UTC (rev 33453)
+++ packages/pylons/trunk/debian/patches/dont_use_removed_exception_attribute.patch 2015-07-22 20:39:11 UTC (rev 33454)
@@ -1,50 +0,0 @@
-Author: Darren Yin <darren.yin at gmail.com>
-Date: Fri, 20 Aug 2014 01:56:08 -0700
-Description: WebOb 1.4 removed exception attribute; don't use it.
-
-diff --git a/pylons/controllers/util.py b/pylons/controllers/util.py
-index f9e0c4b..1cfd085 100644
---- a/pylons/controllers/util.py
-+++ b/pylons/controllers/util.py
-@@ -174,7 +174,7 @@ def index(self):
- response.headers.pop('Content-Type', None)
- response.headers.pop('Cache-Control', None)
- response.headers.pop('Pragma', None)
-- raise status_map[304]().exception
-+ raise status_map[304]()
- else:
- log.debug("ETag didn't match, returning response object")
-
-@@ -207,7 +207,7 @@ def abort(status_code=None, detail="", headers=None, comment=None):
- comment=comment)
- log.debug("Aborting request, status: %s, detail: %r, headers: %r, "
- "comment: %r", status_code, detail, headers, comment)
-- raise exc.exception
-+ raise exc
-
-
- def redirect(url, code=302):
-@@ -221,4 +221,4 @@ def redirect(url, code=302):
- """
- log.debug("Generating %s redirect" % code)
- exc = status_map[code]
-- raise exc(location=url).exception
-+ raise exc(location=url)
-diff --git a/tests/test_units/test_controller.py b/tests/test_units/test_controller.py
-index a098aee..bdaf538 100644
---- a/tests/test_units/test_controller.py
-+++ b/tests/test_units/test_controller.py
-@@ -36,11 +36,11 @@ def strme(self):
- def use_redirect(self):
- pylons.response.set_cookie('message', 'Hello World')
- exc = status_map[301]
-- raise exc('/elsewhere').exception
-+ raise exc('/elsewhere')
-
- def use_customnotfound(self):
- exc = status_map[404]
-- raise exc('Custom not found').exception
-+ raise exc('Custom not found')
-
- def header_check(self):
- pylons.response.headers['Content-Type'] = 'text/plain'
Modified: packages/pylons/trunk/debian/patches/series
===================================================================
--- packages/pylons/trunk/debian/patches/series 2015-07-22 19:55:18 UTC (rev 33453)
+++ packages/pylons/trunk/debian/patches/series 2015-07-22 20:39:11 UTC (rev 33454)
@@ -1,2 +1 @@
move_data_outside_site-packages.patch
-dont_use_removed_exception_attribute.patch
Modified: packages/pylons/trunk/debian/rules
===================================================================
--- packages/pylons/trunk/debian/rules 2015-07-22 19:55:18 UTC (rev 33453)
+++ packages/pylons/trunk/debian/rules 2015-07-22 20:39:11 UTC (rev 33454)
@@ -1,47 +1,10 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-package=python-pylons
-clean:
- dh_testdir
- dh_testroot
- rm -rf build Pylons.egg-info tests/test_units/cache tests/test_units/session
- find . -name '*\.py[co]' -delete
- find . -name '\._*' -delete
- find . -name '\.DS_Store' -delete
- dh_clean
+export PYBUILD_DISABLE=test
-build:
-build-arch:
-build-indep:
+%:
+ dh $@ --with python2 --buildsystem pybuild
-install:
- dh_testdir
- dh_testroot
- dh_installdirs
- python setup.py install \
- --no-compile --prefix=/usr \
- --root $(CURDIR)/debian/$(package)
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs CHANGELOG
- dh_installdocs
- dh_install
- dh_installexamples
- dh_compress -X.py
+override_dh_fixperms:
dh_fixperms
- dh_python2
- find debian/$(package) -type f -perm 755 | xargs -r chmod 644
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch:
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install
+ find debian/python-pylons/usr/share/ -type f -perm 755 | xargs -r chmod 644
Modified: packages/pylons/trunk/debian/watch
===================================================================
--- packages/pylons/trunk/debian/watch 2015-07-22 19:55:18 UTC (rev 33453)
+++ packages/pylons/trunk/debian/watch 2015-07-22 20:39:11 UTC (rev 33454)
@@ -1,4 +1,3 @@
-# Compulsory line, this is a version 3 file
version=3
-opts=uversionmangle=s/rc/~rc/ \
-http://pypi.python.org/packages/source/P/Pylons/Pylons-(.*)\.tar\.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+http://pypi.debian.net/Pylons/Pylons-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
\ No newline at end of file
More information about the Python-modules-commits
mailing list