summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-08-30 20:24:18 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-09-01 19:24:24 +0200
commit5ce14a0a9681c9781d346e64934631379d4b2a1f (patch)
treed0d5f0fd8f9343ede563d7573238d127e885c7c4
parent1782cfe08d2bf299022ba3865c9ec6bfadb9ae11 (diff)
downloadtde-packaging-5ce14a0a9681c9781d346e64934631379d4b2a1f.tar.gz
tde-packaging-5ce14a0a9681c9781d346e64934631379d4b2a1f.zip
Fix tde-style-qtcurve FTBFS on Debian and Ubuntu
(cherry picked from commit 55642292818f51e3cfee733f8ee38d30f95880b5)
-rw-r--r--debian/lenny/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install1
-rwxr-xr-xdebian/lenny/applications/kde-style-qtcurve/debian/rules2
-rw-r--r--debian/squeeze/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install1
-rwxr-xr-xdebian/squeeze/applications/kde-style-qtcurve/debian/rules2
-rw-r--r--ubuntu/maverick/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install1
-rwxr-xr-xubuntu/maverick/applications/kde-style-qtcurve/debian/rules2
6 files changed, 9 insertions, 0 deletions
diff --git a/debian/lenny/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install b/debian/lenny/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
new file mode 100644
index 000000000..003761370
--- /dev/null
+++ b/debian/lenny/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt
diff --git a/debian/lenny/applications/kde-style-qtcurve/debian/rules b/debian/lenny/applications/kde-style-qtcurve/debian/rules
index 8041bcf1e..1669cde8e 100755
--- a/debian/lenny/applications/kde-style-qtcurve/debian/rules
+++ b/debian/lenny/applications/kde-style-qtcurve/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+PATH := /opt/trinity/bin:$(PATH)
+
# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
# Also include the main Trinity path
ifeq ("$(LD_LIBRARY_PATH)", "")
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install b/debian/squeeze/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
new file mode 100644
index 000000000..003761370
--- /dev/null
+++ b/debian/squeeze/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt
diff --git a/debian/squeeze/applications/kde-style-qtcurve/debian/rules b/debian/squeeze/applications/kde-style-qtcurve/debian/rules
index 1de61f873..000d62ed2 100755
--- a/debian/squeeze/applications/kde-style-qtcurve/debian/rules
+++ b/debian/squeeze/applications/kde-style-qtcurve/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+PATH := /opt/trinity/bin:$(PATH)
+
# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
# Also include the main Trinity path
ifeq ("$(LD_LIBRARY_PATH)", "")
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install b/ubuntu/maverick/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
new file mode 100644
index 000000000..003761370
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-style-qtcurve/debian/kde-style-qtcurve-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt
diff --git a/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules b/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules
index 1de61f873..000d62ed2 100755
--- a/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules
+++ b/ubuntu/maverick/applications/kde-style-qtcurve/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+PATH := /opt/trinity/bin:$(PATH)
+
# Set LD_LIBRARY_PATH to the installed library directory to allow dh_shlibdeps to function
# Also include the main Trinity path
ifeq ("$(LD_LIBRARY_PATH)", "")