[Python-modules-commits] r15282 - in packages/matplotlib/trunk/debian (4 files)

[morph at users.alioth.debian.org]

    Date: Monday, January 10, 2011 @ 23:29:06
  Author: morph
Revision: 15282

* debian/rules, debian/patches/30_disable_sample_downloads.patch
  - bypass examples download from internet, but use local copy instead

Added:
  packages/matplotlib/trunk/debian/patches/30_disable_sample_downloads.patch
Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series
  packages/matplotlib/trunk/debian/rules

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2011-01-10 22:31:54 UTC (rev 15281)
+++ packages/matplotlib/trunk/debian/changelog	2011-01-10 23:29:06 UTC (rev 15282)
@@ -8,8 +8,10 @@
   * debian/rules
     - don't compress objects.inv; thanks to Michael Fladischer for the report;
       Closes: #608760
+  * debian/rules, debian/patches/30_disable_sample_downloads.patch
+    - bypass examples download from internet, but use local copy instead
 
- -- Sandro Tosi <morph at debian.org>  Mon, 10 Jan 2011 23:31:06 +0100
+ -- Sandro Tosi <morph at debian.org>  Tue, 11 Jan 2011 00:28:26 +0100
 
 matplotlib (0.99.3-1) unstable; urgency=low
 

Added: packages/matplotlib/trunk/debian/patches/30_disable_sample_downloads.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/30_disable_sample_downloads.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/30_disable_sample_downloads.patch	2011-01-10 23:29:06 UTC (rev 15282)
@@ -0,0 +1,15 @@
+Description: disable download of sample data (used to run examples)
+Author: Benjamin Gamari <bgamari.foss at gmail.com>
+
+Index: matplotlib-1.0.1/matplotlibrc.template
+===================================================================
+--- matplotlib-1.0.1.orig/matplotlibrc.template	2011-01-01 21:49:44.000000000 -0500
++++ matplotlib-1.0.1/matplotlibrc.template	2011-01-01 22:13:35.720384573 -0500
+@@ -377,5 +377,5 @@
+ # where you have a checkout of
+ # https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/sample_data
+ 
+-#examples.download : True  # False to bypass downloading mechanism
+-#examples.directory : ''   # directory to look in if download is false
++examples.download : False  # False to bypass downloading mechanism
++examples.directory : '/usr/share/matplotlib/sample_data'   # absolute directory to look in if download is false

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2011-01-10 22:31:54 UTC (rev 15281)
+++ packages/matplotlib/trunk/debian/patches/series	2011-01-10 23:29:06 UTC (rev 15282)
@@ -1,2 +1,3 @@
 10_build_fix.patch
 20_matplotlibrc_path_search_fix.patch
+30_disable_sample_downloads.patch

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2011-01-10 22:31:54 UTC (rev 15281)
+++ packages/matplotlib/trunk/debian/rules	2011-01-10 23:29:06 UTC (rev 15282)
@@ -15,6 +15,10 @@
 build-indep-stamp: $(DEFPY:%=build-%-stamp)
 	dh_testdir
 
+	# add information to use local copy of 'sampledata' and bypass downloading
+	echo "examples.download : False" >> $(CURDIR)/doc/matplotlibrc
+	echo "examples.directory : $(CURDIR)/sampledata" >> $(CURDIR)/doc/matplotlibrc
+
 	# build the doc
 	-( cd doc ; MATPLOTLIBDATA=../lib/matplotlib/mpl-data/ \
 		PYTHONPATH=../build/lib.$(PY_PLATFORM)-$(DEFPY) ./make.py --small all )
@@ -63,6 +67,8 @@
 	rm -rf build
 	rm -rf lib/matplotlib.egg-info
 
+	# restore "pristine" doc/matplotlibrc
+	sed -i '/^examples\./d' $(CURDIR)/doc/matplotlibrc
 
 # install
 install-arch: build-arch $(PYVERS:%=install-%-stamp)