[Python-modules-commits] r1418 - in /packages/pastescript/trunk/debian: changelog control patches/ patches/00list patches/01_setuptools_version.dpatch rules

pox-guest at users.alioth.debian.org pox-guest at users.alioth.debian.org
Mon Oct 23 15:57:36 UTC 2006 

Author: pox-guest
Date: Mon Oct 23 15:57:36 2006
New Revision: 1418

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1418
Log:
New upstream release

Added:
    packages/pastescript/trunk/debian/patches/
    packages/pastescript/trunk/debian/patches/00list
    packages/pastescript/trunk/debian/patches/01_setuptools_version.dpatch   (with props)
Modified:
    packages/pastescript/trunk/debian/changelog
    packages/pastescript/trunk/debian/control
    packages/pastescript/trunk/debian/rules

Modified: packages/pastescript/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/pastescript/trunk/debian/changelog?rev=1418&op=diff
==============================================================================
--- packages/pastescript/trunk/debian/changelog (original)
+++ packages/pastescript/trunk/debian/changelog Mon Oct 23 15:57:36 2006
@@ -1,3 +1,21 @@
+pastescript (1.0-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/rules cleaned:
+    + dh_python removed, dh_pycentral will generate all data now
+    + unneeded dh_installexamples, dh_strip and dh_shlibdeps calls removed
+  * debian/control:
+    + bumped debhelper and python-central required versions due to dh_python
+      call removal
+    + Fixed recommended python-flup version (closes: #389199)
+    + Homepage updated
+  * Removed hack for changing paster's shebang (python2.4 is now default) 
+  * Added patch to setup.py file which will force using currently installed
+    setuptools version while building package
+    + dpatch added to build dependencies
+
+ -- Piotr Ozarowski <ozarow at gmail.com>  Mon, 23 Oct 2006 16:54:07 +0200
+
 pastescript (0.9.8-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/pastescript/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/pastescript/trunk/debian/control?rev=1418&op=diff
==============================================================================
--- packages/pastescript/trunk/debian/control (original)
+++ packages/pastescript/trunk/debian/control Mon Oct 23 15:57:36 2006
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Piotr Ozarowski <ozarow at gmail.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.37.2)
-Build-Depends-Indep: python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5), python-setuptools (>= 0.6b3-1), python-docutils
+Build-Depends: debhelper (>= 5.0.38), dpatch
+Build-Depends-Indep: python (>= 2.3.5-7), python-all-dev, python-central (>= 0.5.6), python-setuptools (>= 0.6b3-1), python-docutils
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.4
 
@@ -12,7 +12,7 @@
 Architecture: all
 Depends: ${python:Depends}, paste-common, python-paste, python-pastedeploy, python-setuptools (>= 0.6b3-1), python-cheetah (>=1.0-1.1)
 XB-Python-Version: ${python:Versions}
-Recommends: python-flup (>=0.2015-1)
+Recommends: python-flup (>=0.5-1)
 Description: serving web applications, creating file layouts for python packages
  Paster is pluggable command-line frontend,
  including commands to setup package file layouts
@@ -22,5 +22,5 @@
     For instance a setuptools-ready file layout.
   * Serving up web applications, with configuration based on paste.deploy
  .
-  Homepage: http://pythonpaste.org/
+  Homepage: http://www.pythonpaste.org/script/
 

Added: packages/pastescript/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/pastescript/trunk/debian/patches/00list?rev=1418&op=file
==============================================================================
--- packages/pastescript/trunk/debian/patches/00list (added)
+++ packages/pastescript/trunk/debian/patches/00list Mon Oct 23 15:57:36 2006
@@ -1,0 +1,1 @@
+01_setuptools_version

Added: packages/pastescript/trunk/debian/patches/01_setuptools_version.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pastescript/trunk/debian/patches/01_setuptools_version.dpatch?rev=1418&op=file
==============================================================================
--- packages/pastescript/trunk/debian/patches/01_setuptools_version.dpatch (added)
+++ packages/pastescript/trunk/debian/patches/01_setuptools_version.dpatch Mon Oct 23 15:57:36 2006
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_setuptools_version.dpatch by  <ozarow at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad pastescript-1.0~/setup.py pastescript-1.0/setup.py
+--- pastescript-1.0~/setup.py	2006-10-22 22:59:58.000000000 +0200
++++ pastescript-1.0/setup.py	2006-10-23 17:29:33.000000000 +0200
+@@ -1,5 +1,6 @@
+ import ez_setup
+-ez_setup.use_setuptools()
++from setuptools import __version__ as ver
++ez_setup.use_setuptools(version=ver)
+ from setuptools import setup, find_packages
+ import re, os
+ 

Propchange: packages/pastescript/trunk/debian/patches/01_setuptools_version.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/pastescript/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pastescript/trunk/debian/rules?rev=1418&op=diff
==============================================================================
--- packages/pastescript/trunk/debian/rules (original)
+++ packages/pastescript/trunk/debian/rules Mon Oct 23 15:57:36 2006
@@ -7,7 +7,9 @@
 PYVERS=$(shell pyversions -vr)
 DOCS=$(shell cd docs && find ./ -name "*.txt" -not -name "license.txt" -printf "%p " | sed "s/.txt//g")
 
-clean:
+include /usr/share/dpatch/dpatch.make 
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-*
@@ -15,7 +17,7 @@
 	find . -name *\.py[co] -exec rm {} \;
 	dh_clean
 
-build: build-indep build-stamp
+build: patch build-indep build-stamp
 build-stamp: $(PYVERS:%=build-python%)
 	touch $@
 build-python%:
@@ -45,11 +47,6 @@
 	rm -f debian/python-pastescript/usr/lib/python$*/site-packages/PasteScript-${DEB_UPSTREAM_VERSION}-py$*-nspkg.pth
 	# provided by paste-common package:
 	rm -f debian/python-pastescript/usr/lib/python$*/site-packages/pastescript/paste/__init__.py
-	# paster needs python >=2.4
-ifeq ("2.3", $(shell pyversions -vr 'current'))
-	sed -i 's,/usr/bin/python\>,/usr/bin/python2.4,g' \
-		debian/python-pastescript/usr/bin/paster 
-endif
 
 binary-indep: build install
 	dh_testdir -i
@@ -58,14 +55,11 @@
 	dh_installdocs -i
 	dh_link usr/share/doc/python-pastescript/docs /usr/share/doc/python-paste/docs/script
 	dh_installman -i 
-	dh_installexamples  -i
 	dh_pycentral -i
 	dh_python -i
-	dh_strip -i
 	dh_compress -i -X.py
 	dh_fixperms -i
 	dh_installdeb -i
-	dh_shlibdeps -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i

More information about the Python-modules-commits mailing list