diff -u kdebase-4.2.95/debian/changelog kdebase-4.2.95/debian/changelog
--- kdebase-4.2.95/debian/changelog
+++ kdebase-4.2.95/debian/changelog
@@ -1,3 +1,14 @@
+kdebase (4:4.2.95-0ubuntu2) karmic; urgency=low
+
+  * debian/patches/kubuntu_15_abort.diff:
+  	- Replace user-facing instances of "abort" with language that is more 
+      user-friendly (LP: #389751)
+  * debian/patches/kubuntu_16_kfmclient.diff:
+    - Make it so Konqueror icon and current browser's icon don't both show up
+      when browser is launched (LP: #399155)
+
+ -- Mackenzie Morgan <maco.m@ubuntu.com>  Sun, 05 Jul 2009 14:05:37 -0400
+
 kdebase (4:4.2.95-0ubuntu1) karmic; urgency=low
 
   * New upstream release:
diff -u kdebase-4.2.95/debian/patches/series kdebase-4.2.95/debian/patches/series
--- kdebase-4.2.95/debian/patches/series
+++ kdebase-4.2.95/debian/patches/series
@@ -7,0 +8,2 @@
+kubuntu_15_abort.diff
+kubuntu_16_kfmclient.diff
only in patch2:
unchanged:
--- kdebase-4.2.95.orig/debian/patches/kubuntu_16_kfmclient.diff
+++ kdebase-4.2.95/debian/patches/kubuntu_16_kfmclient.diff
@@ -0,0 +1,15 @@
+# Ubuntu: https://bugs.launchpad.net/bugs/399155
+# Description: Gets rid of having Konqueror icon bouncing with
+#   preffered browser's icon
+Index: apps/konqueror/kfmclient.desktop
+===================================================================
+--- a/apps/konqueror/kfmclient.desktop	(revision 990623)
++++ b/apps/konqueror/kfmclient.desktop	(working copy)
+@@ -6,6 +6,7 @@
+ Terminal=false
+ InitialPreference=9
+ NoDisplay=true
++StartupNotificaton=false
+ Name=Konqueror
+ Name[ar]=كونكيور
+ Name[bn]=কনকরার
only in patch2:
unchanged:
--- kdebase-4.2.95.orig/debian/patches/kubuntu_15_abort.diff
+++ kdebase-4.2.95/debian/patches/kubuntu_15_abort.diff
@@ -0,0 +1,41 @@
+# Ubuntu: https://bugs.launchpad.net/bugs/389751
+# Description: replace "abort" with user-friendly language
+Index: apps/kfind/kfinddlg.cpp
+===================================================================
+--- a/apps/kfind/kfinddlg.cpp	(revision 990623)
++++ b/apps/kfind/kfinddlg.cpp	(working copy)
+@@ -194,7 +194,7 @@
+   if (errorCode == 0)
+     setStatusMsg( i18nc("the application is currently idle, there is no active search", "Idle.") );
+   else if (errorCode == KIO::ERR_USER_CANCELED)
+-    setStatusMsg(i18n("Aborted."));
++    setStatusMsg(i18n("Canceled."));
+   else if (errorCode == KIO::ERR_MALFORMED_URL)
+   {
+      setStatusMsg(i18n("Error."));
+Index: apps/kfind/kfindpart.cpp
+===================================================================
+--- a/pps/kfind/kfindpart.cpp	(revision 990623)
++++ b/apps/kfind/kfindpart.cpp	(working copy)
+@@ -154,7 +154,7 @@
+     //setStatusMsg(i18n("Ready."));
+   else if (errorCode == KIO::ERR_USER_CANCELED)
+     emit canceled();
+-    //setStatusMsg(i18n("Aborted."));
++    //setStatusMsg(i18n("Canceled."));
+   else
+     emit canceled(); // TODO ?
+     //setStatusMsg(i18n("Error."));
+Index: apps/kfind/kfind.cpp
+===================================================================
+--- a/apps/kfind/kfind.cpp	(revision 990623)
++++ b/apps/kfind/kfind.cpp	(working copy)
+@@ -68,7 +68,7 @@
+   mSearch = new KPushButton( KStandardGuiItem::find(), mButtonBox );
+   mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4);
+   connect( mSearch, SIGNAL(clicked()), this, SLOT( startSearch() ) );
+-  mStop = new KPushButton( KStandardGuiItem::stop(), mButtonBox );
++  mStop = new KPushButton( KStandardGuiItem::cancel(), mButtonBox );
+   connect( mStop, SIGNAL(clicked()), this, SLOT( stopSearch() ) );
+   mSave = new KPushButton( KStandardGuiItem::saveAs(), mButtonBox );
+   connect( mSave, SIGNAL(clicked()), this, SLOT( saveResults() ) );