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

varun at users.alioth.debian.org varun at users.alioth.debian.org
Mon Aug 17 04:23:06 UTC 2015 

    Date: Monday, August 17, 2015 @ 04:23:05
  Author: varun
Revision: 33812

* New upstream release
* Acknowledge previous NMUs, many thanks!
* Bump Standards-Version to 3.9.6
* Fix the watch file
* Update all the patch files
* Non maintainer upload.
* Fix GCC version detection. Closes: #778076.

Added:
  packages/python-enable/trunk/debian/patches/gcc5.diff
  packages/python-enable/trunk/debian/patches/setup.diff
Modified:
  packages/python-enable/trunk/debian/changelog
  packages/python-enable/trunk/debian/control
  packages/python-enable/trunk/debian/patches/fonttools.diff
  packages/python-enable/trunk/debian/patches/pillow.diff
  packages/python-enable/trunk/debian/patches/series
  packages/python-enable/trunk/debian/rules
  packages/python-enable/trunk/debian/watch

Modified: packages/python-enable/trunk/debian/changelog
===================================================================
--- packages/python-enable/trunk/debian/changelog	2015-08-17 03:41:13 UTC (rev 33811)
+++ packages/python-enable/trunk/debian/changelog	2015-08-17 04:23:05 UTC (rev 33812)
@@ -1,11 +1,20 @@
-python-enable (4.3.0-3) UNRELEASED; urgency=low
+python-enable (4.5.1-1) unstable; urgency=medium
 
-  * Clean egg-info directory on build. See #652617. (Closes: #671102)
-    - new d/clean file to delete generated files,
-    - new d/source to ignore these.
+  * New upstream release
+  * Acknowledge previous NMUs, many thanks!
+  * Bump Standards-Version to 3.9.6
+  * Fix the watch file
+  * Update all the patch files
 
- -- Jean-Michel Nirgal Vourgère <jmv_deb at nirgal.com>  Wed, 10 Dec 2014 13:10:06 +0100
+ -- Varun Hiremath <varun at debian.org>  Sun, 16 Aug 2015 22:24:29 -0400
 
+python-enable (4.3.0-2.1) unstable; urgency=medium
+
+  * Non maintainer upload.
+  * Fix GCC version detection. Closes: #778076.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 10 Jul 2015 12:43:18 +0200
+
 python-enable (4.3.0-2) unstable; urgency=medium
 
   * Team upload.

Modified: packages/python-enable/trunk/debian/control
===================================================================
--- packages/python-enable/trunk/debian/control	2015-08-17 03:41:13 UTC (rev 33811)
+++ packages/python-enable/trunk/debian/control	2015-08-17 04:23:05 UTC (rev 33812)
@@ -6,7 +6,7 @@
 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.5
+Standards-Version: 3.9.6
 X-Python-Version: >=2.6
 Homepage: http://pypi.python.org/pypi/enable
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-enable/trunk/

Modified: packages/python-enable/trunk/debian/patches/fonttools.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/fonttools.diff	2015-08-17 03:41:13 UTC (rev 33811)
+++ packages/python-enable/trunk/debian/patches/fonttools.diff	2015-08-17 04:23:05 UTC (rev 33812)
@@ -1,13 +1,13 @@
-Index: python-enable-4.3.0/kiva/fonttools/font_manager.py
+Index: python-enable-4.5.1/kiva/fonttools/font_manager.py
 ===================================================================
---- python-enable-4.3.0.orig/kiva/fonttools/font_manager.py	2013-03-28 09:58:28.000000000 -0400
-+++ python-enable-4.3.0/kiva/fonttools/font_manager.py	2014-03-15 23:16:17.242810912 -0400
-@@ -56,7 +56,7 @@
- import afm
+--- python-enable-4.5.1.orig/kiva/fonttools/font_manager.py
++++ python-enable-4.5.1/kiva/fonttools/font_manager.py
+@@ -62,7 +62,7 @@ except ImportError:
+     import pickle
  
  from traits.etsconfig.api import ETSConfig
--from kiva.fonttools.fontTools.ttLib import TTFont
-+from fontTools.ttLib import TTFont
+-from kiva.fonttools.fontTools.ttLib import TTFont, TTLibError
++from fontTools.ttLib import TTFont, TTLibError
  
- try:
-     import cPickle as pickle
+ from kiva.fonttools import afm
+ 

Added: packages/python-enable/trunk/debian/patches/gcc5.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/gcc5.diff	                        (rev 0)
+++ packages/python-enable/trunk/debian/patches/gcc5.diff	2015-08-17 04:23:05 UTC (rev 33812)
@@ -0,0 +1,13 @@
+Index: b/kiva/agg/setup.py
+===================================================================
+--- a/kiva/agg/setup.py
++++ b/kiva/agg/setup.py
+@@ -84,7 +84,7 @@ def configuration(parent_package='', top
+         f = os.popen("g++ --version")
+         line0 = f.readline()
+         f.close()
+-        m = re.match(r'.+?\s(3|4)\.\d+', line0)
++        m = re.match(r'.+?\s(3|4|5|6|7|8|9)\.\d+', line0)
+         if int(m.group(1)) < 4:
+             use_32bit_workaround = True
+ 

Modified: packages/python-enable/trunk/debian/patches/pillow.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/pillow.diff	2015-08-17 03:41:13 UTC (rev 33811)
+++ packages/python-enable/trunk/debian/patches/pillow.diff	2015-08-17 04:23:05 UTC (rev 33812)
@@ -8,12 +8,16 @@
 The information above should follow the Patch Tagging Guidelines, please
 checkout http://dep.debian.net/deps/dep3/ to learn about the format.
 
---- python-enable-4.3.0.orig/enable/__init__.py
-+++ python-enable-4.3.0/enable/__init__.py
-@@ -7,5 +7,5 @@ __version__ = '4.3.0'
- 
- __requires__ = [
+Index: python-enable-4.5.1/enable/__init__.py
+===================================================================
+--- python-enable-4.5.1.orig/enable/__init__.py
++++ python-enable-4.5.1/enable/__init__.py
+@@ -14,7 +14,7 @@ __requires__ = [
+     'numpy',
+     'traits',
      'traitsui',
 -    'PIL',
 +    'Pillow',
+     'pyface',
  ]
+ 

Modified: packages/python-enable/trunk/debian/patches/series
===================================================================
--- packages/python-enable/trunk/debian/patches/series	2015-08-17 03:41:13 UTC (rev 33811)
+++ packages/python-enable/trunk/debian/patches/series	2015-08-17 04:23:05 UTC (rev 33812)
@@ -1,3 +1,5 @@
 fonttools.diff
 freetype2.diff
 pillow.diff
+gcc5.diff
+setup.diff

Added: packages/python-enable/trunk/debian/patches/setup.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/setup.diff	                        (rev 0)
+++ packages/python-enable/trunk/debian/patches/setup.diff	2015-08-17 04:23:05 UTC (rev 33812)
@@ -0,0 +1,15 @@
+Index: python-enable-4.5.1/setup.py
+===================================================================
+--- python-enable-4.5.1.orig/setup.py
++++ python-enable-4.5.1/setup.py
+@@ -191,8 +191,8 @@ class MyClean(distutils.command.clean.cl
+ 
+ 
+ if __name__ == "__main__":
+-    write_version_py(filename='enable/_version.py')
+-    write_version_py(filename='kiva/_version.py')
++    #write_version_py(filename='enable/_version.py')
++    #write_version_py(filename='kiva/_version.py')
+     from enable import __version__, __requires__
+ 
+     # Build the full set of packages by appending any found by setuptools'

Modified: packages/python-enable/trunk/debian/rules
===================================================================
--- packages/python-enable/trunk/debian/rules	2015-08-17 03:41:13 UTC (rev 33811)
+++ packages/python-enable/trunk/debian/rules	2015-08-17 04:23:05 UTC (rev 33812)
@@ -5,7 +5,6 @@
 
 DEB_COMPRESS_EXCLUDE		:= .py
 DEB_PYTHON_INSTALL_ARGS_ALL 	+= --single-version-externally-managed
-DEB_INSTALL_CHANGELOGS_ALL      += docs/CHANGES.txt
 PYSHARED                         =$(DEB_DESTDIR)/usr/share/pyshared
 PYLIBS                           =$(DEB_DESTDIR)/usr/lib/python*
 EXAMPLES                         =$(DEB_DESTDIR)/usr/share/doc/python-enable
@@ -22,7 +21,6 @@
 	find $(EXAMPLES) -type f | xargs sed -i '/^#!/d'
 	find $(EXAMPLES) -type f | xargs chmod 644
 	find $(EXAMPLES) -name '.gitignore' -delete
-	find $(EXAMPLES) -name 'CHANGES.txt.gz' -delete
 
 get-orig-source:
 	-uscan --force-download --rename

Modified: packages/python-enable/trunk/debian/watch
===================================================================
--- packages/python-enable/trunk/debian/watch	2015-08-17 03:41:13 UTC (rev 33811)
+++ packages/python-enable/trunk/debian/watch	2015-08-17 04:23:05 UTC (rev 33812)
@@ -1,4 +1,4 @@
 version=3
 opts="uversionmangle=s/([ab])/~$1/,dversionmangle=s/\+.*//" \
-http://pypi.python.org/pypi/enable .*enable-(.*).tar.gz \
+http://pypi.debian.net/enable/enable-(.*).tar.gz \
 debian debian/orig-tar.sh

More information about the Python-modules-commits mailing list