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

[morph at users.alioth.debian.org]

    Date: Thursday, February 18, 2010 @ 06:17:39
  Author: morph
Revision: 11772

Importing 0.99-3

Modified:
  packages/python-pygraphviz/trunk/debian/changelog
  packages/python-pygraphviz/trunk/debian/control
  packages/python-pygraphviz/trunk/debian/rules

Modified: packages/python-pygraphviz/trunk/debian/changelog
===================================================================
--- packages/python-pygraphviz/trunk/debian/changelog	2010-02-17 20:59:37 UTC (rev 11771)
+++ packages/python-pygraphviz/trunk/debian/changelog	2010-02-18 06:17:39 UTC (rev 11772)
@@ -1,3 +1,27 @@
+python-pygraphviz (0.99-3) unstable; urgency=low
+
+  * Avoid installation in /usr/local by adding “--prefix=/usr” through the
+    DEB_PYTHON_INSTALL_ARGS_ALL variable. Many thanks to Piotr Ożarowski
+    for reporting, and to Kumar Appaiah for the patch. Good work on
+    getting python2.6 rocking and rolling! (Closes: #556157).
+  * Fix Homepage field since upstream's website got shuffled around,
+    thanks to Denis Laxalde (Closes: #559059).
+
+ -- Cyril Brulebois <kibi at debian.org>  Sat, 05 Dec 2009 02:25:39 +0100
+
+python-pygraphviz (0.99-2) unstable; urgency=low
+
+  * Upload to unstable now that lenny is released (yay).
+  * Fix FTBFS with python-support 0.90.3: no longer rely on its internal
+    behaviour, and now set tests/test.py executable in the install target
+    (Closes: #517080).
+  * Tidy up debian/rules some more.
+  * Update Vcs-* fields: move from DPMT's svn to collab-maint's git.
+  * Remote DPMT from Uploaders, following Piotr Ożarowski's request.
+  * Add ${misc:Depends} to Depends.
+
+ -- Cyril Brulebois <kibi at debian.org>  Sat, 28 Feb 2009 13:53:32 +0100
+
 python-pygraphviz (0.99-1) experimental; urgency=low
 
   [ Sandro Tosi ]

Modified: packages/python-pygraphviz/trunk/debian/control
===================================================================
--- packages/python-pygraphviz/trunk/debian/control	2010-02-17 20:59:37 UTC (rev 11771)
+++ packages/python-pygraphviz/trunk/debian/control	2010-02-18 06:17:39 UTC (rev 11772)
@@ -4,14 +4,13 @@
 Maintainer: Cyril Brulebois <kibi at debian.org>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python-support (>= 0.6.4), python-all-dev (>= 2.3.5-11), libgraphviz-dev, python-setuptools, pkg-config, quilt
 Standards-Version: 3.8.0
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Homepage: https://networkx.lanl.gov/wiki/pygraphviz
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-pygraphviz/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-pygraphviz/trunk/
+Homepage: http://networkx.lanl.gov/pygraphviz/
+Vcs-Git: git://git.debian.org/git/collab-maint/python-pygraphviz.git
+Vcs-Browser: http://git.debian.org/?p=collab-maint/python-pygraphviz.git
 
 Package: python-pygraphviz
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, graphviz (>= 2.16)
+Depends: ${python:Depends}, ${shlibs:Depends}, graphviz (>= 2.16), ${misc:Depends}
 Provides: ${python:Provides}
 Description: Python interface to the Graphviz graph layout and visualization package
  Pygraphviz is a Python interface to the Graphviz graph layout and

Modified: packages/python-pygraphviz/trunk/debian/rules
===================================================================
--- packages/python-pygraphviz/trunk/debian/rules	2010-02-17 20:59:37 UTC (rev 11771)
+++ packages/python-pygraphviz/trunk/debian/rules	2010-02-18 06:17:39 UTC (rev 11772)
@@ -12,33 +12,35 @@
 include /usr/share/cdbs/1/class/python-distutils.mk
 
 
-# Some variables 
+# Some variables
 DEB_PYTHON_MODULE_PACKAGE   = pygraphviz
 DEB_PYTHON_CLEAN_ARGS       = --all
 DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile --force
 
 # Install egg-info directories, using setup_egg.py instead of setup.py
 DEB_PYTHON_SETUP_CMD         = setup_egg.py
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
-DEB_PYSUPPORT_DIR            = $(CURDIR)/debian/python-pygraphviz/usr/share/python-support/python-pygraphviz
-DEB_PYSUPPORT_LIB_DIR        = $(CURDIR)/debian/python-pygraphviz/usr/lib/python-support/python-pygraphviz
+DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed \
+				--prefix=/usr
 
+install/python-pygraphviz::
+	# Fix test.py permissions (not an upstream problem):
+	for i in `pyversions -s`; do \
+		chmod +x debian/python-pygraphviz/usr/lib/$$i/site-packages/pygraphviz/tests/test.py; \
+	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
-	
+
 	# Fix example permissions, until upstream fixes it
 	chmod a+x $(DOC_INSTDIR)/python-pygraphviz/examples/*.py
-	
-	# Fix test.py permissions (not an upstream problem)
-	chmod a+x $(DEB_PYSUPPORT_DIR)/pygraphviz/tests/test.py
 
 # BUILD_ARGS should contain --build-base but it's:
 #  - neither supported by the setup.py script