diff -u gnome-panel-2.19.4/debian/patches/01_layout.patch gnome-panel-2.19.4/debian/patches/01_layout.patch --- gnome-panel-2.19.4/debian/patches/01_layout.patch +++ gnome-panel-2.19.4/debian/patches/01_layout.patch @@ -1,7 +1,7 @@ -diff -Nur gnome-panel-2.18.0/gnome-panel/panel-menu-items.c gnome-panel-2.18.0.new/gnome-panel/panel-menu-items.c ---- gnome-panel-2.18.0/gnome-panel/panel-menu-items.c 2007-03-12 19:48:43.000000000 +0100 -+++ gnome-panel-2.18.0.new/gnome-panel/panel-menu-items.c 2007-04-10 11:46:38.000000000 +0200 -@@ -569,6 +569,7 @@ +diff -Nur gnome-panel-2.19.4/gnome-panel/panel-menu-items.c gnome-panel-2.19.4.new/gnome-panel/panel-menu-items.c +--- gnome-panel-2.19.4/gnome-panel/panel-menu-items.c 2007-06-17 11:55:29.000000000 -0700 ++++ gnome-panel-2.19.4.new/gnome-panel/panel-menu-items.c 2007-06-20 14:10:06.000000000 -0700 +@@ -565,6 +565,7 @@ GtkWidget *places_menu; GtkWidget *item; char *gconf_name; @@ -9,7 +9,7 @@ places_menu = panel_create_menu (); -@@ -581,6 +582,16 @@ +@@ -577,6 +578,16 @@ if (gconf_name) g_free (gconf_name); @@ -26,7 +26,7 @@ if (!gconf_client_get_bool (panel_gconf_get_client (), DESKTOP_IS_HOME_DIR_KEY, NULL)) { -@@ -715,9 +726,25 @@ +@@ -704,9 +715,27 @@ if (add_separator) add_menu_separator (menu); @@ -42,8 +42,10 @@ + panel_menu_items_append_from_desktop (menu, "gnome-about.desktop", NULL); -+ if (g_file_test (DATADIR"/omf/about-ubuntu/about-ubuntu-C.omf", -+ G_FILE_TEST_IS_REGULAR)) ++ if ((g_file_test (DATADIR"/omf/about-ubuntu/about-ubuntu-C.omf", ++ G_FILE_TEST_IS_REGULAR)) && !(g_file_test ++ (DATADIR"/omf/about-edubuntu/about-edubuntu-C.omf", ++ G_FILE_TEST_IS_REGULAR))) + panel_menu_items_append_from_desktop (menu, "ubuntu-about.desktop", NULL); + + if (g_file_test (DATADIR"/omf/about-edubuntu/about-edubuntu-C.omf", diff -u gnome-panel-2.19.4/debian/changelog gnome-panel-2.19.4/debian/changelog --- gnome-panel-2.19.4/debian/changelog +++ gnome-panel-2.19.4/debian/changelog @@ -1,3 +1,10 @@ +gnome-panel (1:2.19.4-0ubuntu2) feisty; urgency=low + + * 01_layout.patch: + - If About Edubuntu exists do not show About Ubuntu + + -- Jordan Mantha Wed, 20 Jun 2007 14:10:43 -0700 + gnome-panel (1:2.19.4-0ubuntu1) gutsy; urgency=low * New upstream version: