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

[zigo at users.alioth.debian.org]

    Date: Wednesday, June 25, 2014 @ 17:23:03
  Author: zigo
Revision: 29499

 * Added do-not-use-sphinx_rtd_theme.patch.
 * debian/rules: do not use setup_egg.py, it's gone from upstream source.

Added:
  packages/python-networkx/trunk/debian/patches/do-not-use-sphinx_rtd_theme.patch
Modified:
  packages/python-networkx/trunk/debian/changelog
  packages/python-networkx/trunk/debian/patches/series
  packages/python-networkx/trunk/debian/rules

Modified: packages/python-networkx/trunk/debian/changelog
===================================================================
--- packages/python-networkx/trunk/debian/changelog	2014-06-25 17:23:00 UTC (rev 29498)
+++ packages/python-networkx/trunk/debian/changelog	2014-06-25 17:23:03 UTC (rev 29499)
@@ -17,6 +17,8 @@
     in upstream source code).
   * Also cleans networkx/version.py, which is generated.
   * Also cleans test.* and doc/source/templates/gallery.html
+  * Added do-not-use-sphinx_rtd_theme.patch.
+  * debian/rules: do not use setup_egg.py, it's gone from upstream source.
 
  -- Thomas Goirand <zigo at debian.org>  Sun, 22 Jun 2014 07:11:42 +0000
 

Added: packages/python-networkx/trunk/debian/patches/do-not-use-sphinx_rtd_theme.patch
===================================================================
--- packages/python-networkx/trunk/debian/patches/do-not-use-sphinx_rtd_theme.patch	                        (rev 0)
+++ packages/python-networkx/trunk/debian/patches/do-not-use-sphinx_rtd_theme.patch	2014-06-25 17:23:03 UTC (rev 29499)
@@ -0,0 +1,21 @@
+Description: Do not use sphinx_rtd_theme theme
+ Do not use sphinx_rtd_theme theme
+Author: Thomas Goirand <zigo at debian.org>
+Forwarded: no
+Last-Update: 2014-06-24
+
+--- python-networkx-1.9.orig/doc/source/conf.py
++++ python-networkx-1.9/doc/source/conf.py
+@@ -95,9 +95,9 @@ doctest_global_setup="import networkx as
+ 
+ # Options for HTML output
+ # -----------------------
+-import sphinx_rtd_theme
+-html_theme = "sphinx_rtd_theme"
+-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
++##import sphinx_rtd_theme
++##html_theme = "sphinx_rtd_theme"
++##html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+ #html_theme_options = {
+ #    "rightsidebar": "true",
+ #    "relbarbgcolor: "black"

Modified: packages/python-networkx/trunk/debian/patches/series
===================================================================
--- packages/python-networkx/trunk/debian/patches/series	2014-06-25 17:23:00 UTC (rev 29498)
+++ packages/python-networkx/trunk/debian/patches/series	2014-06-25 17:23:03 UTC (rev 29499)
@@ -2,3 +2,4 @@
 20_example_dirs_remove
 30_use_local_objects.inv
 python-3.4.patch
+do-not-use-sphinx_rtd_theme.patch

Modified: packages/python-networkx/trunk/debian/rules
===================================================================
--- packages/python-networkx/trunk/debian/rules	2014-06-25 17:23:00 UTC (rev 29498)
+++ packages/python-networkx/trunk/debian/rules	2014-06-25 17:23:03 UTC (rev 29499)
@@ -32,21 +32,21 @@
 	set -e ; \
 	# running tests
 	for py in $(PYTHON2) ; do\
-		PYTHONPATH=$(LIB2) $$py setup_egg.py nosetests ; \
+		PYTHONPATH=$(LIB2) $$py setup.py nosetests ; \
 	done
 	set -e ; \
 	# running tests Python 3
 	for py in $(PYTHON3) ; do\
-		PYTHONPATH=$(LIB3) $$py setup_egg.py nosetests ; \
+		PYTHONPATH=$(LIB3) $$py setup.py nosetests ; \
 	done
 endif
 
 override_dh_install:
 	# Install w/o compiling *.pyc files
 	# Install egg-info directories (--single-... option)
-	python setup_egg.py install --no-compile --root=$(CURDIR)/debian/python-networkx \
+	python setup.py install --no-compile --root=$(CURDIR)/debian/python-networkx \
 		--single-version-externally-managed --install-layout=deb
-	python3 setup_egg.py install --no-compile --root=$(CURDIR)/debian/python3-networkx \
+	python3 setup.py install --no-compile --root=$(CURDIR)/debian/python3-networkx \
 		--single-version-externally-managed --install-layout=deb
 
 	# Fix executable bits: