6 files changed, 23 insertions, 5 deletions
diff --git a/ubuntu/maverick/tdevelop/debian/control b/ubuntu/maverick/tdevelop/debian/control
index 53920834b..f6c009e5b 100644
--- a/ubuntu/maverick/tdevelop/debian/control
+++ b/ubuntu/maverick/tdevelop/debian/control
@@ -8,11 +8,11 @@ Standards-Version: 3.8.4
 
 Package: tdevelop-trinity
 Architecture: any
-Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebase-trinity-bin, tdelibs-trinity-dev, g++
+Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebase-trinity-bin
 Replaces: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Breaks: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
 Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python
+Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, gettext, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, cmake, ruby, python, g++, kdevdesigner-trinity
 Description: An IDE for Unix/X11
  TDevelop is an easy to use Integrated Development Environment
  for developing C/C++ applications under X11. It features 
@@ -53,6 +53,12 @@ Description: An IDE for Unix/X11 - data
  .
  This package contains arch independent data for TDevelop.
 
+Package: kdevdesigner-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, tdevelop-trinity (= ${source:Version})
+Description: KDevDesigner part for TDevelop
+ This package provides the KDevDesigner part for TDevelop
+
 Package: tdevelop-trinity-dev
 Architecture: any
 Depends: tdevelop-trinity (= ${binary:Version}), tdelibs14-trinity-dev
diff --git a/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install b/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install
new file mode 100644
index 000000000..e57f4a7b3
--- /dev/null
+++ b/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.install
@@ -0,0 +1,3 @@
+debian/tmp/opt/trinity/lib/trinity/libkdevdesignerpart.*
+debian/tmp/opt/trinity/bin/kdevdesigner
+debian/tmp/opt/trinity/share/services/kdevdesigner_part.desktop
diff --git a/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.manpages b/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.manpages
new file mode 100644
index 000000000..d7d59e386
--- /dev/null
+++ b/ubuntu/maverick/tdevelop/debian/kdevdesigner-trinity.manpages
@@ -0,0 +1 @@
+debian/man/out/kdevdesigner.1
diff --git a/ubuntu/maverick/tdevelop/debian/rules b/ubuntu/maverick/tdevelop/debian/rules
index 20d310e1c..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
@@ -78,4 +87,5 @@ binary-install/tdevelop-trinity::
 	mkdir -p debian/tdevelop-trinity/opt/trinity/share/pixmaps
 	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/share/services/kdevdesigner_part.desktop
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
index 4f53c0795..c5d963303 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.install
@@ -1,7 +1,6 @@
 debian/tmp/etc/trinity/kdevassistantrc
 debian/tmp/etc/trinity/tdeveloprc
 debian/tmp/opt/trinity/bin/tdevelop-htdig
-debian/tmp/opt/trinity/bin/kdevdesigner
 debian/tmp/opt/trinity/bin/kdevprofileeditor
 debian/tmp/opt/trinity/bin/kdevassistant
 debian/tmp/opt/trinity/bin/kdevprj2tdevelop
diff --git a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
index 1e10ab62e..e3fa64301 100644
--- a/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
+++ b/ubuntu/maverick/tdevelop/debian/tdevelop-trinity.manpages
@@ -1,5 +1,4 @@
 debian/man/out/tdevelop.1
-debian/man/out/kdevdesigner.1
 debian/man/out/kdevassistant.1
 debian/man/out/kdevprj2tdevelop.1
 debian/man/out/kdevprofileeditor.1