[Python-modules-commits] r17761 - in packages/python-enable/trunk/debian (7 files)

Sat Jul 9 04:48:51 UTC 2011

Date: Saturday, July 9, 2011 @ 04:48:48
  Author: varun
Revision: 17761

* New upstream release
* Bump Standards-Version to 3.9.2
* Update debian/watch file
* Remove patches/sike.diff - not needed

Modified:
  packages/python-enable/trunk/debian/changelog
  packages/python-enable/trunk/debian/control
  packages/python-enable/trunk/debian/orig-tar.sh
  packages/python-enable/trunk/debian/patches/freetype2.diff
  packages/python-enable/trunk/debian/patches/series
  packages/python-enable/trunk/debian/watch
Deleted:
  packages/python-enable/trunk/debian/patches/sike.diff

Modified: packages/python-enable/trunk/debian/changelog
===================================================================

--- packages/python-enable/trunk/debian/changelog	2011-07-09 04:25:09 UTC (rev 17760)
+++ packages/python-enable/trunk/debian/changelog	2011-07-09 04:48:48 UTC (rev 17761)
@@ -1,3 +1,12 @@
+python-enable (4.0.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Bump Standards-Version to 3.9.2
+  * Update debian/watch file
+  * Remove patches/sike.diff - not needed
+
+ -- Varun Hiremath <varun at debian.org>  Fri, 08 Jul 2011 17:28:49 -0400
+
 python-enable (3.4.1-2) unstable; urgency=low
 
   * d/rules: fix pyshared directory path

Modified: packages/python-enable/trunk/debian/control
===================================================================
--- packages/python-enable/trunk/debian/control	2011-07-09 04:25:09 UTC (rev 17760)
+++ packages/python-enable/trunk/debian/control	2011-07-09 04:48:48 UTC (rev 17761)
@@ -6,8 +6,8 @@
 Build-Depends: cdbs (>= 0.4.90~), debhelper(>= 7), python-all-dev (>= 2.6.6-3~),
  python-setuptools, python-setupdocs, python-numpy, python-pyrex, swig,
  libfreetype6-dev, libx11-dev, libglu1-mesa-dev, cython
-Standards-Version: 3.9.1
-X-Python-Version: >=2.4
+Standards-Version: 3.9.2
+X-Python-Version: >=2.5
 Homepage: http://pypi.python.org/pypi/Enable
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-enable/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-enable/trunk/
@@ -15,8 +15,7 @@
 Package: python-enable
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-numpy, python-traitsgui, python-enthoughtbase,
- python-wxgtk2.8, python-pkg-resources
+ python-numpy, python-traitsui, python-wxgtk2.8, python-pkg-resources
 Description: Drawing and interaction packages
  The Enable project provides two related multi-platform packages for
  drawing GUI objects.

Modified: packages/python-enable/trunk/debian/orig-tar.sh
===================================================================
--- packages/python-enable/trunk/debian/orig-tar.sh	2011-07-09 04:25:09 UTC (rev 17760)
+++ packages/python-enable/trunk/debian/orig-tar.sh	2011-07-09 04:48:48 UTC (rev 17761)
@@ -5,7 +5,7 @@
 
 # cleanup the upstream sources
 tar zxf $3
-mv Enable-$2 $DIR
+mv enable-$2 $DIR
 
 # remove freetype2 source from enthought.kiva
 (cd $DIR; rm -rf enthought/kiva/agg/freetype2)

Modified: packages/python-enable/trunk/debian/patches/freetype2.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/freetype2.diff	2011-07-09 04:25:09 UTC (rev 17760)
+++ packages/python-enable/trunk/debian/patches/freetype2.diff	2011-07-09 04:48:48 UTC (rev 17761)
@@ -2,11 +2,11 @@
 Date: Sun, 28 Feb 2010 15:16:17 -0500
 Description: Remove freetype2 sources from upstream and use the
  pre-built libfreetype6-dev library in Debian.
-Index: python-enable-3.3.0/enthought/kiva/agg/setup.py
+Index: python-enable-4.0.0/kiva/agg/setup.py
 ===================================================================
---- python-enable-3.3.0.orig/enthought/kiva/agg/setup.py	2010-02-25 13:15:07.000000000 -0500
-+++ python-enable-3.3.0/enthought/kiva/agg/setup.py	2010-02-28 14:55:37.000000000 -0500
-@@ -4,59 +4,6 @@
+--- python-enable-4.0.0.orig/kiva/agg/setup.py	2011-06-21 18:37:45.000000000 -0400
++++ python-enable-4.0.0/kiva/agg/setup.py	2011-07-08 18:14:03.000000000 -0400
+@@ -4,58 +4,6 @@
  import re
  import platform
  
@@ -62,16 +62,13 @@
 -    ]
 -
 -
--
- def configuration(parent_package='',top_path=None):
+ 
+ def configuration(parent_package='', top_path=None):
      from numpy.distutils.misc_util import Configuration
-     from numpy.distutils.system_info import dict_append, get_info
-@@ -85,45 +32,11 @@
-         plat = 'x11'  # use with gtk2, it's slow but reliable
-         #plat = 'gdkpixbuf2'
+@@ -87,44 +35,10 @@
  
--
--    #-------------------------------------------------------------------------
+ 
+     #-------------------------------------------------------------------------
 -    # Add the freetype library (agg 2.4 links against this)
 -    #-------------------------------------------------------------------------
 -
@@ -104,16 +101,17 @@
 -                       depends = ['freetype2'],
 -                       )
 -
-     #-------------------------------------------------------------------------
+-    #-------------------------------------------------------------------------
      # Add the Agg sources
      #-------------------------------------------------------------------------
  
--    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ft2_incl_dirs
+-    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + \
+-                                   ft2_incl_dirs
 +    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ["/usr/include/freetype2/"]
      agg_sources = [agg_dir+'/src/*.cpp',
                      agg_dir+'/font_freetype/*.cpp']
      config.add_library(agg_lib,
-@@ -137,7 +50,7 @@
+@@ -138,7 +52,7 @@
      if sys.platform == 'darwin':
          define_macros = [('__DARWIN__', None)]
          macros = [('__DARWIN__', None)]
@@ -122,7 +120,7 @@
      else:
          define_macros = []
          macros = []
-@@ -191,7 +104,7 @@
+@@ -191,7 +105,7 @@
  
      build_info = {}
      kiva_lib = 'kiva_src'

Modified: packages/python-enable/trunk/debian/patches/series
===================================================================
--- packages/python-enable/trunk/debian/patches/series	2011-07-09 04:25:09 UTC (rev 17760)
+++ packages/python-enable/trunk/debian/patches/series	2011-07-09 04:48:48 UTC (rev 17761)
@@ -1,2 +1 @@
-sike.diff
 freetype2.diff

Deleted: packages/python-enable/trunk/debian/patches/sike.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/sike.diff	2011-07-09 04:25:09 UTC (rev 17760)
+++ packages/python-enable/trunk/debian/patches/sike.diff	2011-07-09 04:48:48 UTC (rev 17761)
@@ -1,20 +0,0 @@
-Index: python-enable-3.3.2/enthought/savage/compliance/sike.py
-===================================================================
---- python-enable-3.3.2.orig/enthought/savage/compliance/sike.py	2010-10-13 17:49:01.000000000 -0400
-+++ python-enable-3.3.2/enthought/savage/compliance/sike.py	2010-10-21 18:15:32.000000000 -0400
-@@ -1,5 +1,7 @@
- #!/usr/bin/env python
- # -*- coding: UTF-8 -*-
-+# import with keyword
-+from __future__ import with_statement
- 
- from collections import defaultdict
- import os
-@@ -10,7 +12,6 @@
- from enthought.traits.ui import api as tui
- from enthought.traits.ui.tabular_adapter import TabularAdapter
- 
--
- class SuperTuple(tuple):
-     """ Generic super-tuple using pre-defined attribute names.
-     """

Modified: packages/python-enable/trunk/debian/watch
===================================================================
--- packages/python-enable/trunk/debian/watch	2011-07-09 04:25:09 UTC (rev 17760)
+++ packages/python-enable/trunk/debian/watch	2011-07-09 04:48:48 UTC (rev 17761)
@@ -1,4 +1,4 @@
 version=3
 opts="uversionmangle=s/([ab])/~$1/,dversionmangle=s/\+.*//" \
-http://www.enthought.com/repo/ets/Enable-(.*).tar.gz \
+http://www.enthought.com/repo/ets/enable-(.*).tar.gz \
 debian debian/orig-tar.sh


