--- a/patches/gnome-panel-02-fish-applet.diff Wed Jun 03 19:50:36 2009 +0000
+++ b/patches/gnome-panel-02-fish-applet.diff Wed Jun 03 21:59:16 2009 +0000
@@ -1,35 +1,6 @@
---- gnome-panel-2.23.90.old/applets/Makefile.am 2008-08-26 10:58:40.153748000 +0100
-+++ gnome-panel-2.23.90/applets/Makefile.am 2008-08-26 10:58:51.397244000 +0100
-@@ -1,6 +1,5 @@
- SUBDIRS = \
- clock \
-- fish \
- notification_area \
- wncklet
-
---- gnome-panel-2.23.90.old/help/Makefile.am 2008-08-26 10:58:39.091513000 +0100
-+++ gnome-panel-2.23.90/help/Makefile.am 2008-08-26 11:00:45.283488000 +0100
-@@ -1 +1 @@
--SUBDIRS = clock fish window-list workspace-switcher ja zh_CN zh_TW
-+SUBDIRS = clock window-list workspace-switcher ja zh_CN zh_TW
---- gnome-panel-2.23.90.old/help/ja/Makefile.am 2008-08-26 10:58:38.604997000 +0100
-+++ gnome-panel-2.23.90/help/ja/Makefile.am 2008-08-26 11:00:50.828255000 +0100
-@@ -1 +1 @@
--SUBDIRS = fish window-list workspace-switcher
-+SUBDIRS = window-list workspace-switcher
---- gnome-panel-2.23.90.old/help/zh_CN/Makefile.am 2008-08-26 10:58:38.967806000 +0100
-+++ gnome-panel-2.23.90/help/zh_CN/Makefile.am 2008-08-26 11:01:58.626835000 +0100
-@@ -1 +1 @@
--SUBDIRS = fish workspace-switcher
-+SUBDIRS = workspace-switcher
---- gnome-panel-2.23.90.old/help/zh_TW/Makefile.am 2008-08-26 10:58:39.089256000 +0100
-+++ gnome-panel-2.23.90/help/zh_TW/Makefile.am 2008-08-26 11:02:01.716988000 +0100
-@@ -1 +1 @@
--SUBDIRS = fish window-list workspace-switcher
-+SUBDIRS = window-list workspace-switcher
-/jds/bin/diff -uprN gnome-panel-2.25.3.old/configure.in gnome-panel-2.25.3/configure.in
---- gnome-panel-2.25.3.old/configure.in 2009-01-13 16:23:38.631342000 +0000
-+++ gnome-panel-2.25.3/configure.in 2009-01-13 16:25:15.574961000 +0000
+/jds/bin/diff -uprN gnome-panel-2.26.2.old/configure.in gnome-panel-2.26.2/configure.in
+--- gnome-panel-2.26.2.old/configure.in 2009-06-03 16:20:49.993847000 +0100
++++ gnome-panel-2.26.2/configure.in 2009-06-03 16:22:43.335986000 +0100
@@ -191,7 +191,7 @@ PANEL_INPROCESS_ALL=
PANEL_INPROCESS_APPLETS=
AC_ARG_WITH(in-process-applets,
@@ -82,7 +53,7 @@
done
AM_CONDITIONAL(CLOCK_INPROCESS, test -n "$CLOCK_COMPILE_INPROCESS")
-@@ -350,7 +344,6 @@ po/Makefile.in
+@@ -347,7 +341,6 @@ po/Makefile.in
applets/Makefile
applets/clock/Makefile
applets/clock/pixmaps/Makefile
@@ -90,22 +61,29 @@
applets/notification_area/Makefile
applets/wncklet/Makefile
doc/Makefile
-@@ -358,18 +351,14 @@ doc/reference/Makefile
+@@ -355,7 +348,6 @@ doc/reference/Makefile
doc/reference/panel-applet/Makefile
help/Makefile
help/clock/Makefile
-help/fish/Makefile
help/window-list/Makefile
help/workspace-switcher/Makefile
- help/ja/Makefile
--help/ja/fish/Makefile
- help/ja/window-list/Makefile
- help/ja/workspace-switcher/Makefile
- help/zh_CN/Makefile
--help/zh_CN/fish/Makefile
- help/zh_CN/workspace-switcher/Makefile
- help/zh_TW/Makefile
--help/zh_TW/fish/Makefile
- help/zh_TW/window-list/Makefile
- help/zh_TW/workspace-switcher/Makefile
man/Makefile
+/jds/bin/diff -uprN gnome-panel-2.26.2.old/applets/Makefile.am gnome-panel-2.26.2/applets/Makefile.am
+--- gnome-panel-2.26.2.old/applets/Makefile.am 2009-06-03 16:20:50.146577000 +0100
++++ gnome-panel-2.26.2/applets/Makefile.am 2009-06-03 16:21:12.695750000 +0100
+@@ -1,6 +1,5 @@
+ SUBDIRS = \
+ clock \
+- fish \
+ notification_area \
+ wncklet
+
+/jds/bin/diff -uprN gnome-panel-2.26.2.old/help/Makefile.am gnome-panel-2.26.2/help/Makefile.am
+--- gnome-panel-2.26.2.old/help/Makefile.am 2009-06-03 16:20:50.276021000 +0100
++++ gnome-panel-2.26.2/help/Makefile.am 2009-06-03 16:21:06.196636000 +0100
+@@ -1,3 +1,3 @@
+-SUBDIRS = clock fish window-list workspace-switcher
++SUBDIRS = clock window-list workspace-switcher
+
+ -include $(top_srcdir)/git.mk