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

[morph at users.alioth.debian.org]

    Date: Sunday, August 4, 2013 @ 12:06:48
  Author: morph
Revision: 25371

* debian/patches/*
  - refreshed 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
  packages/python-networkx/trunk/debian/patches/40_no_setuptools_in_requires.txt

Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog	2013-08-04 09:06:00 UTC (rev 25370)
+++ packages/python-networkx/trunk/debian/changelog	2013-08-04 12:06:48 UTC (rev 25371)
@@ -9,8 +9,10 @@
     - update upstream copyright years
     - extend packaging copyright years
     - added decorator copyright notice
+  * debian/patches/*
+    - refreshed patches
 
- -- Sandro Tosi <morph at debian.org>  Sun, 04 Aug 2013 11:05:46 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 04 Aug 2013 14:06:35 +0200
 
 python-networkx (1.7-2) experimental; urgency=low
 

Modified: packages/python-networkx/trunk/debian/patches/10_doc_relocation
===================================================================
--- packages/python-networkx/trunk/debian/patches/10_doc_relocation	2013-08-04 09:06:00 UTC (rev 25370)
+++ packages/python-networkx/trunk/debian/patches/10_doc_relocation	2013-08-04 12:06:48 UTC (rev 25371)
@@ -1,12 +1,10 @@
 Description: install doc in the right place for Debian
 
-Index: python-networkx-1.7~rc1/setup.py
-===================================================================
---- python-networkx-1.7~rc1.orig/setup.py	2012-06-12 23:49:40.000000000 +0200
-+++ python-networkx-1.7~rc1/setup.py	2012-06-14 22:47:19.908016772 +0200
-@@ -56,7 +56,7 @@
-           "networkx.testing",
-           "networkx.utils"]
+--- a/setup.py
++++ b/setup.py
+@@ -62,7 +62,7 @@ if sys.version >= '3':
+ else:
+     packages.append('networkx.external.decorator.decorator2')
  
 -docdirbase  = 'share/doc/networkx-%s' % version
 +docdirbase  = 'share/doc/python-networkx'

Modified: packages/python-networkx/trunk/debian/patches/20_example_dirs_remove
===================================================================
--- packages/python-networkx/trunk/debian/patches/20_example_dirs_remove	2013-08-04 09:06:00 UTC (rev 25370)
+++ packages/python-networkx/trunk/debian/patches/20_example_dirs_remove	2013-08-04 12:06:48 UTC (rev 25371)
@@ -1,11 +1,9 @@
 Description: Don't created dirs for examples no more present
 Author: Sandro Tosi <morph at debian.org>
 
-Index: python-networkx-1.7~rc1/setup.py
-===================================================================
---- python-networkx-1.7~rc1.orig/setup.py	2012-06-14 22:50:31.426168689 +0200
-+++ python-networkx-1.7~rc1/setup.py	2012-06-14 22:50:31.450168960 +0200
-@@ -68,7 +68,7 @@
+--- a/setup.py
++++ b/setup.py
+@@ -74,7 +74,7 @@ for d in ['advanced',
            '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	2013-08-04 09:06:00 UTC (rev 25370)
+++ packages/python-networkx/trunk/debian/patches/30_use_local_objects.inv	2013-08-04 12:06:48 UTC (rev 25371)
@@ -1,10 +1,8 @@
 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.7~rc1/doc/source/conf.py
-===================================================================
---- python-networkx-1.7~rc1.orig/doc/source/conf.py	2012-06-14 22:50:26.938118312 +0200
-+++ python-networkx-1.7~rc1/doc/source/conf.py	2012-06-14 22:50:41.818285325 +0200
-@@ -162,8 +162,8 @@
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -164,8 +164,8 @@ latex_documents = [('tutorial/index', 'n
  #latex_appendices = ['credits']
  
  # Intersphinx mapping

Modified: packages/python-networkx/trunk/debian/patches/40_no_setuptools_in_requires.txt
===================================================================
--- packages/python-networkx/trunk/debian/patches/40_no_setuptools_in_requires.txt	2013-08-04 09:06:00 UTC (rev 25370)
+++ packages/python-networkx/trunk/debian/patches/40_no_setuptools_in_requires.txt	2013-08-04 12:06:48 UTC (rev 25371)
@@ -1,9 +1,7 @@
 Description: Remove useless setuptools from requires.txt
-Index: python-networkx-1.6/setup_egg.py
-===================================================================
---- python-networkx-1.6.orig/setup_egg.py	2011-03-09 02:49:10.000000000 +0100
-+++ python-networkx-1.6/setup_egg.py	2011-12-26 13:23:30.733163309 +0100
-@@ -48,7 +48,6 @@
+--- a/setup_egg.py
++++ b/setup_egg.py
+@@ -48,7 +48,6 @@ if __name__ == "__main__":
          packages         = packages,
          data_files       = data,
          package_data     = package_data,