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

[morph at users.alioth.debian.org]

    Date: Friday, September 17, 2010 @ 17:32:40
  Author: morph
Revision: 14441

* debian/patches/20_doc_install_path, debian/rules
  - install the documentation in the expected Debian directory, so part of doc
    installation was semplified in rules

Added:
  packages/python-pygraphviz/trunk/debian/patches/20_doc_install_path
Modified:
  packages/python-pygraphviz/trunk/debian/changelog
  packages/python-pygraphviz/trunk/debian/patches/series
  packages/python-pygraphviz/trunk/debian/rules

Modified: packages/python-pygraphviz/trunk/debian/changelog
===================================================================
--- packages/python-pygraphviz/trunk/debian/changelog	2010-09-16 21:27:03 UTC (rev 14440)
+++ packages/python-pygraphviz/trunk/debian/changelog	2010-09-17 17:32:40 UTC (rev 14441)
@@ -1,3 +1,11 @@
+python-pygraphviz (1.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/20_doc_install_path, debian/rules
+    - install the documentation in the expected Debian directory, so part of doc
+      installation was semplified in rules
+
+ -- Sandro Tosi <morph at debian.org>  Fri, 17 Sep 2010 19:30:30 +0200
+
 python-pygraphviz (1.0-1) unstable; urgency=low
 
   * New upstream release

Added: packages/python-pygraphviz/trunk/debian/patches/20_doc_install_path
===================================================================
--- packages/python-pygraphviz/trunk/debian/patches/20_doc_install_path	                        (rev 0)
+++ packages/python-pygraphviz/trunk/debian/patches/20_doc_install_path	2010-09-17 17:32:40 UTC (rev 14441)
@@ -0,0 +1,15 @@
+Install the documentation in the expected Debian directory
+
+Index: python-pygraphviz-1.0/setup.py
+===================================================================
+--- python-pygraphviz-1.0.orig/setup.py	2010-09-16 22:53:44.265277906 +0200
++++ python-pygraphviz-1.0/setup.py	2010-09-16 22:54:06.741278023 +0200
+@@ -98,7 +98,7 @@
+ sys.path.pop(0)
+ 
+ packages = ["pygraphviz","pygraphviz.tests"]
+-docdirbase  = 'share/doc/pygraphviz-%s' % release.version
++docdirbase  = 'share/doc/python-pygraphviz'
+ data = [(docdirbase, glob("*.txt")),
+         (os.path.join(docdirbase, 'examples'),glob("examples/*.py")),
+         (os.path.join(docdirbase, 'examples'),glob("examples/*.dat")),

Modified: packages/python-pygraphviz/trunk/debian/patches/series
===================================================================
--- packages/python-pygraphviz/trunk/debian/patches/series	2010-09-16 21:27:03 UTC (rev 14440)
+++ packages/python-pygraphviz/trunk/debian/patches/series	2010-09-17 17:32:40 UTC (rev 14441)
@@ -1 +1,2 @@
 10_ship_examples_miles.dat
+20_doc_install_path

Modified: packages/python-pygraphviz/trunk/debian/rules
===================================================================
--- packages/python-pygraphviz/trunk/debian/rules	2010-09-16 21:27:03 UTC (rev 14440)
+++ packages/python-pygraphviz/trunk/debian/rules	2010-09-17 17:32:40 UTC (rev 14441)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # Commodity variables
-DOC_INSTDIR=$(CURDIR)/debian/python-pygraphviz/usr/share/doc
+DOC_INSTDIR=$(CURDIR)/debian/python-pygraphviz/usr/share/doc/python-pygraphviz
 
 # Needed before including python-distutils.mk
 DEB_PYTHON_SYSTEM = pysupport
@@ -28,18 +28,12 @@
 	done
 
 binary-install/python-pygraphviz::
-	# Move the documentation
-	mv $(DOC_INSTDIR)/pygraphviz-$(DEB_UPSTREAM_VERSION)/* \
-		$(DOC_INSTDIR)/python-pygraphviz
-	rmdir $(DOC_INSTDIR)/pygraphviz-$(DEB_UPSTREAM_VERSION)
-
 	# Remove extraneous license file, and rename the README file
-	rm $(DOC_INSTDIR)/python-pygraphviz/INSTALL.txt
-	mv -f $(DOC_INSTDIR)/python-pygraphviz/README.txt \
-		$(DOC_INSTDIR)/python-pygraphviz/README
+	rm $(DOC_INSTDIR)/INSTALL.txt
+	mv -f $(DOC_INSTDIR)/README.txt $(DOC_INSTDIR)/README
 
 	# Fix example permissions, until upstream fixes it
-	chmod a+x $(DOC_INSTDIR)/python-pygraphviz/examples/*.py
+	chmod a+x $(DOC_INSTDIR)/examples/*.py
 
 # BUILD_ARGS should contain --build-base but it's:
 #  - neither supported by the setup.py script