diff -Nru kile-1.9.3/debian/changelog kile-1.9.3/debian/changelog
--- kile-1.9.3/debian/changelog	2007-05-06 18:31:52.000000000 +0200
+++ kile-1.9.3/debian/changelog	2007-05-06 18:32:00.000000000 +0200
@@ -1,3 +1,11 @@
+kile (1:1.9.3-2ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Added 07_remove_tips_cpp.diff
+    - Update maintainer field in debian/control
+
+ -- Michele Angrisano <DarkSun1988@gmail.com>  Mon, 30 Apr 2007 20:40:27 +0200
+
 kile (1:1.9.3-2) unstable; urgency=low
 
   * Suggest: kpdf, gv (Closes: #408824)
@@ -9,6 +17,13 @@
 
  -- Mark Purcell <msp@debian.org>  Thu, 22 Mar 2007 22:02:39 +0000
 
+kile (1:1.9.3-1ubuntu1) feisty; urgency=low
+
+  * Added 07_remove_tips_cpp.diff (LP: #67263)
+  * Set Ubuntu maintainer
+
+ -- Andy Price <andy@andrewprice.me.uk>  Tue, 27 Mar 2007 16:54:57 +0100
+
 kile (1:1.9.3-1) unstable; urgency=low
 
   [Fathi Boudra]
diff -Nru kile-1.9.3/debian/control kile-1.9.3/debian/control
--- kile-1.9.3/debian/control	2007-05-06 18:31:52.000000000 +0200
+++ kile-1.9.3/debian/control	2007-05-06 18:32:00.000000000 +0200
@@ -1,7 +1,8 @@
 Source: kile
 Section: tex
 Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>, Ana Beatriz Guerrero Lopez <ana@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), automake1.9, kdelibs4-dev, libtool
 Standards-Version: 3.7.2
diff -Nru kile-1.9.3/debian/patches/07_remove_tips_cpp.diff kile-1.9.3/debian/patches/07_remove_tips_cpp.diff
--- kile-1.9.3/debian/patches/07_remove_tips_cpp.diff	1970-01-01 01:00:00.000000000 +0100
+++ kile-1.9.3/debian/patches/07_remove_tips_cpp.diff	2007-05-06 18:32:00.000000000 +0200
@@ -0,0 +1,22 @@
+diff -Nur kile-1.9.3/src/kile/Makefile.am kile-1.9.3/src/kile/Makefile.am
+--- kile-1.9.3/src/kile/Makefile.am	2007-03-27 16:33:41.000000000 +0100
++++ kile-1.9.3.new/src/kile/Makefile.am	2007-03-27 16:40:16.000000000 +0100
+@@ -87,6 +87,7 @@
+ 	if test -n "$$LIST"; then \
+ 	 $(XGETTEXT) $$LIST -o $(podir)/kile.pot; \
+ 	fi
++	rm -f tips.cpp
+ 
+ syntaxdir = $(kde_appsdir)/katepart/syntax
+ noinst_HEADERS = kiletool.h kilelauncher.h kiletool_enums.h kiletoolmanager.h \
+diff -Nur kile-1.9.3/src/kile/Makefile.in kile-1.9.3/src/kile/Makefile.in
+--- kile-1.9.3/src/kile/Makefile.in	2007-03-27 16:33:41.000000000 +0100
++++ kile-1.9.3.new/src/kile/Makefile.in	2007-03-27 16:40:49.000000000 +0100
+@@ -1058,6 +1058,7 @@
+ 	if test -n "$$LIST"; then \
+ 	 $(XGETTEXT) $$LIST -o $(podir)/kile.pot; \
+ 	fi
++	rm -f tips.cpp
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT: