diff -u qtcreator-1.2.1/debian/changelog qtcreator-1.2.1/debian/changelog
--- qtcreator-1.2.1/debian/changelog
+++ qtcreator-1.2.1/debian/changelog
@@ -1,3 +1,11 @@
+qtcreator (1.2.1-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #399414), remaining changes:
+    - Add qt-creator transitional package.
+  * debian/control: Conflicts on qt-creator (<< 1.2.1-1ubuntu1).
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Sun, 19 Jul 2009 16:23:52 -0500
+
 qtcreator (1.2.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -45,6 +53,13 @@
 
  -- Adam Majer <adamm@zombino.com>  Sun, 12 Jul 2009 18:52:19 -0500
 
+qtcreator (1.1.0-1ubuntu1) karmic; urgency=low
+
+  * Add qt-creator transitional package (LP: #378910)
+  * Conflict qt-creator << 1.1.0-1ubuntu1
+
+ -- Alessandro Ghersi <alessandro.ghersi@fastwebnet.it>  Thu, 21 May 2009 05:31:05 +0200
+
 qtcreator (1.1.0-1) unstable; urgency=low
 
   * New upstream release.
@@ -67,0 +83 @@
+
diff -u qtcreator-1.2.1/debian/control qtcreator-1.2.1/debian/control
--- qtcreator-1.2.1/debian/control
+++ qtcreator-1.2.1/debian/control
@@ -1,7 +1,8 @@
 Source: qtcreator
 Section: devel
 Priority: optional
-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Adam Majer <adamm@zombino.com>, Fathi Boudra <fabo@debian.org>, Jeremy Lainé <jeremy.laine@m4x.org>
 Build-Depends: cdbs, debhelper (>= 7), libqt4-dev (>= 4.5.0~rc1), qt4-dev-tools
 Standards-Version: 3.8.2
@@ -12,6 +13,7 @@
 Package: qtcreator
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: qt-creator (<< 1.2.1-1ubuntu1)
 Recommends: qtcreator-doc, qt4-dev-tools, qt4-doc, qt4-demos,
  gdb, make, xterm | x-terminal-emulator
 Suggests: cmake, git-core, subversion
@@ -64,0 +67,10 @@
+
+Package: qt-creator
+Architecture: all
+Priority: extra
+Depends: qtcreator
+Description: Transitional package
+ This dummy package is provided for a smooth transition from qt-creator to
+ the qtcreator package.
+ .
+ It may safely be removed after installation.