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

[morph at users.alioth.debian.org]

    Date: Thursday, March 10, 2011 @ 19:02:24
  Author: morph
Revision: 16090

* debian/patches/{10_doc_relocation, 20_example_dirs_remove,
                  30_use_local_objects.inv}
  - refreshed/adapted to new upstream code

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	2011-03-10 18:44:03 UTC (rev 16089)
+++ packages/python-networkx/trunk/debian/changelog	2011-03-10 19:02:24 UTC (rev 16090)
@@ -14,8 +14,11 @@
   * debian/patches/{40_add_networkxcss, 50_boundary-test-fix.patch
                     60_remove_svn_refs.diff 70_set_matplotlib_ps_backend.patch}
     - removed since merged upstream
+  * debian/patches/{10_doc_relocation, 20_example_dirs_remove,
+                    30_use_local_objects.inv}
+    - refreshed/adapted to new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Thu, 10 Mar 2011 19:43:15 +0100
+ -- Sandro Tosi <morph at debian.org>  Thu, 10 Mar 2011 20:00:52 +0100
 
 python-networkx (1.3-1) experimental; urgency=low
 

Modified: packages/python-networkx/trunk/debian/patches/10_doc_relocation
===================================================================
--- packages/python-networkx/trunk/debian/patches/10_doc_relocation	2011-03-10 18:44:03 UTC (rev 16089)
+++ packages/python-networkx/trunk/debian/patches/10_doc_relocation	2011-03-10 19:02:24 UTC (rev 16090)
@@ -1,12 +1,12 @@
-Index: python-networkx-1.3/setup.py
+Index: python-networkx-1.4/setup.py
 ===================================================================
---- python-networkx-1.3.orig/setup.py	2010-08-29 02:22:19.000000000 +0200
-+++ python-networkx-1.3/setup.py	2010-09-13 23:29:47.322011049 +0200
-@@ -45,7 +45,7 @@
+--- python-networkx-1.4.orig/setup.py	2011-01-23 23:38:57.000000000 +0100
++++ python-networkx-1.4/setup.py	2011-03-10 19:59:13.864033970 +0100
+@@ -46,7 +46,7 @@
            "networkx.readwrite",
            "networkx.tests"]
  
--docdirbase  = 'share/doc/networkx-%s' % release.version
+-docdirbase  = 'share/doc/networkx-%s' % version
 +docdirbase  = 'share/doc/python-networkx'
  # add basic documentation 
  data = [(docdirbase, glob("*.txt"))]

Modified: packages/python-networkx/trunk/debian/patches/20_example_dirs_remove
===================================================================
--- packages/python-networkx/trunk/debian/patches/20_example_dirs_remove	2011-03-10 18:44:03 UTC (rev 16089)
+++ packages/python-networkx/trunk/debian/patches/20_example_dirs_remove	2011-03-10 19:02:24 UTC (rev 16090)
@@ -1,11 +1,11 @@
 Description: Don't created dirs for examples no more present
 Author: Sandro Tosi <morph at debian.org>
 
-Index: python-networkx-1.1/setup.py
+Index: python-networkx-1.4/setup.py
 ===================================================================
---- python-networkx-1.1.orig/setup.py	2010-04-24 12:02:15.000000000 +0200
-+++ python-networkx-1.1/setup.py	2010-04-24 12:02:53.861413002 +0200
-@@ -56,7 +56,7 @@
+--- python-networkx-1.4.orig/setup.py	2011-03-10 19:59:57.596356364 +0100
++++ python-networkx-1.4/setup.py	2011-03-10 20:00:00.188138405 +0100
+@@ -57,7 +57,7 @@
            'graph',
            'multigraph',
            'pygraphviz',

Modified: packages/python-networkx/trunk/debian/patches/30_use_local_objects.inv
===================================================================
--- packages/python-networkx/trunk/debian/patches/30_use_local_objects.inv	2011-03-10 18:44:03 UTC (rev 16089)
+++ packages/python-networkx/trunk/debian/patches/30_use_local_objects.inv	2011-03-10 19:02:24 UTC (rev 16090)
@@ -1,10 +1,10 @@
 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
 
-Index: python-networkx-1.3/doc/source/conf.py
+Index: python-networkx-1.4/doc/source/conf.py
 ===================================================================
---- python-networkx-1.3.orig/doc/source/conf.py	2010-09-21 22:37:11.395861524 +0200
-+++ python-networkx-1.3/doc/source/conf.py	2010-09-21 22:38:17.098360127 +0200
-@@ -153,7 +153,7 @@
+--- python-networkx-1.4.orig/doc/source/conf.py	2011-03-10 19:59:54.164644956 +0100
++++ python-networkx-1.4/doc/source/conf.py	2011-03-10 20:00:09.163383619 +0100
+@@ -158,8 +158,8 @@
  #latex_appendices = ['credits']
  
  # Intersphinx mapping
@@ -13,4 +13,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