patches/gnome-panel-02-fish-applet.diff
changeset 16774 5314a7075ee9
parent 16055 5bccf1b9fcf1
child 17713 128cef95fb83
--- a/patches/gnome-panel-02-fish-applet.diff	Thu Oct 15 14:33:58 2009 +0000
+++ b/patches/gnome-panel-02-fish-applet.diff	Thu Oct 15 14:58:59 2009 +0000
@@ -1,7 +1,7 @@
-/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=
+/jds/bin/diff -uprN gnome-panel-2.28.0.old/configure.in gnome-panel-2.28.0/configure.in
+--- gnome-panel-2.28.0.old/configure.in	2009-09-21 17:35:48.000000000 +0100
++++ gnome-panel-2.28.0/configure.in	2009-10-15 15:52:34.875708828 +0100
+@@ -174,7 +174,7 @@ PANEL_INPROCESS_ALL=
  PANEL_INPROCESS_APPLETS=
  AC_ARG_WITH(in-process-applets,
  	AC_HELP_STRING([--with-in-process-applets=APPLETS],
@@ -10,7 +10,7 @@
  	[for i in `echo $withval | tr , ' '`; do
  		if test $i = "none"; then
  			PANEL_INPROCESS_NONE=1
-@@ -199,20 +199,18 @@ AC_ARG_WITH(in-process-applets,
+@@ -182,20 +182,18 @@ AC_ARG_WITH(in-process-applets,
  			PANEL_INPROCESS_ALL=1
  		else if test $i = "clock"; then
  			PANEL_INPROCESS_APPLETS="$PANEL_INPROCESS_APPLETS $i"
@@ -33,7 +33,7 @@
  fi
  if test -n "$PANEL_INPROCESS_NONE"; then
  	PANEL_INPROCESS_APPLETS=""
-@@ -222,10 +220,6 @@ for i in $PANEL_INPROCESS_APPLETS; do
+@@ -205,10 +203,6 @@ for i in $PANEL_INPROCESS_APPLETS; do
  		CLOCK_COMPILE_INPROCESS=1
  		AC_DEFINE([CLOCK_INPROCESS], 1,
  		[Defined when compiling the clock applet in-process])
@@ -44,7 +44,7 @@
  	else if test $i = "notification-area"; then
  		NOTIFICATION_AREA_COMPILE_INPROCESS=1
  		AC_DEFINE([NOTIFICATION_AREA_INPROCESS], 1,
-@@ -234,7 +228,7 @@ for i in $PANEL_INPROCESS_APPLETS; do
+@@ -217,7 +211,7 @@ for i in $PANEL_INPROCESS_APPLETS; do
  		WNCKLET_COMPILE_INPROCESS=1
  		AC_DEFINE([WNCKLET_INPROCESS], 1,
  		[Defined when compiling the wncklet applet in-process])
@@ -53,7 +53,7 @@
  done
  
  AM_CONDITIONAL(CLOCK_INPROCESS, test -n "$CLOCK_COMPILE_INPROCESS")
-@@ -347,7 +341,6 @@ po/Makefile.in
+@@ -332,7 +326,6 @@ po/Makefile.in
  applets/Makefile
  applets/clock/Makefile
  applets/clock/pixmaps/Makefile
@@ -61,9 +61,17 @@
  applets/notification_area/Makefile
  applets/wncklet/Makefile
  doc/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
+@@ -340,7 +333,6 @@ doc/reference/Makefile
+ doc/reference/panel-applet/Makefile
+ help/Makefile
+ help/clock/Makefile
+-help/fish/Makefile
+ man/Makefile
+ ])
+ 
+/jds/bin/diff -uprN gnome-panel-2.28.0.old/applets/Makefile.am gnome-panel-2.28.0/applets/Makefile.am
+--- gnome-panel-2.28.0.old/applets/Makefile.am	2009-05-02 02:01:58.000000000 +0100
++++ gnome-panel-2.28.0/applets/Makefile.am	2009-10-15 15:52:34.875323844 +0100
 @@ -1,6 +1,5 @@
  SUBDIRS =		\
  	clock		\
@@ -71,20 +79,9 @@
  	notification_area \
  	wncklet
  
-diff -ruN gnome-panel-2.27.4.orig/configure.in gnome-panel-2.27.4/configure.in
---- gnome-panel-2.27.4.orig/configure.in	2009-07-19 15:34:20.449234980 +0100
-+++ gnome-panel-2.27.4/configure.in	2009-07-19 15:40:36.685825917 +0100
-@@ -338,7 +338,6 @@
- doc/reference/panel-applet/Makefile
- help/Makefile
- help/clock/Makefile
--help/fish/Makefile
- man/Makefile
- ])
- 
-diff -ruN gnome-panel-2.27.4.orig/help/Makefile.am gnome-panel-2.27.4/help/Makefile.am
---- gnome-panel-2.27.4.orig/help/Makefile.am	2009-07-19 15:42:12.669015975 +0100
-+++ gnome-panel-2.27.4/help/Makefile.am	2009-07-19 15:42:52.234570642 +0100
+/jds/bin/diff -uprN gnome-panel-2.28.0.old/help/Makefile.am gnome-panel-2.28.0/help/Makefile.am
+--- gnome-panel-2.28.0.old/help/Makefile.am	2009-07-01 14:06:23.000000000 +0100
++++ gnome-panel-2.28.0/help/Makefile.am	2009-10-15 15:52:34.875929591 +0100
 @@ -1,3 +1,3 @@
 -SUBDIRS = clock fish
 +SUBDIRS = clock