[Python-modules-commits] r15228 - in packages/matplotlib/trunk/debian (6 files)

Sun Jan 2 19:44:22 UTC 2011

Date: Sunday, January 2, 2011 @ 19:44:05
  Author: morph
Revision: 15228

merge experimental branch

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/10_build_fix.patch
  packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch
  packages/matplotlib/trunk/debian/patches/series
  packages/matplotlib/trunk/debian/rules
Deleted:
  packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.patch

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================

--- packages/matplotlib/trunk/debian/changelog	2011-01-02 15:23:27 UTC (rev 15227)
+++ packages/matplotlib/trunk/debian/changelog	2011-01-02 19:44:05 UTC (rev 15228)
@@ -1,3 +1,13 @@
+matplotlib (1.0.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/patches/{10_build_fix.patch, 20_matplotlibrc_path_search_fix.patch}
+    - updated to new upstream code
+  * debian/patches/30_doc_pass_dpi.patch
+    - removed, merged upstream
+
+ -- Sandro Tosi <morph at debian.org>  Thu, 15 Jul 2010 17:58:36 +0200
+
 matplotlib (0.99.3-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/matplotlib/trunk/debian/patches/10_build_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/10_build_fix.patch	2011-01-02 15:23:27 UTC (rev 15227)
+++ packages/matplotlib/trunk/debian/patches/10_build_fix.patch	2011-01-02 19:44:05 UTC (rev 15228)
@@ -3,11 +3,11 @@
 Author: Sandro Tosi <morph at debian.org>
 Last-Update: 2010-02-06
 
-Index: matplotlib-0.99.3/setupext.py
+Index: matplotlib-1.0~rc1/setupext.py
 ===================================================================
---- matplotlib-0.99.3.orig/setupext.py	2010-03-09 15:20:20.000000000 +0100
-+++ matplotlib-0.99.3/setupext.py	2010-06-12 10:01:18.165019669 +0200
-@@ -47,12 +47,12 @@
+--- matplotlib-1.0~rc1.orig/setupext.py	2010-06-07 15:11:57.000000000 +0200
++++ matplotlib-1.0~rc1/setupext.py	2010-06-30 20:05:25.676158843 +0200
+@@ -49,12 +49,12 @@
  
  basedir = {
      'win32'  : ['win32_static',],
@@ -26,7 +26,7 @@
      'cygwin' : ['/usr/local', '/usr',],
      '_darwin' : ['/sw/lib/freetype2', '/sw/lib/freetype219', '/usr/local',
                  '/usr', '/sw'],
-@@ -67,11 +67,12 @@
+@@ -69,10 +69,10 @@
      'freebsd5' : ['/usr/local', '/usr'],
      'freebsd6' : ['/usr/local', '/usr'],
      'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
@@ -38,8 +38,6 @@
 +    'gnukfreebsd6' : ['/usr'],
 +    'gnukfreebsd7' : ['/usr'],
 +    'gnukfreebsd8' : ['/usr'],
+     'gnu0' : ['/usr'],
      'aix5' : ['/usr/local'],
-+    'gnu0' : ['/usr'],
  }
- 
- import sys, os, stat

Modified: packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch	2011-01-02 15:23:27 UTC (rev 15227)
+++ packages/matplotlib/trunk/debian/patches/20_matplotlibrc_path_search_fix.patch	2011-01-02 19:44:05 UTC (rev 15228)
@@ -2,23 +2,25 @@
 Forwarded: not-needed
 Author: Sandro Tosi <morph at debian.org>
 
---- matplotlib-0.98.3.orig/lib/matplotlib/__init__.py	2008-08-22 11:52:37.253904720 +0200
-+++ matplotlib-0.98.3/lib/matplotlib/__init__.py	2008-08-22 11:52:42.250189441 +0200
-@@ -453,9 +453,11 @@
+Index: matplotlib-1.0~rc1/lib/matplotlib/__init__.py
+===================================================================
+--- matplotlib-1.0~rc1.orig/lib/matplotlib/__init__.py	2010-06-29 15:30:11.000000000 +0200
++++ matplotlib-1.0~rc1/lib/matplotlib/__init__.py	2010-07-01 18:48:46.494542076 +0200
+@@ -489,10 +489,12 @@
              raise RuntimeError('Path in environment MATPLOTLIBDATA not a directory')
          return path
  
 -    path = os.sep.join([os.path.dirname(__file__), 'mpl-data'])
 +    path = '/usr/share/matplotlib/mpl-data'
-     if os.path.isdir(path): return path
--
-+    
+     if os.path.isdir(path):
+         return path
+ 
 +    raise RuntimeError('Could not find the matplotlib data files')
-+    
++
      # setuptools' namespace_packages may highjack this init file
      # so need to try something known to be in matplotlib, not basemap
      import matplotlib.afm
-@@ -566,7 +568,7 @@
+@@ -600,7 +602,7 @@
      if os.path.exists(fname): return fname
  
  

Deleted: packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.patch	2011-01-02 15:23:27 UTC (rev 15227)
+++ packages/matplotlib/trunk/debian/patches/30_doc_pass_dpi.patch	2011-01-02 19:44:05 UTC (rev 15228)
@@ -1,16 +0,0 @@
-Description: Pass DPI, along with format, in plot format configuration
-Forwarded: yes
-Author: Sandro Tosi <morph at debian.org>
-
-diff -urNad matplotlib~/doc/make.py matplotlib/doc/make.py
---- matplotlib~/doc/make.py	2009-08-01 21:14:12.000000000 +0200
-+++ matplotlib/doc/make.py	2009-10-09 08:56:04.000000000 +0200
-@@ -30,7 +30,7 @@
-     check_build()
-     shutil.copy('../lib/matplotlib/mpl-data/matplotlibrc', '_static/matplotlibrc')
-     if small_docs:
--        options = "-D plot_formats=\"['png']\""
-+        options = "-D plot_formats=\"[('png', 80)]\""
-     else:
-         options = ''
-     if os.system('sphinx-build %s -P -b html -d build/doctrees . build/html' % options):

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2011-01-02 15:23:27 UTC (rev 15227)
+++ packages/matplotlib/trunk/debian/patches/series	2011-01-02 19:44:05 UTC (rev 15228)
@@ -1,3 +1,2 @@
 10_build_fix.patch
 20_matplotlibrc_path_search_fix.patch
-30_doc_pass_dpi.patch

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2011-01-02 15:23:27 UTC (rev 15227)
+++ packages/matplotlib/trunk/debian/rules	2011-01-02 19:44:05 UTC (rev 15228)
@@ -44,7 +44,7 @@
 	done
 
 	# clean the doc
-	( cd doc ; ./make.py clean )
+	-( cd doc ; ./make.py clean )
 
 	# workaround for cleaning the doc ("doc/make.py clean" only runs useless svn-clean)
 	rm -rf doc/build doc/examples


