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

[morph at users.alioth.debian.org]

    Date: Thursday, December 18, 2008 @ 18:49:12
  Author: morph
Revision: 7123

removed 30_doc_copy_another_matplotlibrc.dpatch since now merged upstream

Modified:
  packages/matplotlib/trunk/debian/changelog
  packages/matplotlib/trunk/debian/patches/00list
Deleted:
  packages/matplotlib/trunk/debian/patches/30_doc_copy_another_matplotlibrc.dpatch

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2008-12-18 18:17:55 UTC (rev 7122)
+++ packages/matplotlib/trunk/debian/changelog	2008-12-18 18:49:12 UTC (rev 7123)
@@ -39,8 +39,6 @@
   * debian/patches/{matplotlibrc.template-typo.patch,doc_graphviz_errors_fix.patch,
                     bts-498229_axes3d_typo.patch}
     - removed since merged upstream
-  * debian/patches/30_doc_copy_another_matplotlibrc.dpatch
-    - added to use another matplotlibrc file for doc build
   * debian/docs
     - removed since not needed since long time (doc files are listed in debian/rules)
 

Modified: packages/matplotlib/trunk/debian/patches/00list
===================================================================
--- packages/matplotlib/trunk/debian/patches/00list	2008-12-18 18:17:55 UTC (rev 7122)
+++ packages/matplotlib/trunk/debian/patches/00list	2008-12-18 18:49:12 UTC (rev 7123)
@@ -1,3 +1,2 @@
 10_build_fix.dpatch
 20_matplotlibrc_path_search_fix.dpatch
-30_doc_copy_another_matplotlibrc

Deleted: packages/matplotlib/trunk/debian/patches/30_doc_copy_another_matplotlibrc.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/30_doc_copy_another_matplotlibrc.dpatch	2008-12-18 18:17:55 UTC (rev 7122)
+++ packages/matplotlib/trunk/debian/patches/30_doc_copy_another_matplotlibrc.dpatch	2008-12-18 18:49:12 UTC (rev 7123)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 30_doc_copy_another_matplotlibrc.dpatch by Sandro Tosi <morph at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Copies another matplotlibrc, the one built for mpl itself, for doc build
-
- at DPATCH@
-diff -urNad matplotlib~/doc/make.py matplotlib/doc/make.py
---- matplotlib~/doc/make.py	2008-12-10 02:52:52.000000000 +0100
-+++ matplotlib/doc/make.py	2008-12-15 18:20:41.189080788 +0100
-@@ -41,7 +41,7 @@
-     check_build()
-     if not os.path.exists('examples/index.rst'):
-         examples()
--    shutil.copy('mpl_data/matplotlibrc', '_static/matplotlibrc')
-+    shutil.copy('../lib/matplotlib/mpl-data/matplotlibrc', '_static/matplotlibrc')
-     #figs()
-     if os.system('sphinx-build -b html -d build/doctrees . build/html'):
-         raise SystemExit("Building HTML failed.")