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

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

Author: kibi-guest
Date: Sat May  5 13:26:55 2007
New Revision: 2256

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2256
Log:
Fix the egg dirs with the new py2.5

Modified:
    packages/python-pygraphviz/trunk/debian/changelog
    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=2256&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/changelog (original)
+++ packages/python-pygraphviz/trunk/debian/changelog Sat May  5 13:26:55 2007
@@ -23,7 +23,8 @@
        DEB_PYTHON_INSTALL_ARGS_ALL so that egg-info directories are installed;
      - set DEB_PYTHON_SETUP_CMD to setup_egg.py instead of setup.py, so that
        this option is handled appropriately;
-     - rename the egg dir to remove the `-pyX.Y' part;
+     - hack a bit with a copy+removal of the egg dirs since python-support
+       seems not to move them on its own;
      - added a build dependency on python-setuptools and pkg-config
        accordingly.
 

Modified: packages/python-pygraphviz/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-pygraphviz/trunk/debian/rules?rev=2256&op=diff
==============================================================================
--- packages/python-pygraphviz/trunk/debian/rules (original)
+++ packages/python-pygraphviz/trunk/debian/rules Sat May  5 13:26:55 2007
@@ -4,6 +4,7 @@
 DOC_INSTDIR=$(CURDIR)/debian/python-pygraphviz/usr/share/doc
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog \
         | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
+DEFAULT_PYTHON=$(shell pyversions -d | sed -e 's/^python//')
 
 # Needed before including python-distutils.mk
 DEB_PYTHON_SYSTEM = pysupport
@@ -23,6 +24,7 @@
 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
 
 # Do not compress the example data file
 DEB_COMPRESS_EXCLUDE        += .dat
@@ -41,9 +43,14 @@
 	# Fix example permissions, until upstream fixes it
 	chmod a+x $(DOC_INSTDIR)/python-pygraphviz/examples/*.py
 	
-	# Fix the egg name by removing the 'pyX.Y' part
-	mv $(wildcard $(DEB_PYSUPPORT_DIR)/pygraphviz-*-info) \
+	# 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