[Python-modules-commits] r25231 - in packages/matplotlib/trunk/debian (3 files)

[morph at users.alioth.debian.org]

    Date: Sunday, July 21, 2013 @ 17:49:14
  Author: morph
Revision: 25231

New upstream release candidate

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/70_symlink_examples_to_build_doc.patch
  packages/matplotlib/trunk/debian/rules

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2013-07-20 09:05:10 UTC (rev 25230)
+++ packages/matplotlib/trunk/debian/changelog	2013-07-21 17:49:14 UTC (rev 25231)
@@ -1,4 +1,4 @@
-matplotlib (1.3.0~rc4-1) UNRELEASED; urgency=low
+matplotlib (1.3.0~rc5-1) UNRELEASED; urgency=low
 
   [ Sandro Tosi ]
   * New upstream release candidate; thanks to Julian Taylor for the report;

Modified: packages/matplotlib/trunk/debian/patches/70_symlink_examples_to_build_doc.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/70_symlink_examples_to_build_doc.patch	2013-07-20 09:05:10 UTC (rev 25230)
+++ packages/matplotlib/trunk/debian/patches/70_symlink_examples_to_build_doc.patch	2013-07-21 17:49:14 UTC (rev 25231)
@@ -1,22 +1,30 @@
 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
+Applied-Upstream: https://github.com/mdboom/matplotlib/commit/63405ffaa3fb164950d79408855485f5c4b3d9f2,
+ https://github.com/mdboom/matplotlib/commit/2c5ef7beabb4894e8c146fe002fc36ff5d47004e
+Last-Update: 2013-07-17
 ---
 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()
+@@ -236,6 +236,19 @@ 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')
++
++required_symlinks = [
++    ('mpl_examples', '../examples/'),
++    ('mpl_toolkits/axes_grid/examples', '../../../examples/axes_grid/')
++    ]
++
++for link, target in required_symlinks:
++    if not os.path.exists(link):
++        if hasattr(os, 'symlink'):
++            os.symlink(target, link)
++        else:
++            shutil.copytree(os.path.join(link, '..', target), link)
  
  if len(sys.argv)>1:
      if '--small' in sys.argv[1:]:

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2013-07-20 09:05:10 UTC (rev 25230)
+++ packages/matplotlib/trunk/debian/rules	2013-07-21 17:49:14 UTC (rev 25231)
@@ -93,6 +93,7 @@
 
 	# remove doc symlinks to examples directory
 	rm -rf doc/mpl_examples
+	rm -rf doc/mpl_toolkits/axes_grid/examples
 
 # install
 install-arch: build-arch $(PY2VERS:%=install-%-stamp) $(PY3VERS:%=install-py3-%-stamp)