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-08-30 20:24:18 +0200
commit55642292818f51e3cfee733f8ee38d30f95880b5 (patch)
treee1e728564de0996c2b566c7eeb41e00ecdf563a9
parent56a080ec706bbe821a66a76310a5bcf72aa60f4f (diff)
downloadtde-packaging-55642292818f51e3cfee733f8ee38d30f95880b5.tar.gz
tde-packaging-55642292818f51e3cfee733f8ee38d30f95880b5.zip
Fix tde-style-qtcurve FTBFS on Debian and Ubuntu
-rwxr-xr-xdebian/lenny/applications/tde-style-qtcurve/debian/rules2
-rw-r--r--debian/lenny/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install1
-rwxr-xr-xdebian/squeeze/applications/tde-style-qtcurve/debian/rules2
-rw-r--r--debian/squeeze/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install1
-rwxr-xr-xubuntu/maverick/applications/tde-style-qtcurve/debian/rules2
-rw-r--r--ubuntu/maverick/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install1
6 files changed, 9 insertions, 0 deletions
diff --git a/debian/lenny/applications/tde-style-qtcurve/debian/rules b/debian/lenny/applications/tde-style-qtcurve/debian/rules
index abada8378..c61c340ae 100755
--- a/debian/lenny/applications/tde-style-qtcurve/debian/rules
+++ b/debian/lenny/applications/tde-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/lenny/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install b/debian/lenny/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
new file mode 100644
index 000000000..003761370
--- /dev/null
+++ b/debian/lenny/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt
diff --git a/debian/squeeze/applications/tde-style-qtcurve/debian/rules b/debian/squeeze/applications/tde-style-qtcurve/debian/rules
index abada8378..c61c340ae 100755
--- a/debian/squeeze/applications/tde-style-qtcurve/debian/rules
+++ b/debian/squeeze/applications/tde-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/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install b/debian/squeeze/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
new file mode 100644
index 000000000..003761370
--- /dev/null
+++ b/debian/squeeze/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt
diff --git a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules b/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules
index abada8378..c61c340ae 100755
--- a/ubuntu/maverick/applications/tde-style-qtcurve/debian/rules
+++ b/ubuntu/maverick/applications/tde-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/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install b/ubuntu/maverick/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
new file mode 100644
index 000000000..003761370
--- /dev/null
+++ b/ubuntu/maverick/applications/tde-style-qtcurve/debian/tde-style-qtcurve-trinity.install
@@ -0,0 +1 @@
+debian/tmp/opt