diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-30 15:56:34 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-30 15:56:34 -0500 |
| commit | b8d660354b37a7d275a486bd33a9ae2de3d047b3 (patch) | |
| tree | bf7e3840565877f2413c5ab33edb1c6c3fc64601 | |
| parent | 4d86e5015204b881ae64ba42bd17ae923396dd4c (diff) | |
| parent | 55642292818f51e3cfee733f8ee38d30f95880b5 (diff) | |
| download | tde-packaging-b8d660354b37a7d275a486bd33a9ae2de3d047b3.tar.gz tde-packaging-b8d660354b37a7d275a486bd33a9ae2de3d047b3.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
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 |