[Python-modules-commits] r2221 - in /packages/zsi/trunk/debian: changelog control patches/00list patches/no-setuptools.dpatch rules

Tue May 1 22:06:06 UTC 2007

Author: bzed-guest
Date: Tue May  1 22:06:06 2007
New Revision: 2221

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2221
Log:
Egg-Info won't work, as the Dependencies don't contain any Egg info yet,
removing setuptools therefore.

Added:
    packages/zsi/trunk/debian/patches/no-setuptools.dpatch   (with props)
Modified:
    packages/zsi/trunk/debian/changelog
    packages/zsi/trunk/debian/control
    packages/zsi/trunk/debian/patches/00list
    packages/zsi/trunk/debian/rules

Modified: packages/zsi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/zsi/trunk/debian/changelog?rev=2221&op=diff
==============================================================================

--- packages/zsi/trunk/debian/changelog (original)
+++ packages/zsi/trunk/debian/changelog Tue May  1 22:06:06 2007
@@ -13,6 +13,8 @@
       fix #416103 without hassle
     - remove no longer needed Provides and X*-Python-Version fields
     - removing python-all-dev from Build-Depends-Indep
+    - removing python-setuptools from Build-Depends-Indep the
+      installed Egg-Info will not work on Debian (yet).
     - add ${misc:Depends} as a dependency
     - adding XS-Vcs-* fields
     - adding dpatch to Build-Depends
@@ -30,8 +32,10 @@
     - adding dpatch include
   * debian/patches/bogus-shebang-remove.dpatch:
     - adding patch to remove bogus she-bang lines from several files
+  * debian/patches/no-setuptools.dpatch:
+    - make sure we don't use setuptools
 
- -- Bernd Zeimetz <bernd at bzed.de>  Tue, 01 May 2007 23:45:25 +0200
+ -- Bernd Zeimetz <bernd at bzed.de>  Wed, 02 May 2007 00:01:25 +0200
 
 zsi (1.7-2) unstable; urgency=low
 

Modified: packages/zsi/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/zsi/trunk/debian/control?rev=2221&op=diff
==============================================================================
--- packages/zsi/trunk/debian/control (original)
+++ packages/zsi/trunk/debian/control Tue May  1 22:06:06 2007
@@ -4,7 +4,6 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Tristan Seligmann <mithrandi at mithrandi.za.net>, Bernd Zeimetz <bernd at bzed.de>
 Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5.0.37.1), python (>= 2.3.5-7), python-support (>= 0.4), dpatch
-Build-Depends-Indep: python-setuptools
 XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/zsi/trunk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/zsi/trunk/
 Standards-Version: 3.7.2

Modified: packages/zsi/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/zsi/trunk/debian/patches/00list?rev=2221&op=diff
==============================================================================
--- packages/zsi/trunk/debian/patches/00list (original)
+++ packages/zsi/trunk/debian/patches/00list Tue May  1 22:06:06 2007
@@ -1,1 +1,2 @@
 bogus-shebang-remove
+no-setuptools

Added: packages/zsi/trunk/debian/patches/no-setuptools.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/zsi/trunk/debian/patches/no-setuptools.dpatch?rev=2221&op=file
==============================================================================
--- packages/zsi/trunk/debian/patches/no-setuptools.dpatch (added)
+++ packages/zsi/trunk/debian/patches/no-setuptools.dpatch Tue May  1 22:06:06 2007
@@ -1,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## no-setuptools.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad zsi~/setup.py zsi/setup.py
+--- zsi~/setup.py	2006-09-28 00:55:49.000000000 +0200
++++ zsi/setup.py	2007-05-02 00:04:01.000000000 +0200
+@@ -1,12 +1,9 @@
+ #! /usr/bin/env python
+ # $Header$
+ import sys
+-try:
+-    from setuptools import setup
+-    hasSetuptools = True
+-except ImportError:
+-    from distutils.core import setup
+-    hasSetuptools = False
++
++from distutils.core import setup
++hasSetuptools = False
+ 
+ _url = "http://pywebsvcs.sf.net/"
+ 

Propchange: packages/zsi/trunk/debian/patches/no-setuptools.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/zsi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/zsi/trunk/debian/rules?rev=2221&op=diff
==============================================================================
--- packages/zsi/trunk/debian/rules (original)
+++ packages/zsi/trunk/debian/rules Tue May  1 22:06:06 2007
@@ -11,5 +11,3 @@
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-DEB_PYTHON_INSTALL_ARGS_ALL = --single-version-externally-managed
-


