[Python-modules-commits] r17209 - in packages/pastedeploy/trunk/debian (8 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Sat May 28 15:40:26 UTC 2011
Date: Saturday, May 28, 2011 @ 15:40:25
Author: piotr
Revision: 17209
* New upstream release
* Convert to dh_python2
- recommend python-pastescript >= 1.7.3-6~
* Source format changed to 3.0 (quilt)
* Standards-Version bumped to 3.9.2 (no changes needed)
Added:
packages/pastedeploy/trunk/debian/patches/series
Modified:
packages/pastedeploy/trunk/debian/changelog
packages/pastedeploy/trunk/debian/control
packages/pastedeploy/trunk/debian/patches/01_change_templates_path.dpatch
packages/pastedeploy/trunk/debian/rules
packages/pastedeploy/trunk/debian/source/format
Deleted:
packages/pastedeploy/trunk/debian/README.source
packages/pastedeploy/trunk/debian/patches/00list
Deleted: packages/pastedeploy/trunk/debian/README.source
===================================================================
--- packages/pastedeploy/trunk/debian/README.source 2011-05-28 15:31:08 UTC (rev 17208)
+++ packages/pastedeploy/trunk/debian/README.source 2011-05-28 15:40:25 UTC (rev 17209)
@@ -1,4 +0,0 @@
-This package is using dpatch patch system.
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run `./debian/rules patch`
Modified: packages/pastedeploy/trunk/debian/changelog
===================================================================
--- packages/pastedeploy/trunk/debian/changelog 2011-05-28 15:31:08 UTC (rev 17208)
+++ packages/pastedeploy/trunk/debian/changelog 2011-05-28 15:40:25 UTC (rev 17209)
@@ -1,8 +1,12 @@
-pastedeploy (1.3.3-4) UNRELEASED; urgency=low
+pastedeploy (1.5.0-1) unstable; urgency=low
- * Enable build-time tests
+ * New upstream release
+ * Convert to dh_python2
+ - recommend python-pastescript >= 1.7.3-6~
+ * Source format changed to 3.0 (quilt)
+ * Standards-Version bumped to 3.9.2 (no changes needed)
- -- Andrey Rahmatullin <wrar at wrar.name> Sat, 12 Mar 2011 21:14:13 +0500
+ -- Piotr Ożarowski <piotr at debian.org> Sat, 28 May 2011 17:31:01 +0200
pastedeploy (1.3.3-3) unstable; urgency=low
Modified: packages/pastedeploy/trunk/debian/control
===================================================================
--- packages/pastedeploy/trunk/debian/control 2011-05-28 15:31:08 UTC (rev 17208)
+++ packages/pastedeploy/trunk/debian/control 2011-05-28 15:40:25 UTC (rev 17209)
@@ -3,21 +3,18 @@
Priority: optional
Maintainer: Piotr Ożarowski <piotr at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: python (>= 2.3.5-11), python-all-dev,
- python-support (>= 0.6.4), python-setuptools (>= 0.6b3-1~), python-docutils,
- python-nose, python-paste, python-py
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5)
+Build-Depends-Indep: python-all (>= 2.6.6-3), python-setuptools (>= 0.6b3-1~), python-docutils
+Standards-Version: 3.9.2
Homepage: http://pythonpaste.org/deploy/
-XS-Python-Version: all
Vcs-Svn: svn://svn.debian.org/python-modules/packages/pastedeploy/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pastedeploy/trunk/
+X-Python-Version: >= 2.4
Package: python-pastedeploy
Architecture: all
-Depends: ${python:Depends}, python-pkg-resources
-Recommends: python-pastescript (>= 1.6.2-3)
-XB-Python-Version: ${python:Versions}
+Depends: ${python:Depends}, ${misc:Depends}, python-pkg-resources
+Recommends: python-pastescript (>= 1.7.3-6~)
Enhances: python-paste
Description: load, configure, and compose WSGI applications and servers
Paste Deployment is a system for finding and configuring WSGI applications and
Deleted: packages/pastedeploy/trunk/debian/patches/00list
===================================================================
--- packages/pastedeploy/trunk/debian/patches/00list 2011-05-28 15:31:08 UTC (rev 17208)
+++ packages/pastedeploy/trunk/debian/patches/00list 2011-05-28 15:40:25 UTC (rev 17209)
@@ -1 +0,0 @@
-01_change_templates_path
Modified: packages/pastedeploy/trunk/debian/patches/01_change_templates_path.dpatch
===================================================================
--- packages/pastedeploy/trunk/debian/patches/01_change_templates_path.dpatch 2011-05-28 15:31:08 UTC (rev 17208)
+++ packages/pastedeploy/trunk/debian/patches/01_change_templates_path.dpatch 2011-05-28 15:40:25 UTC (rev 17209)
@@ -1,19 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_change_templates_path.dpatch by Piotr Ożarowski <piotr at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: paster's templates are outside site-packages in Debian
-
- at DPATCH@
-diff -urNad pastedeploy-1.3.1~/paste/deploy/paster_templates.py pastedeploy-1.3.1/paste/deploy/paster_templates.py
---- pastedeploy-1.3.1~/paste/deploy/paster_templates.py 2007-06-26 19:16:23.000000000 +0200
-+++ pastedeploy-1.3.1/paste/deploy/paster_templates.py 2008-05-24 18:54:27.000000000 +0200
-@@ -5,7 +5,7 @@
+# 01_change_templates_path.dpatch by Piotr Ożarowski <piotr at debian.org>
+#
+# paster's templates are outside site-packages in Debian
+--- pastedeploy-1.5.0.orig/paste/deploy/paster_templates.py
++++ pastedeploy-1.5.0/paste/deploy/paster_templates.py
+@@ -9,7 +9,7 @@ from paste.deploy.compat import print_
class PasteDeploy(Template):
- _template_dir = 'paster_templates/paste_deploy'
+ _template_dir = '/usr/share/paster_templates/paste_deploy'
summary = "A web application deployed through paste.deploy"
-
+
egg_plugins = ['PasteDeploy']
Added: packages/pastedeploy/trunk/debian/patches/series
===================================================================
--- packages/pastedeploy/trunk/debian/patches/series (rev 0)
+++ packages/pastedeploy/trunk/debian/patches/series 2011-05-28 15:40:25 UTC (rev 17209)
@@ -0,0 +1 @@
+01_change_templates_path.dpatch
Modified: packages/pastedeploy/trunk/debian/rules
===================================================================
--- packages/pastedeploy/trunk/debian/rules 2011-05-28 15:31:08 UTC (rev 17208)
+++ packages/pastedeploy/trunk/debian/rules 2011-05-28 15:40:25 UTC (rev 17209)
@@ -2,21 +2,19 @@
#export DH_VERBOSE=1
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
PYVERS=$(shell pyversions -vr)
DOCS=$(shell cd docs && find ./ -maxdepth 1 -name "*.txt" -not -name "license.txt" -printf "%p " | sed "s/.txt//g")
PKGDIR=$(CURDIR)/debian/python-pastedeploy
+include /usr/share/python/python.mk
-include /usr/share/dpatch/dpatch.make
-
-clean: unpatch
+clean:
dh_testdir
dh_testroot
- rm -rf dist build tests/fake_packages/FakeApp.egg/EGG-INFO
+ rm -rf dist build
find . -name '*\.py[co]' -delete
dh_clean build-docs $(PYVERS:%=install-python%)
-build: patch build-docs
+build: build-docs
build-docs:
dh_installdirs
@@ -27,37 +25,26 @@
touch $@
install: build $(PYVERS:%=install-python%)
-install-python%: patch
- python$* setup.py install --prefix=/usr \
- --single-version-externally-managed \
- --root $(PKGDIR) \
- --install-lib=/usr/lib/python$*/site-packages
+install-python%:
+ python$* setup.py install --root $(PKGDIR) \
+ --single-version-externally-managed $(py_setup_install_args)
# pth file is not needed
- rm -f $(PKGDIR)/usr/lib/python$*/site-packages/PasteDeploy-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
- # python-support's namespace feature will handle this
- rm -f $(PKGDIR)/usr/lib/python$*/site-packages/paste/__init__.py
+ find $(PKGDIR) -name '*.pth' -or -name 'namespace_packages.txt' -delete
# move templates outside site-packages
if [ -d $(PKGDIR)/usr/share/paster_templates ]; \
- then rm -rf $(PKGDIR)/usr/lib/python$*/site-packages/paste/deploy/paster_templates; \
+ then rm -r $(PKGDIR)$(call py_libdir,$*)/paste/deploy/paster_templates;\
else \
- mv $(PKGDIR)/usr/lib/python$*/site-packages/paste/deploy/paster_templates \
+ mv $(PKGDIR)$(call py_libdir,$*)/paste/deploy/paster_templates \
$(PKGDIR)/usr/share/;\
fi
-test: $(PYVERS:%=test-python%)
-test-python%:
- -
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
- python$* setup.py nosetests
-endif
-
-binary-indep: build install test
+binary-indep: build install
dh_testdir -i
dh_testroot -i
dh_installchangelogs -i docs/news.txt
dh_installdocs -i
dh_link usr/share/doc/python-pastedeploy/docs /usr/share/doc/python-paste/docs/deploy
- dh_pysupport -i
+ dh_python2 -i
dh_compress -i -X.py
dh_fixperms -i
dh_installdeb -i
@@ -69,4 +56,4 @@
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install build test
+.PHONY: build clean binary-indep binary-arch binary install build
Modified: packages/pastedeploy/trunk/debian/source/format
===================================================================
--- packages/pastedeploy/trunk/debian/source/format 2011-05-28 15:31:08 UTC (rev 17208)
+++ packages/pastedeploy/trunk/debian/source/format 2011-05-28 15:40:25 UTC (rev 17209)
@@ -1 +1 @@
-1.0
+3.0 (quilt)
More information about the Python-modules-commits
mailing list