diff -u bzr-gtk-0.95.0/debian/changelog bzr-gtk-0.95.0/debian/changelog
--- bzr-gtk-0.95.0/debian/changelog
+++ bzr-gtk-0.95.0/debian/changelog
@@ -1,3 +1,14 @@
+bzr-gtk (0.95.0-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian (LP: #261645), remaining changes:
+    - Fix name, add french translation and remove some deprecated keys in
+      olive-gtk.desktop (LP: #245633)
+      - Forwarded upstream.
+  * Above change is now applied inline, as Debian no longer has a patch
+    system.
+
+ -- James Westby <james.westby@canonical.com>  Tue, 26 Aug 2008 23:00:57 +0100
+
 bzr-gtk (0.95.0-1) experimental; urgency=low
 
   * New upstream release. (Closes: #485554)
@@ -5,6 +16,13 @@
 
  -- Jelmer Vernooij <jelmer@samba.org>  Mon, 04 Aug 2008 20:47:29 +0200
 
+bzr-gtk (0.94.0-1ubuntu1) intrepid; urgency=low
+
+  * add 04-change-menu-entry.dpatch to fix name, add french translation and
+    remove some deprecated keys in olive-gtk.desktop (LP: #245633)
+
+ -- Didier Roche <didrocks@ubuntu-fr.org>  Fri, 01 Aug 2008 15:14:06 +0200
+
 bzr-gtk (0.94.0-1) unstable; urgency=low
 
   [ Jelmer Vernooij ]
only in patch2:
unchanged:
--- bzr-gtk-0.95.0.orig/olive-gtk.desktop
+++ bzr-gtk-0.95.0/olive-gtk.desktop
@@ -1,12 +1,14 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Version=1.0
-Name=Olive
+Name=Olive Bazaar Branch Manager
+Name[fr]=Gestionnaire de branche Bazaar Olive
 GenericName=Version Control GUI
 GenericName[pl]=Klient graficzny Bazaar
+GenericName[fr]=Client graphique Bazaar
 Comment=Graphical User Interface for the Bazaar Version Control System
 Comment[pl]=Graficzny interfejs dla systemu kontroli wersji Bazaar
-Icon=olive-gtk.png
+Comment[fr]=Interface graphique pour le gestionnaire de version Bazaar
+Icon=olive-gtk
 Exec=olive-gtk
-Categories=Application;Development;RevisionControl;GTK;GNOME;
+Categories=Development;RevisionControl;