[Pkg-bazaar-commits] ./bzr-gtk/unstable r42: Remove two patches that are now upstream.

[Jelmer Vernooij]

------------------------------------------------------------
revno: 42
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: debian
timestamp: Thu 2008-05-01 15:16:32 +0200
message:
  Remove two patches that are now upstream.
removed:
  debian/patches/04-build-preferences-module.dpatch
  debian/patches/05-fix-olive-preferences-import.dpatch
modified:
  debian/patches/00list
-------------- next part --------------
=== modified file 'debian/patches/00list'
--- a/debian/patches/00list	2008-05-01 12:40:29 +0000
+++ b/debian/patches/00list	2008-05-01 13:16:32 +0000
@@ -1,5 +1,3 @@
 01-desktop-file-categories.dpatch
 02-disable-nautilus-integration.dpatch
 03-ghost-window.dpatch
-04-build-preferences-module.dpatch
-05-fix-olive-preferences-import.dpatch

=== removed file 'debian/patches/04-build-preferences-module.dpatch'
--- a/debian/patches/04-build-preferences-module.dpatch	2008-05-01 12:36:39 +0000
+++ b/debian/patches/04-build-preferences-module.dpatch	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-build-preferences-module.dpatch by Chris Lamb <chris at chris-lamb.co.uk>
-##
-## DP: Build and install the bzrlib.plugins.gtk.preferences package
-
- at DPATCH@
-diff -urNad bzr-gtk-0.94.0rc1~/setup.py bzr-gtk-0.94.0rc1/setup.py
---- bzr-gtk-0.94.0rc1~/setup.py	2008-05-01 13:25:24.000000000 +0100
-+++ bzr-gtk-0.94.0rc1/setup.py	2008-05-01 13:25:41.000000000 +0100
-@@ -104,6 +104,7 @@
-         "bzrlib.plugins.gtk.olive": "olive",
-         "bzrlib.plugins.gtk.tests": "tests",
-         "bzrlib.plugins.gtk.branchview": "branchview",
-+        "bzrlib.plugins.gtk.preferences": "preferences",
-         },
-     packages = [
-         "bzrlib.plugins.gtk",
-@@ -112,6 +113,7 @@
-         "bzrlib.plugins.gtk.olive",
-         "bzrlib.plugins.gtk.tests",
-         "bzrlib.plugins.gtk.branchview",
-+        "bzrlib.plugins.gtk.preferences",
-         ],
-     data_files=[('share/olive', ['olive.glade',
-                                  'cmenu.ui',

=== removed file 'debian/patches/05-fix-olive-preferences-import.dpatch'
--- a/debian/patches/05-fix-olive-preferences-import.dpatch	2008-05-01 12:40:29 +0000
+++ b/debian/patches/05-fix-olive-preferences-import.dpatch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#! /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. """