diff -Nru lazarus-0.9.28.2/debian/changelog lazarus-0.9.28.2/debian/changelog
--- lazarus-0.9.28.2/debian/changelog	2010-04-09 00:24:03.000000000 +0200
+++ lazarus-0.9.28.2/debian/changelog	2010-09-05 12:00:08.000000000 +0200
@@ -1,3 +1,16 @@
+lazarus (0.9.28.2-10ubuntu1) maverick; urgency=low
+
+  * Backported two control changes from debian upstream which will be in
+    0.9.28.2-12 (yet unreleased) to fix (LP: #621905)
+    + Fixed a bug causing safe-upgrade to fail because lazarus-ide-qt4
+      is installed to fix dependencies of lazarus-ide and that Qt based
+      IDE is not packaged. The lazarus-ide-qt4 now installs the GTK
+      based IDE by depending on lazarus-ide-gtk until Qt IDE gets
+      packaged. (Closes: Bug#594611)
+    + Fixed dependency issue : lcl-units should not provide lcl-gtk.
+
+ -- Paul Gevers <paul@climbing.nl>  Sun, 05 Sep 2010 11:47:30 +0200
+
 lazarus (0.9.28.2-10) unstable; urgency=low
 
   * Fixed memory leak in GTK based lazarus IDE binary  (Closes:Bug#571997)
diff -Nru lazarus-0.9.28.2/debian/control lazarus-0.9.28.2/debian/control
--- lazarus-0.9.28.2/debian/control	2010-03-24 10:18:37.000000000 +0100
+++ lazarus-0.9.28.2/debian/control	2010-09-05 11:51:50.000000000 +0200
@@ -116,7 +116,7 @@
 
 Package: lazarus-ide-qt4
 Architecture: i386 powerpc sparc amd64 armel
-Depends: ${misc:Depends}, ${shlibs:Depends}, lazarus-ide
+Depends: ${misc:Depends}, ${shlibs:Depends}, lazarus-ide, lazarus-ide-gtk
 Recommends: fpc, lcl, gdb
 Suggests: fp-utils
 Provides: lazarus-ide-qt
@@ -139,7 +139,8 @@
  In short, Lazarus is a free RAD tool for Free Pascal using its Lazarus 
  Component Library (LCL).
  .
- This package contains the lazarus IDE build on top of QT backend.
+ This package will contain the lazarus IDE build on top of QT backend, however
+ for now it just depends on gtk based IDE.
 
 Package: lcl
 Architecture: i386 powerpc sparc amd64 armel
@@ -197,7 +198,7 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${fpc-abi:Depends}, lcl-gtk | lcl-qt
 Recommends: lazarus-ide, fpc
 Suggests: gdb
-Provides: lcl-${source:Upstream-Version}, lcl-${source:Version}, lcl-gtk
+Provides: lcl-${source:Upstream-Version}, lcl-${source:Version}
 Breaks: lazarus-ide (<= 0.9.28.2-2)
 Replaces: lazarus-ide (<= 0.9.28.2-2)
 Description: Lazarus Components Library - Backend independent components