[Python-modules-commits] r7108 - in packages/matplotlib/trunk/debian (6 files)

[morph at users.alioth.debian.org]

    Date: Tuesday, December 16, 2008 @ 19:14:57
  Author: morph
Revision: 7108

  - bump build-depends in python-sphinx to at least 0.5 (upstream doc build
    system requires it)
  - removed 'API_CHANGES' installation, since removed 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)

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

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2008-12-16 14:13:52 UTC (rev 7107)
+++ packages/matplotlib/trunk/debian/changelog	2008-12-16 19:14:57 UTC (rev 7108)
@@ -24,6 +24,8 @@
       line
     - moved 'dvipng' from Recommends to Suggests (to avoid texlive to be
       automatically taken in); Closes: #490992
+    - bump build-depends in python-sphinx to at least 0.5 (upstream doc build
+      system requires it)
   * debian/NEWS
     - added to notify users about default backend (TkAgg)
     - added note about 'dvipng' not installed automatically anymore
@@ -31,11 +33,16 @@
     - added information about changing backend
   * debian/rules
     - merging all "rm" calls into "dh_clean" call
+    - removed 'API_CHANGES' installation, since removed upstream
   * debian/{control,rules,patches/*}
     - moved from quilt to dpatch
   * 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)
 
  -- Benjamin Drung <benjamin.drung at gmail.com>  Sat, 08 Nov 2008 00:33:36 +0100
 

Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control	2008-12-16 14:13:52 UTC (rev 7107)
+++ packages/matplotlib/trunk/debian/control	2008-12-16 19:14:57 UTC (rev 7108)
@@ -29,7 +29,7 @@
                python-pkg-resources,
                python-qt-dev,
                python-qt4-dev,
-               python-sphinx (>= 0.4.1-2lenny1),
+               python-sphinx (>= 0.5),
                python-tk,
                python-tz,
                python-wxgtk2.8,

Deleted: packages/matplotlib/trunk/debian/docs
===================================================================
--- packages/matplotlib/trunk/debian/docs	2008-12-16 14:13:52 UTC (rev 7107)
+++ packages/matplotlib/trunk/debian/docs	2008-12-16 19:14:57 UTC (rev 7108)
@@ -1,4 +0,0 @@
-API_CHANGES
-INTERACTIVE
-KNOWN_BUGS
-TODO

Modified: packages/matplotlib/trunk/debian/patches/00list
===================================================================
--- packages/matplotlib/trunk/debian/patches/00list	2008-12-16 14:13:52 UTC (rev 7107)
+++ packages/matplotlib/trunk/debian/patches/00list	2008-12-16 19:14:57 UTC (rev 7108)
@@ -1,2 +1,3 @@
 10_build_fix.dpatch
 20_matplotlibrc_path_search_fix.dpatch
+30_doc_copy_another_matplotlibrc

Added: packages/matplotlib/trunk/debian/patches/30_doc_copy_another_matplotlibrc.dpatch
===================================================================
--- packages/matplotlib/trunk/debian/patches/30_doc_copy_another_matplotlibrc.dpatch	                        (rev 0)
+++ packages/matplotlib/trunk/debian/patches/30_doc_copy_another_matplotlibrc.dpatch	2008-12-16 19:14:57 UTC (rev 7108)
@@ -0,0 +1,19 @@
+#! /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.")


Property changes on: packages/matplotlib/trunk/debian/patches/30_doc_copy_another_matplotlibrc.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2008-12-16 14:13:52 UTC (rev 7107)
+++ packages/matplotlib/trunk/debian/rules	2008-12-16 19:14:57 UTC (rev 7108)
@@ -121,7 +121,7 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_installchangelogs -a CHANGELOG
-	dh_installdocs -p$(p) -a README.txt TODO API_CHANGES KNOWN_BUGS INTERACTIVE
+	dh_installdocs -p$(p) -a README.txt TODO KNOWN_BUGS INTERACTIVE
 	# make python scripts starting with '#!' executable
 	for i in `find debian -mindepth 2 -type f ! -perm 755`; do \
 	  if head -1 $$i | grep -q '^#!'; then \