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

[piotr at users.alioth.debian.org]

Author: piotr
Date: Mon Sep 17 21:48:18 2007
New Revision: 3267

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3267
Log:
* find (see clean rule) works correctly in every build now (closes: #442699)
* 01_setuptools_version patch replaced with 01_disable_ez_setup

Added:
    packages/pastescript/trunk/debian/patches/01_disable_ez_setup.dpatch   (with props)
Removed:
    packages/pastescript/trunk/debian/patches/01_setuptools_version.dpatch
Modified:
    packages/pastescript/trunk/debian/changelog
    packages/pastescript/trunk/debian/patches/00list
    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=3267&op=diff
==============================================================================
--- packages/pastescript/trunk/debian/changelog (original)
+++ packages/pastescript/trunk/debian/changelog Mon Sep 17 21:48:18 2007
@@ -1,3 +1,10 @@
+pastescript (1.3.6-2) unstable; urgency=low
+
+  * find (see clean rule) works correctly in every build now (closes: #442699)
+  * 01_setuptools_version patch replaced with 01_disable_ez_setup
+
+ -- Piotr Ożarowski <piotr at debian.org>  Mon, 17 Sep 2007 23:19:12 +0200
+
 pastescript (1.3.6-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/pastescript/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/pastescript/trunk/debian/patches/00list?rev=3267&op=diff
==============================================================================
--- packages/pastescript/trunk/debian/patches/00list (original)
+++ packages/pastescript/trunk/debian/patches/00list Mon Sep 17 21:48:18 2007
@@ -1,1 +1,1 @@
-01_setuptools_version
+01_disable_ez_setup

Added: packages/pastescript/trunk/debian/patches/01_disable_ez_setup.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/pastescript/trunk/debian/patches/01_disable_ez_setup.dpatch?rev=3267&op=file
==============================================================================
--- packages/pastescript/trunk/debian/patches/01_disable_ez_setup.dpatch (added)
+++ packages/pastescript/trunk/debian/patches/01_disable_ez_setup.dpatch Mon Sep 17 21:48:18 2007
@@ -1,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_disable_ez_setup.dpatch by Piotr Ożarowski <piotr at debian.org>
+##
+## DP: this patch disables ez_setup which is checking if proper setuptools
+## DP: version is installed (we're forcing correct version via Build-Depends:)
+
+ at DPATCH@
+diff -urNad pastescript-1.3.6~/setup.py pastescript-1.3.6/setup.py
+--- pastescript-1.3.6~/setup.py	2007-09-17 23:21:23.000000000 +0200
++++ pastescript-1.3.6/setup.py	2007-09-17 23:29:42.000000000 +0200
+@@ -1,5 +1,3 @@
+-import ez_setup
+-ez_setup.use_setuptools()
+ from setuptools import setup, find_packages
+ import re, os
+ 

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

Modified: packages/pastescript/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/pastescript/trunk/debian/rules?rev=3267&op=diff
==============================================================================
--- packages/pastescript/trunk/debian/rules (original)
+++ packages/pastescript/trunk/debian/rules Mon Sep 17 21:48:18 2007
@@ -14,7 +14,7 @@
 	dh_testroot
 	rm -f build-*
 	rm -rf dist build
-	find . -name *\.py[co] -exec rm {} \;
+	find . -name '*\.py[co]' -delete
 	dh_clean
 
 build: patch build-indep build-stamp