[Python-modules-commits] r2695 - in /packages/python-pygraphviz/trunk/debian: changelog control rules

[kibi-guest at users.alioth.debian.org]

Author: kibi-guest
Date: Tue Jul 10 17:07:00 2007
New Revision: 2695

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2695
Log:
- Fix egg directories handling, thanks to python-support 0.6.4 and #422436
- Delete the rpath option in debian/rules


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
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/changelog?rev=2695&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/changelog (original)
+++ packages/python-pygraphviz/trunk/debian/changelog Tue Jul 10 17:07:00 2007
@@ -12,6 +12,8 @@
   * Deleted overrides about the rpath, since graphviz no longer uses it.
   * Deleted debian/TODO since this achieves the transition from graphviz 2.8
     to 2.12.
+  * Bumped B-D on python-support from 0.5.3 to 0.6.4, since the later is the
+    first one to support an appropriate handling of egg directories.
     
  -- Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>  Tue, 10 Jul 2007 17:21:18 +0200
 

Modified: packages/python-pygraphviz/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/control?rev=2695&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/control (original)
+++ packages/python-pygraphviz/trunk/debian/control Tue Jul 10 17:07:00 2007
@@ -2,7 +2,7 @@
 Section: python
 Priority: optional
 Maintainer: Cyril Brulebois <cyril.brulebois at enst-bretagne.fr>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python-support (>= 0.5.3), python-all-dev (>= 2.3.5-11), libgraphviz3-dev, python-setuptools, pkg-config
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.43), python-support (>= 0.6.4), python-all-dev (>= 2.3.5-11), libgraphviz3-dev, python-setuptools, pkg-config
 Standards-Version: 3.7.2
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 XS-Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-pygraphviz/trunk/

Modified: packages/python-pygraphviz/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/rules?rev=2695&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/rules (original)
+++ packages/python-pygraphviz/trunk/debian/rules Tue Jul 10 17:07:00 2007
@@ -43,15 +43,6 @@
 	# Fix example permissions, until upstream fixes it
 	chmod a+x $(DOC_INSTDIR)/python-pygraphviz/examples/*.py
 	
-	# Pick up the egg directory using the default version (we only need one of them)
-	cp -r $(DEB_PYSUPPORT_LIB_DIR)/python$(DEFAULT_PYTHON)/pygraphviz-$(DEB_UPSTREAM_VERSION)-py$(DEFAULT_PYTHON).egg-info \
-		$(DEB_PYSUPPORT_DIR)/pygraphviz-$(DEB_UPSTREAM_VERSION).egg-info
-	
-	# Delete the others
-	for i in $(shell pyversions -s); do \
-		rm -r $(DEB_PYSUPPORT_LIB_DIR)/$$i/pygraphviz-$(DEB_UPSTREAM_VERSION)-py*.egg-info ; \
-	done
-	
 	# Lintian override
 	install -m 755 -d $(CURDIR)/debian/python-pygraphviz/usr/share/lintian/overrides
 	install -m 644 debian/python-pygraphviz.lintian-overrides $(CURDIR)/debian/python-pygraphviz/usr/share/lintian/overrides/python-pygraphviz
@@ -61,7 +52,6 @@
 #  - neither supported by the setup.py script
 #  - nor needed
 DEB_PYTHON_BUILD_ARGS =
-DEB_PYTHON_BUILD_EXTENSION_ARGS = --rpath /usr/lib/graphviz
 
 
 # CDBS doesn't allow separate build steps for module and extension, let's hack it: