summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-06 23:09:52 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-06 23:09:52 -0500
commit66724c217fb8776f0e17630cd902120ed549f717 (patch)
tree340ee0ed5e2d5fa9a1befb393e63cdfdc6a26434
parent08ebc32013861a40347207a40eea0af5e23d94b7 (diff)
downloadtde-packaging-66724c217fb8776f0e17630cd902120ed549f717.tar.gz
tde-packaging-66724c217fb8776f0e17630cd902120ed549f717.zip
Fix tde-guidance FTBFS on Debian and Ubuntu
-rwxr-xr-xdebian/lenny/applications/tde-guidance/debian/rules8
-rwxr-xr-xdebian/squeeze/applications/tde-guidance/debian/rules8
-rwxr-xr-xubuntu/maverick/applications/tde-guidance/debian/rules8
3 files changed, 21 insertions, 3 deletions
diff --git a/debian/lenny/applications/tde-guidance/debian/rules b/debian/lenny/applications/tde-guidance/debian/rules
index e21db2b6b..f7baa2f08 100755
--- a/debian/lenny/applications/tde-guidance/debian/rules
+++ b/debian/lenny/applications/tde-guidance/debian/rules
@@ -93,7 +93,13 @@ install/guidance-backends-trinity::
install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
$(PYSUPPORT_PATH)/guidance-backends-trinity/displayconfig-hwprobe.py
- cp $(DEB_DESTDIR)/usr/lib/python2.6/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+ for PYDIR in python2.5 python2.6 python2.7 python2.8; do \
+ echo "Looking for $(DEB_DESTDIR)/usr/lib/$$PYDIR"; \
+ if test -d $(DEB_DESTDIR)/usr/lib/$$PYDIR; then \
+ cp $(DEB_DESTDIR)/usr/lib/$$PYDIR/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity; \
+ fi; \
+ done
+
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ScanPCI.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/infimport.py $(PYSUPPORT_PATH)/guidance-backends-trinity
diff --git a/debian/squeeze/applications/tde-guidance/debian/rules b/debian/squeeze/applications/tde-guidance/debian/rules
index e21db2b6b..f7baa2f08 100755
--- a/debian/squeeze/applications/tde-guidance/debian/rules
+++ b/debian/squeeze/applications/tde-guidance/debian/rules
@@ -93,7 +93,13 @@ install/guidance-backends-trinity::
install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
$(PYSUPPORT_PATH)/guidance-backends-trinity/displayconfig-hwprobe.py
- cp $(DEB_DESTDIR)/usr/lib/python2.6/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+ for PYDIR in python2.5 python2.6 python2.7 python2.8; do \
+ echo "Looking for $(DEB_DESTDIR)/usr/lib/$$PYDIR"; \
+ if test -d $(DEB_DESTDIR)/usr/lib/$$PYDIR; then \
+ cp $(DEB_DESTDIR)/usr/lib/$$PYDIR/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity; \
+ fi; \
+ done
+
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ScanPCI.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/infimport.py $(PYSUPPORT_PATH)/guidance-backends-trinity
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules
index df63d31b1..f7baa2f08 100755
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/maverick/applications/tde-guidance/debian/rules
@@ -93,7 +93,13 @@ install/guidance-backends-trinity::
install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
$(PYSUPPORT_PATH)/guidance-backends-trinity/displayconfig-hwprobe.py
- cp $(DEB_DESTDIR)/usr/lib/python*/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+ for PYDIR in python2.5 python2.6 python2.7 python2.8; do \
+ echo "Looking for $(DEB_DESTDIR)/usr/lib/$$PYDIR"; \
+ if test -d $(DEB_DESTDIR)/usr/lib/$$PYDIR; then \
+ cp $(DEB_DESTDIR)/usr/lib/$$PYDIR/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity; \
+ fi; \
+ done
+
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ScanPCI.py $(PYSUPPORT_PATH)/guidance-backends-trinity
cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/infimport.py $(PYSUPPORT_PATH)/guidance-backends-trinity