Attempt to fix FTBFS in tdevelop (again)

6 files changed, 27 insertions, 6 deletions

diff --git a/debian/lenny/tdevelop/debian/kdevdesigner-trinity.install b/debian/lenny/tdevelop/debian/kdevdesigner-trinity.install
index 05e56a292..e57f4a7b3 100644
--- a/debian/lenny/tdevelop/debian/kdevdesigner-trinity.install
+++ b/debian/lenny/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/debian/lenny/tdevelop/debian/rules b/debian/lenny/tdevelop/debian/rules
index 32c078fe9..aae7f6cb4 100755
--- a/debian/lenny/tdevelop/debian/rules
+++ b/debian/lenny/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
diff --git a/debian/squeeze/tdevelop/debian/kdevdesigner-trinity.install b/debian/squeeze/tdevelop/debian/kdevdesigner-trinity.install
index 05e56a292..e57f4a7b3 100644
--- a/debian/squeeze/tdevelop/debian/kdevdesigner-trinity.install
+++ b/debian/squeeze/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/debian/squeeze/tdevelop/debian/rules b/debian/squeeze/tdevelop/debian/rules
index a48dcb00c..d07b4750e 100755
--- a/debian/squeeze/tdevelop/debian/rules
+++ b/debian/squeeze/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
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