summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdevelop/debian
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-27 10:45:23 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-11-27 10:45:23 -0600
commitd9733bddae8f68bcb6a3ad9240a8036894e75021 (patch)
treeacce28f27aa86165aea55b604dfd1af2e582ff8f /ubuntu/maverick/tdevelop/debian
parent5839b0d3991d4a2be7c2668f2a9082ee0f9ecf20 (diff)
downloadtde-packaging-d9733bddae8f68bcb6a3ad9240a8036894e75021.tar.gz
tde-packaging-d9733bddae8f68bcb6a3ad9240a8036894e75021.zip
Attempt to fix FTBFS in tdevelop (again)
Diffstat (limited to 'ubuntu/maverick/tdevelop/debian')
-rw-r--r--ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install1
-rwxr-xr-xubuntu/maverick/tdevelop/debian/rules10
2 files changed, 9 insertions, 2 deletions
diff --git a/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install b/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install
index 05e56a292..e57f4a7b3 100644
--- a/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install
+++ b/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install
@@ -1,4 +1,3 @@
debian/tmp/opt/trinity/lib/trinity/libkdevdesignerpart.*
-debian/tmp/opt/trinity/lib/libkinterfacedesigner.*
debian/tmp/opt/trinity/bin/kdevdesigner
debian/tmp/opt/trinity/share/services/kdevdesigner_part.desktop
diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules
index a48dcb00c..d07b4750e 100755
--- a/ubuntu/maverick/tdevelop/debian/rules
+++ b/ubuntu/maverick/tdevelop/debian/rules
@@ -1,5 +1,14 @@
#!/usr/bin/make -f
+# 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)", "")
+LD_LIBRARY_PATH=/opt/trinity/lib:debian/tmp/opt/trinity/lib
+else
+LD_LIBRARY_PATH += :/opt/trinity/lib:debian/tmp/opt/trinity/lib
+endif
+export LD_LIBRARY_PATH
+
# work around debian/cdbs/uploaders.mk
makebuilddir::
[ -f debian/control.tmp ] || cp debian/control debian/control.tmp
@@ -79,5 +88,4 @@ binary-install/tdevelop-trinity::
cp debian/tdevelop.xpm debian/tdevelop-trinity/opt/trinity/share/pixmaps
mv debian/tdevelop-trinity/usr/share/man debian/tdevelop-trinity/opt/trinity/share/
rm debian/tdevelop-trinity/opt/trinity/lib/trinity/libkdevdesignerpart.*
- rm debian/tdevelop-trinity/opt/trinity/lib/libkinterfacedesigner.*
rm debian/tdevelop-trinity/opt/trinity/share/services/kdevdesigner_part.desktop