[Python-modules-commits] r12288 - in packages/cherrypy3/trunk/debian (3 files)

[jcfp-guest at users.alioth.debian.org]

    Date: Friday, March 19, 2010 @ 20:37:24
  Author: jcfp-guest
Revision: 12288

Removing 02_eggify.diff

Modified:
  packages/cherrypy3/trunk/debian/changelog
  packages/cherrypy3/trunk/debian/patches/series
Deleted:
  packages/cherrypy3/trunk/debian/patches/02_eggify.diff

Modified: packages/cherrypy3/trunk/debian/changelog
===================================================================
--- packages/cherrypy3/trunk/debian/changelog	2010-03-19 20:26:33 UTC (rev 12287)
+++ packages/cherrypy3/trunk/debian/changelog	2010-03-19 20:37:24 UTC (rev 12288)
@@ -2,6 +2,7 @@
 
   * New upstream release (Closes #571196).
   * Bumped Standards-Version to 3.8.4 (no changes needed).
+  * Removing patch 02: no longer needed, incorporated upstream.
 
  -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Fri, 19 Mar 2010 21:15:58 +0100
 

Deleted: packages/cherrypy3/trunk/debian/patches/02_eggify.diff
===================================================================
--- packages/cherrypy3/trunk/debian/patches/02_eggify.diff	2010-03-19 20:26:33 UTC (rev 12287)
+++ packages/cherrypy3/trunk/debian/patches/02_eggify.diff	2010-03-19 20:37:24 UTC (rev 12288)
@@ -1,12 +0,0 @@
---- a/setup.py~	2006-04-24 22:37:55.000000000 -0300
-+++ b/setup.py	2006-06-04 23:02:07.000000000 -0300
-@@ -6,7 +6,8 @@
- to install this package.
- """
- 
--from distutils.core import setup
-+#from distutils.core import setup
-+from setuptools import setup
- from distutils.command.install import INSTALL_SCHEMES
- import sys
- import os

Modified: packages/cherrypy3/trunk/debian/patches/series
===================================================================
--- packages/cherrypy3/trunk/debian/patches/series	2010-03-19 20:26:33 UTC (rev 12287)
+++ packages/cherrypy3/trunk/debian/patches/series	2010-03-19 20:37:24 UTC (rev 12288)
@@ -1,3 +1,2 @@
 00_supress_profiler_warning.diff
 01_cherryd_location_fix.diff
-02_eggify.diff
\ No newline at end of file