[Python-modules-commits] r733 - in /packages/python-cherrypy/trunk/debian: changelog patches/00_supress_profiler_warning.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Mon Jun  5 02:44:55 2006
New Revision: 733

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=733
Log:
supress warning about profiler module

Added:
    packages/python-cherrypy/trunk/debian/patches/00_supress_profiler_warning.diff
Modified:
    packages/python-cherrypy/trunk/debian/changelog

Modified: packages/python-cherrypy/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-cherrypy/trunk/debian/changelog?rev=733&op=diff
==============================================================================
--- packages/python-cherrypy/trunk/debian/changelog (original)
+++ packages/python-cherrypy/trunk/debian/changelog Mon Jun  5 02:44:55 2006
@@ -1,16 +1,20 @@
-python-cherrypy (2.2.1-2) UNRELEASED; urgency=low
+python-cherrypy (2.2.1-2) unstable; urgency=low
 
   * debian/patches/02_eggify.diff:
   - fixed to only patch setup.py, so that it imports setup
     from setuptools instead of distutils; ez_setup is not
     needed
+  * debian/patches/00_supress_profiler_warning.diff:
+  - stop warning about the profiler module not being packaged
+    in the main python distribution; that is documented in
+    README.Debian
   * debian/control:
   - move python and python-setuptools to Build-Depends,
     since they are needed at the clean target
   * debian/watch:
   - new uscan support file, using the sf.net trick
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sun,  4 Jun 2006 23:31:25 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Sun,  4 Jun 2006 23:44:26 -0300
 
 python-cherrypy (2.2.1-1) unstable; urgency=low
 

Added: packages/python-cherrypy/trunk/debian/patches/00_supress_profiler_warning.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/python-cherrypy/trunk/debian/patches/00_supress_profiler_warning.diff?rev=733&op=file
==============================================================================
--- packages/python-cherrypy/trunk/debian/patches/00_supress_profiler_warning.diff (added)
+++ packages/python-cherrypy/trunk/debian/patches/00_supress_profiler_warning.diff Mon Jun  5 02:44:55 2006
@@ -1,0 +1,21 @@
+--- cherrypy/lib/profiler.py~	2005-12-28 07:20:42.000000000 -0200
++++ cherrypy/lib/profiler.py	2006-05-04 23:25:12.000000000 -0300
+@@ -46,12 +46,12 @@
+ except ImportError:
+     profile = None
+     pstats = None
+-    import warnings
+-    msg = ("Your installation of Python doesn't have a profile module. "
+-           "If you're on Debian, you can apt-get python2.4-profiler from "
+-           "non-free in a separate step. See http://www.cherrypy.org/wiki/"
+-           "ProfilingOnDebian for details.")
+-    warnings.warn(msg)
++    #import warnings
++    #msg = ("Your installation of Python doesn't have a profile module. "
++    #       "If you're on Debian, you can apt-get python2.4-profiler from "
++    #       "non-free in a separate step. See http://www.cherrypy.org/wiki/"
++    #       "ProfilingOnDebian for details.")
++    #warnings.warn(msg)
+ 
+ import os, os.path
+ import sys