[Python-modules-commits] r29492 - in packages/python-networkx/trunk/debian (4 files)

[zigo at users.alioth.debian.org]

    Date: Wednesday, June 25, 2014 @ 17:22:38
  Author: zigo
Revision: 29492

Refreshed/rebased 10_doc_relocation, 20_example_dirs_remove and 30_use_local_objects.inv patches.

Modified:
  packages/python-networkx/trunk/debian/changelog
  packages/python-networkx/trunk/debian/patches/10_doc_relocation
  packages/python-networkx/trunk/debian/patches/20_example_dirs_remove
  packages/python-networkx/trunk/debian/patches/30_use_local_objects.inv

Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog	2014-06-25 17:22:35 UTC (rev 29491)
+++ packages/python-networkx/trunk/debian/changelog	2014-06-25 17:22:38 UTC (rev 29492)
@@ -5,6 +5,8 @@
   * debian/copyright in parseable format 1.0.
   * Added extend-diff-ignore = "^[^/]*[.]egg-info/" in d/source/options, and
     removed the clean of the egg-info folder.
+  * Refreshed/rebased 10_doc_relocation, 20_example_dirs_remove and
+    30_use_local_objects.inv patches.
 
  -- Thomas Goirand <zigo at debian.org>  Sun, 22 Jun 2014 07:11:42 +0000
 

Modified: packages/python-networkx/trunk/debian/patches/10_doc_relocation
===================================================================
--- packages/python-networkx/trunk/debian/patches/10_doc_relocation	2014-06-25 17:22:35 UTC (rev 29491)
+++ packages/python-networkx/trunk/debian/patches/10_doc_relocation	2014-06-25 17:22:38 UTC (rev 29492)
@@ -1,13 +1,16 @@
 Description: install doc in the right place for Debian
+Author: Thomas Goirand <zigo at debian.org>
+Forwarded: no
+Last-Update: 2014-06-22
 
---- a/setup.py
-+++ b/setup.py
-@@ -62,7 +62,7 @@ if sys.version >= '3':
- else:
-     packages.append('networkx.external.decorator.decorator2')
+--- a/setup.py	2014-06-22 07:52:32.000000000 +0000
++++ b/setup.py	2014-06-22 07:52:50.000000000 +0000
+@@ -58,7 +58,7 @@
+           "networkx.testing",
+           "networkx.utils"]
  
 -docdirbase  = 'share/doc/networkx-%s' % version
 +docdirbase  = 'share/doc/python-networkx'
- # add basic documentation 
+ # add basic documentation
  data = [(docdirbase, glob("*.txt"))]
  # add examples

Modified: packages/python-networkx/trunk/debian/patches/20_example_dirs_remove
===================================================================
--- packages/python-networkx/trunk/debian/patches/20_example_dirs_remove	2014-06-25 17:22:35 UTC (rev 29491)
+++ packages/python-networkx/trunk/debian/patches/20_example_dirs_remove	2014-06-25 17:22:38 UTC (rev 29492)
@@ -1,14 +1,16 @@
 Description: Don't created dirs for examples no more present
 Author: Sandro Tosi <morph at debian.org>
+Forwarded: no
+Last-Update: 2014-06-22
 
---- a/setup.py
-+++ b/setup.py
-@@ -74,7 +74,7 @@ for d in ['advanced',
+--- a/setup.py	2014-06-22 07:54:45.000000000 +0000
++++ b/setup.py	2014-06-22 07:55:00.000000000 +0000
+@@ -70,7 +70,7 @@
            'graph',
            'multigraph',
            'pygraphviz',
 -          'readwrite']:
 +          'subclass']:
-     dd=os.path.join(docdirbase,'examples',d)
-     pp=os.path.join('examples',d)
-     data.append((dd,glob(os.path.join(pp,"*.py"))))
+     dd = os.path.join(docdirbase,'examples', d)
+     pp = os.path.join('examples', d)
+     data.append((dd, glob(os.path.join(pp ,"*.py"))))

Modified: packages/python-networkx/trunk/debian/patches/30_use_local_objects.inv
===================================================================
--- packages/python-networkx/trunk/debian/patches/30_use_local_objects.inv	2014-06-25 17:22:35 UTC (rev 29491)
+++ packages/python-networkx/trunk/debian/patches/30_use_local_objects.inv	2014-06-25 17:22:38 UTC (rev 29492)
@@ -1,8 +1,9 @@
 Description: Use a local copy of object.inv from doc.python.org and docs.scipy.org, instead of downloading them each time from the internet
+Last-Update: 2014-06-22
 
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -164,8 +164,8 @@ latex_documents = [('tutorial/index', 'n
+@@ -167,8 +167,8 @@ latex_documents = [('tutorial/index', 'n
  #latex_appendices = ['credits']
  
  # Intersphinx mapping
@@ -11,5 +12,5 @@
 +intersphinx_mapping = {'http://docs.python.org/': '../../debian/python.org_objects.inv',
 +                       'http://docs.scipy.org/doc/numpy/': '../../debian/scipy.org_numpy_objects.inv',
                        }
-                       
+ 
  # For trac custom roles