rpms/bzr-gtk/F-8 bzr-gtk-disable-nautilus-pull.patch, 1.1, 1.2 bzr-gtk-disable-notifier.patch, 1.1, 1.2 bzr-gtk-ghost-keyerror.patch, 1.1, 1.2 bzr-gtk.spec, 1.19, 1.20

[Toshio くらとみ (toshio)]

Author: toshio

Update of /cvs/pkgs/rpms/bzr-gtk/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27415/F-8

Modified Files:
	bzr-gtk-disable-nautilus-pull.patch 
	bzr-gtk-disable-notifier.patch bzr-gtk-ghost-keyerror.patch 
	bzr-gtk.spec 
Log Message:
* Thu Jul 24 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-5
- Upstream has a new patch for bz#455284.


bzr-gtk-disable-nautilus-pull.patch:

Index: bzr-gtk-disable-nautilus-pull.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk-disable-nautilus-pull.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzr-gtk-disable-nautilus-pull.patch	10 Jun 2007 21:21:19 -0000	1.1
+++ bzr-gtk-disable-nautilus-pull.patch	24 Jul 2008 18:31:15 -0000	1.2
@@ -1,8 +1,8 @@
-Index: bzr-gtk-0.15.2/nautilus-bzr.py
+Index: bzr-gtk-0.94.0/nautilus-bzr.py
 ===================================================================
---- bzr-gtk-0.15.2.orig/nautilus-bzr.py
-+++ bzr-gtk-0.15.2/nautilus-bzr.py
-@@ -165,24 +165,6 @@ class BzrExtension(nautilus.MenuProvider
+--- bzr-gtk-0.94.0.orig/nautilus-bzr.py
++++ bzr-gtk-0.94.0/nautilus-bzr.py
+@@ -183,24 +183,6 @@ class BzrExtension(nautilus.MenuProvider
  
          return
  
@@ -27,7 +27,7 @@
      def merge_cb(self, menu, vfs_file):
          # We can only cope with local files
          if vfs_file.get_uri_scheme() != 'file':
-@@ -227,12 +209,6 @@ class BzrExtension(nautilus.MenuProvider
+@@ -265,12 +247,6 @@ class BzrExtension(nautilus.MenuProvider
          item.connect('activate', self.log_cb, vfs_file)
          items.append(item)
  

bzr-gtk-disable-notifier.patch:

Index: bzr-gtk-disable-notifier.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk-disable-notifier.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzr-gtk-disable-notifier.patch	3 Apr 2007 20:44:47 -0000	1.1
+++ bzr-gtk-disable-notifier.patch	24 Jul 2008 18:31:15 -0000	1.2
@@ -1,8 +1,8 @@
-Index: bzr-gtk-0.15.2/__init__.py
+Index: bzr-gtk-0.94.0/__init__.py
 ===================================================================
---- bzr-gtk-0.15.2.orig/__init__.py
-+++ bzr-gtk-0.15.2/__init__.py
-@@ -491,7 +491,9 @@ class cmd_commit_notify(GTKCommand):
+--- bzr-gtk-0.94.0.orig/__init__.py
++++ bzr-gtk-0.94.0/__init__.py
+@@ -594,7 +594,9 @@ class cmd_commit_notify(GTKCommand):
          pynotify.init("bzr commit-notify")
          gtk.main()
  
@@ -12,4 +12,4 @@
 +#register_command(cmd_commit_notify)
  
  
- import gettext
+ class cmd_gselftest(GTKCommand):

bzr-gtk-ghost-keyerror.patch:

Index: bzr-gtk-ghost-keyerror.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk-ghost-keyerror.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bzr-gtk-ghost-keyerror.patch	15 Jul 2008 02:56:31 -0000	1.1
+++ bzr-gtk-ghost-keyerror.patch	24 Jul 2008 18:31:15 -0000	1.2
@@ -1,12 +1,13 @@
-diff -up bzr-gtk-0.94.0/branchview/treeview.py.ghost bzr-gtk-0.94.0/branchview/treeview.py
---- bzr-gtk-0.94.0/branchview/treeview.py.ghost	2008-07-14 19:24:23.000000000 -0700
-+++ bzr-gtk-0.94.0/branchview/treeview.py	2008-07-14 19:24:48.000000000 -0700
-@@ -285,7 +285,7 @@ class TreeView(gtk.VBox):
+Index: bzr-gtk-0.94.0/olive/__init__.py
+===================================================================
+--- bzr-gtk-0.94.0.orig/olive/__init__.py
++++ bzr-gtk-0.94.0/olive/__init__.py
+@@ -773,7 +773,7 @@ class OliveGtk:
+         else:
+             branch = self.remote_branch
  
-         self.branch.lock_read()
-         (linegraphdata, index, columns_len) = linegraph(self.branch.repository,
--                                                        self.start,
-+                                                        (self.start,),
-                                                         self.maxnum, 
-                                                         broken_line_length,
-                                                         show_graph,
+-        window = branchwin.BranchWindow(branch, branch.last_revision(), None, parent=self.window)
++        window = branchwin.BranchWindow(branch, [branch.last_revision()], None, parent=self.window)
+         window.show()
+     
+     def on_menuitem_view_refresh_activate(self, widget):


Index: bzr-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bzr-gtk/F-8/bzr-gtk.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bzr-gtk.spec	15 Jul 2008 02:59:25 -0000	1.19
+++ bzr-gtk.spec	24 Jul 2008 18:31:15 -0000	1.20
@@ -8,7 +8,7 @@
 
 Name:           bzr-gtk
 Version:        0.94.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Bazaar plugin for GTK+ interfaces to most Bazaar operations
 
 Group:          Development/Tools
@@ -127,8 +127,12 @@
 %endif
 
 %changelog
-* Mon Jul 14 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-4
+* Thu Jul 24 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-5
+- Upstream has a new patch for bz#455284.
+
+* Mon Jul 14 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-4.1
 - Add upstream patch to fix a traceback when using log in olive.
+- Refresh patches so we don't have fuzz.
 
 * Wed May 21 2008 Toshio Kuratomi <toshio at fedoraproject.org> 0.94.0-2
 - Add patch from upstream to fix all bzr-gtk commands when seahorse