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

[morph at users.alioth.debian.org]

    Date: Monday, July 29, 2013 @ 20:38:26
  Author: morph
Revision: 25305

remove patches included in RC5

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/series
Deleted:
  packages/matplotlib/trunk/debian/patches/60_override_loader_during_tests.patch
  packages/matplotlib/trunk/debian/patches/70_symlink_examples_to_build_doc.patch

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2013-07-29 19:06:40 UTC (rev 25304)
+++ packages/matplotlib/trunk/debian/changelog	2013-07-29 20:38:26 UTC (rev 25305)
@@ -14,10 +14,6 @@
     - changed location of user-specific config file
   * debian/patches/*
     - 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
   * debian/copyright
     - extend packaging copyright years
     - update upstream copyright notice

Deleted: packages/matplotlib/trunk/debian/patches/60_override_loader_during_tests.patch
===================================================================
--- packages/matplotlib/trunk/debian/patches/60_override_loader_during_tests.patch	2013-07-29 19:06:40 UTC (rev 25304)
+++ packages/matplotlib/trunk/debian/patches/60_override_loader_during_tests.patch	2013-07-29 20:38:26 UTC (rev 25305)
@@ -1,18 +0,0 @@
-Description: On Python 3.3, the __loader__ variable may get set when modules are loaded, so this is ok to override
-Author: Michael Droettboom
-Origin: upstream, https://github.com/matplotlib/matplotlib/pull/2170
-Forwarded: not-needed
-Applied-Upstream: https://github.com/matplotlib/matplotlib/commit/263f853d613550476fce560a630d272daec930e5
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-
---- a/lib/matplotlib/tests/test_basic.py
-+++ b/lib/matplotlib/tests/test_basic.py
-@@ -16,6 +16,7 @@ def test_override_builtins():
-         '__name__',
-         '__doc__',
-         '__package__',
-+        '__loader__',
-         'any',
-         'all',
-         'sum'

Deleted: 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-29 19:06:40 UTC (rev 25304)
+++ packages/matplotlib/trunk/debian/patches/70_symlink_examples_to_build_doc.patch	2013-07-29 20:38:26 UTC (rev 25305)
@@ -1,30 +0,0 @@
-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,
- 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,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
-+
-+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/patches/series
===================================================================
--- packages/matplotlib/trunk/debian/patches/series	2013-07-29 19:06:40 UTC (rev 25304)
+++ packages/matplotlib/trunk/debian/patches/series	2013-07-29 20:38:26 UTC (rev 25305)
@@ -2,5 +2,3 @@
 20_matplotlibrc_path_search_fix.patch
 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