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

[morph at users.alioth.debian.org]

    Date: Saturday, July 6, 2013 @ 21:19:13
  Author: morph
Revision: 25098

* debian/patches/70_symlink_examples_to_build_doc.patch
  - symlink examples into doc/ dir, needed to build documentation

Added:
  packages/matplotlib/trunk/debian/patches/70_symlink_examples_to_build_doc.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	2013-07-06 19:30:20 UTC (rev 25097)
+++ packages/matplotlib/trunk/debian/changelog	2013-07-06 21:19:13 UTC (rev 25098)
@@ -16,12 +16,14 @@
     - refreshed and removed merged patch
   * debian/patches/60_override_loader_during_tests.patch
     - override __loader__ function during tests
+  * debian/patches/70_symlink_examples_to_build_doc.patch
+    - symlink examples into doc/ dir, needed to build documentation
 
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
   * Fix typos in README.debian.
 
- -- Sandro Tosi <morph at debian.org>  Wed, 03 Jul 2013 23:58:40 +0200
+ -- Sandro Tosi <morph at debian.org>  Sat, 06 Jul 2013 23:13:41 +0200
 
 matplotlib (1.2.0-1) experimental; urgency=low
 

Added: packages/matplotlib/trunk/debian/patches/70_symlink_examples_to_build_doc.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/70_symlink_examples_to_build_doc.patch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/70_symlink_examples_to_build_doc.patch	2013-07-06 21:19:13 UTC (rev 25098)
@@ -0,0 +1,22 @@
+Description: Create the doc/mpl_examples symlink if not existing.
+Author: Michael Droettboom
+Origin: upstream, https://github.com/matplotlib/matplotlib/pull/2187
+Applied-Upstream: https://github.com/mdboom/matplotlib/commit/63405ffaa3fb164950d79408855485f5c4b3d9f2
+Last-Update: 2013-07-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/make.py
++++ b/doc/make.py
+@@ -236,6 +236,12 @@ current_dir = os.getcwd()
+ os.chdir(os.path.dirname(os.path.join(current_dir, __file__)))
+ copy_if_out_of_date('../INSTALL', 'users/installing.rst')
+ 
++# Create the examples symlink, if it doesn't exist
++if not os.path.exists('mpl_examples'):
++    if hasattr(os, 'symlink'):
++        os.symlink('../examples', 'mpl_examples')
++    else:
++        shutil.copytree('../examples', 'mpl_examples')
+ 
+ if len(sys.argv)>1:
+     if '--small' in sys.argv[1:]:

Modified: packages/matplotlib/trunk/debian/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2013-07-06 19:30:20 UTC (rev 25097)
+++ packages/matplotlib/trunk/debian/patches/series	2013-07-06 21:19:13 UTC (rev 25098)
@@ -3,3 +3,4 @@
 40_bts608939_draw_markers_description.patch
 50_bts608942_spaces_in_param_args.patch
 60_override_loader_during_tests.patch
+70_symlink_examples_to_build_doc.patch

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2013-07-06 19:30:20 UTC (rev 25097)
+++ packages/matplotlib/trunk/debian/rules	2013-07-06 21:19:13 UTC (rev 25098)
@@ -91,6 +91,9 @@
 	# restore "pristine" doc/matplotlibrc
 	sed -i '/^examples\./d' $(CURDIR)/doc/matplotlibrc
 
+	# remove doc symlinks to examples directory
+	rm -rf doc/mpl_examples
+
 # install
 install-arch: build-arch $(PY2VERS:%=install-%-stamp) $(PY3VERS:%=install-py3-%-stamp)
 	dh_testdir