diff -Nru software-center-5.6.0/debian/changelog software-center-5.6.0/debian/changelog --- software-center-5.6.0/debian/changelog 2013-03-27 15:51:52.000000000 -0400 +++ software-center-5.6.0/debian/changelog 2013-04-08 15:05:55.000000000 -0400 @@ -1,3 +1,12 @@ +software-center (5.6.0-0ubuntu2) raring; urgency=low + + * debian/patches/00_bzr-typerror-remove-menuitem.patch: + - Avoid TypeError caused by external bug, by removing the Cut + menu item from the main menu, and making the Copy item not + used for the search entry. (LP: #1151621) + + -- Rodney Dawes Mon, 08 Apr 2013 15:04:00 -0400 + software-center (5.6.0-0ubuntu1) raring; urgency=low * New upstream release. diff -Nru software-center-5.6.0/debian/patches/00_bzr-typerror-remove-menuitem.patch software-center-5.6.0/debian/patches/00_bzr-typerror-remove-menuitem.patch --- software-center-5.6.0/debian/patches/00_bzr-typerror-remove-menuitem.patch 1969-12-31 19:00:00.000000000 -0500 +++ software-center-5.6.0/debian/patches/00_bzr-typerror-remove-menuitem.patch 2013-04-08 15:03:25.000000000 -0400 @@ -0,0 +1,72 @@ +=== modified file 'data/ui/gtk3/SoftwareCenter.ui' +--- old/data/ui/gtk3/SoftwareCenter.ui 2012-09-25 23:13:51 +0000 ++++ new/data/ui/gtk3/SoftwareCenter.ui 2013-04-04 21:21:18 +0000 +@@ -253,18 +253,6 @@ Robert Roth - Code + + + +- +- gtk-cut +- True +- False +- False +- True +- True +- +- +- +- +- + + gtk-copy + True + +=== modified file 'softwarecenter/ui/gtk3/app.py' +--- old/softwarecenter/ui/gtk3/app.py 2012-12-14 16:44:25 +0000 ++++ new/softwarecenter/ui/gtk3/app.py 2013-04-04 22:22:32 +0000 +@@ -668,8 +668,6 @@ class SoftwareCenterAppGtk3(SimpleGtkbui + if (event.keyval == Gdk.keyval_from_name("x") and + event.state == Gdk.ModifierType.CONTROL_MASK): + self.menuitem_edit.activate() +- if self.menuitem_cut.get_sensitive(): +- self.menuitem_cut.activate() + + if (event.keyval == Gdk.keyval_from_name("c") and + event.state == Gdk.ModifierType.CONTROL_MASK): +@@ -938,7 +936,6 @@ class SoftwareCenterAppGtk3(SimpleGtkbui + """ + edit_menu_items = [self.menuitem_undo, + self.menuitem_redo, +- self.menuitem_cut, + self.menuitem_copy, + self.menuitem_copy_web_link, + self.menuitem_paste, +@@ -964,10 +961,7 @@ class SoftwareCenterAppGtk3(SimpleGtkbui + self.menuitem_undo.set_sensitive(True) + if len(self.active_pane.searchentry._redo_stack) > 0: + self.menuitem_redo.set_sensitive(True) +- bounds = self.active_pane.searchentry.get_selection_bounds() +- if bounds: +- self.menuitem_cut.set_sensitive(True) +- self.menuitem_copy.set_sensitive(True) ++ + self.menuitem_paste.set_sensitive(True) + if self.active_pane.searchentry.get_text(): + self.menuitem_delete.set_sensitive(True) +@@ -998,15 +992,10 @@ class SoftwareCenterAppGtk3(SimpleGtkbui + def on_menuitem_redo_activate(self, menuitem): + self.active_pane.searchentry.redo() + +- def on_menuitem_cut_activate(self, menuitem): +- self.active_pane.searchentry.cut_clipboard() +- + def on_menuitem_copy_activate(self, menuitem): + if (self.active_pane and + self.active_pane.is_app_details_view_showing()): + self.active_pane.app_details_view.desc.copy_clipboard() +- elif self.active_pane: +- self.active_pane.searchentry.copy_clipboard() + + def on_menuitem_paste_activate(self, menuitem): + self.active_pane.searchentry.paste_clipboard() + diff -Nru software-center-5.6.0/debian/patches/series software-center-5.6.0/debian/patches/series --- software-center-5.6.0/debian/patches/series 1969-12-31 19:00:00.000000000 -0500 +++ software-center-5.6.0/debian/patches/series 2013-04-08 15:03:41.000000000 -0400 @@ -0,0 +1 @@ +00_bzr-typerror-remove-menuitem.patch