[Pkg-bazaar-commits] ./bzr-gtk/unstable r34: Drop 04-add-missing-icons patch, was merged upstream.

[Chris Lamb]

------------------------------------------------------------
revno: 34
committer: Chris Lamb <chris at chris-lamb.co.uk>
branch nick: pkg-bzr-gtk
timestamp: Thu 2008-05-01 12:52:12 +0100
message:
  Drop 04-add-missing-icons patch, was merged upstream.
removed:
  debian/patches/04-add-missing-icons.dpatch
modified:
  debian/changelog
  debian/patches/00list
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-01 11:51:35 +0000
+++ b/debian/changelog	2008-05-01 11:52:12 +0000
@@ -2,6 +2,7 @@
 
   [ Chris Lamb ]
   * New upstream release.
+  * Drop 04-add-missing-icons patch, was merged upstream.
 
  -- 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 11:41:35 +0000
+++ b/debian/patches/00list	2008-05-01 11:52:12 +0000
@@ -1,3 +1,2 @@
 02-disable-nautilus-integration.dpatch
 03-ghost-window.dpatch
-04-add-missing-icons.dpatch

=== removed file 'debian/patches/04-add-missing-icons.dpatch'
--- a/debian/patches/04-add-missing-icons.dpatch	2008-05-01 11:41:35 +0000
+++ b/debian/patches/04-add-missing-icons.dpatch	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-add-missing-icons.dpatch by Chris Lamb <chris at chris-lamb.co.uk>
-##
-## DP: Fix broken icons in .desktop files (Closes: #456438).
-
- at DPATCH@
-diff -urNad bzr-gtk~/bazaar-properties.desktop bzr-gtk/bazaar-properties.desktop
---- bzr-gtk~/bazaar-properties.desktop	2007-12-18 23:20:54.000000000 +0000
-+++ bzr-gtk/bazaar-properties.desktop	2007-12-18 23:24:17.000000000 +0000
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Name=Bazaar Preferences
- Comment=Configure Bazaar settings
--Icon=bazaar
-+Icon=bzr-icon-64.png
- Exec=bzr gpreferences
- Terminal=false
- Type=Application
-diff -urNad bzr-gtk~/setup.py bzr-gtk/setup.py
---- bzr-gtk~/setup.py	2007-12-18 23:20:54.000000000 +0000
-+++ bzr-gtk/setup.py	2007-12-18 23:24:01.000000000 +0000
-@@ -126,7 +126,8 @@
-                 ('share/applications', ['olive-gtk.desktop',
-                                         'bazaar-properties.desktop',
-                                         'bzr-notify.desktop']),
--                ('share/pixmaps', ['icons/olive-gtk.png'])
-+                ('share/pixmaps', ['icons/olive-gtk.png',
-+                                   'bzr-icon-64.png'])
-                ],
-     cmdclass={'install_data': InstallData,
-               'check': Check}