[Checkins] SVN: vanguardistas.pydebdep/trunk/ Make moving the -nspkg.pth file conditional on one actually existing. Extends the rules.1 file to work with non-namespace eggs.

[Brian Sutherland]

Log message for revision 85020:
  Make moving the -nspkg.pth file conditional on one actually existing. Extends the rules.1 file to work with non-namespace eggs.

Changed:
  U   vanguardistas.pydebdep/trunk/CHANGES.txt
  U   vanguardistas.pydebdep/trunk/rules/rules.1

-=-
Modified: vanguardistas.pydebdep/trunk/CHANGES.txt
===================================================================
--- vanguardistas.pydebdep/trunk/CHANGES.txt	2008-03-30 21:07:34 UTC (rev 85019)
+++ vanguardistas.pydebdep/trunk/CHANGES.txt	2008-03-30 21:24:49 UTC (rev 85020)
@@ -1,6 +1,7 @@
 0.0.3 (unreleased)
 ------------------
 
+* Make moving the -nspkg.pth file conditional on one actually existing. Extends the rules.1 file to work with non-namespace eggs.
 * Add dependency mappings for PILwoTk, Reportlab and pytz.
 * Add mappings from ZODB3 to python-zodb and zodb.
 * Guess only lower case names for Debian packages.

Modified: vanguardistas.pydebdep/trunk/rules/rules.1
===================================================================
--- vanguardistas.pydebdep/trunk/rules/rules.1	2008-03-30 21:07:34 UTC (rev 85019)
+++ vanguardistas.pydebdep/trunk/rules/rules.1	2008-03-30 21:24:49 UTC (rev 85020)
@@ -36,8 +36,8 @@
 	python$* setup.py install --no-compile --single-version-externally-managed --root=debian/$(PACKAGE) --install-data=usr/lib/$(PACKAGE)
 	mv debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(EGG_NAME)-*-py$*.egg-info \
 	   debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(EGG_NAME).egg-info 
-	mv debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(EGG_NAME)-*-py$*-nspkg.pth \
-	   debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(EGG_NAME)-nspkg.pth
+	find debian/$(PACKAGE)/usr/lib/python$*/site-packages -name "$(EGG_NAME)-*-nspkg.pth" -exec \
+	   mv {} debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(EGG_NAME)-nspkg.pth \;
 	
 	i="$$($(DEB_SETUPTOOLS) --depends --egg_info debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(EGG_NAME).egg-info)" && echo "setuptools:Depends=$$i" >> debian/$(PACKAGE).substvars
 	i="$$($(DEB_SETUPTOOLS) --conflicts --egg_info debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(EGG_NAME).egg-info)" && echo "setuptools:Conflicts=$$i" >> debian/$(PACKAGE).substvars