Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

13 years ago · b8d660354b
parent 4d86e50152 5564229281
commit b8d660354b
6 changed files with 9 additions and 0 deletions
--- 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)", "")
--- 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
@ -0,0 +1 @@
+debian/tmp/opt
--- 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)", "")
--- 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
@ -0,0 +1 @@
+debian/tmp/opt
--- 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)", "")
--- 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
@ -0,0 +1 @@
+debian/tmp/opt