diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-05-06 23:09:52 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-27 19:46:01 +0200 |
| commit | 95e8919889100561fd627b5675f5f3eb969f0bd6 (patch) | |
| tree | 1e16e64faa38dc21d4d3417e32b8bdb72dbe9e75 | |
| parent | a1a24533e4ee44bca9db9f8200f5ab78573a8994 (diff) | |
| download | tde-packaging-95e8919889100561fd627b5675f5f3eb969f0bd6.tar.gz tde-packaging-95e8919889100561fd627b5675f5f3eb969f0bd6.zip | |
Fix tde-guidance FTBFS on Debian and Ubuntu
(cherry picked from commit 66724c217fb8776f0e17630cd902120ed549f717)
| -rwxr-xr-x | debian/lenny/applications/kde-guidance/debian/rules | 8 | ||||
| -rwxr-xr-x | debian/squeeze/applications/kde-guidance/debian/rules | 8 | ||||
| -rwxr-xr-x | ubuntu/maverick/applications/kde-guidance/debian/rules | 8 |
3 files changed, 21 insertions, 3 deletions
diff --git a/debian/lenny/applications/kde-guidance/debian/rules b/debian/lenny/applications/kde-guidance/debian/rules index 54634ed38..3e7e6ab51 100755 --- a/debian/lenny/applications/kde-guidance/debian/rules +++ b/debian/lenny/applications/kde-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/kde-guidance/debian/rules b/debian/squeeze/applications/kde-guidance/debian/rules index b4a3ae591..3595c903b 100755 --- a/debian/squeeze/applications/kde-guidance/debian/rules +++ b/debian/squeeze/applications/kde-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/kde-guidance/debian/rules b/ubuntu/maverick/applications/kde-guidance/debian/rules index 7838277ea..3595c903b 100755 --- a/ubuntu/maverick/applications/kde-guidance/debian/rules +++ b/ubuntu/maverick/applications/kde-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 |