[Pkg-bazaar-commits] ./bzr-gtk/unstable r40: Fix right-clicking in file list

[Chris Lamb]

------------------------------------------------------------
revno: 40
committer: Chris Lamb <chris at chris-lamb.co.uk>
branch nick: pkg-bzr-gtk
timestamp: Thu 2008-05-01 13:40:29 +0100
message:
  Fix right-clicking in file list
added:
  debian/patches/05-fix-olive-preferences-import.dpatch
modified:
  debian/changelog
  debian/patches/00list
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-01 12:36:39 +0000
+++ b/debian/changelog	2008-05-01 12:40:29 +0000
@@ -7,8 +7,10 @@
   * Add 01-desktop-file-categories patch to set suitable FDO categories in
     .desktop files.
   * Update debian/copyright.
-  * Add 04-build-preferences-module to build and install the
+  * Add 04-build-preferences-module patch to build and install the
     bzrlib.plugins.gtk.preferences package.
+  * Add 05-fix-olive-preferences-import patch to fix right-clicking in file
+    list.
 
  -- Chris Lamb <chris at chris-lamb.co.uk>  Thu, 01 May 2008 12:44:17 +0100
 

=== modified file 'debian/patches/00list'
--- a/debian/patches/00list	2008-05-01 12:36:39 +0000
+++ b/debian/patches/00list	2008-05-01 12:40:29 +0000
@@ -2,3 +2,4 @@
 02-disable-nautilus-integration.dpatch
 03-ghost-window.dpatch
 04-build-preferences-module.dpatch
+05-fix-olive-preferences-import.dpatch

=== added file 'debian/patches/05-fix-olive-preferences-import.dpatch'
--- a/debian/patches/05-fix-olive-preferences-import.dpatch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/05-fix-olive-preferences-import.dpatch	2008-05-01 12:40:29 +0000
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-fix-olive-preferences-import.dpatch by Chris Lamb <chris at chris-lamb.co.uk>
+##
+## DP: Fix right-clicking in file list
+
+ at DPATCH@
+diff -urNad bzr-gtk-0.94.0rc1~/olive/menu.py bzr-gtk-0.94.0rc1/olive/menu.py
+--- bzr-gtk-0.94.0rc1~/olive/menu.py	2008-04-25 22:45:12.000000000 +0100
++++ bzr-gtk-0.94.0rc1/olive/menu.py	2008-05-01 13:37:16.000000000 +0100
+@@ -36,7 +36,7 @@
+ from bzrlib.plugins.gtk.annotate.config import GAnnotateConfig
+ from bzrlib.plugins.gtk.diff import DiffWindow
+ from launch import launch
+-from olive import Preferences
++from bzrlib.plugins.gtk.olive import Preferences
+ 
+ class OliveMenu:
+     """ This class is responsible for building the context menus. """