--- panel/Makefile.in.orig	Tue May 23 04:25:47 2000
+++ panel/Makefile.in	Fri May 26 15:30:48 2000
@@ -169,7 +169,7 @@
 libpanel_appletinclude_HEADERS =  	applet-widget.h			gnome-panel.h
 
 
-libpanel_applet_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir)
+libpanel_applet_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir)
 libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
 
 libpanel_status_la_SOURCES =  	status-docklet.c 	$(CORBA_SRCLIST)
@@ -178,7 +178,7 @@
 libpanel_statusinclude_HEADERS =  	status-docklet.h
 
 
-libpanel_status_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
+libpanel_status_la_LDFLAGS = -version-info 5:0:0 -rpath $(libdir)
 libpanel_status_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
 
 BUILT_SOURCES = $(CORBA_SRCLIST)
@@ -210,7 +210,7 @@
 EXTRA_DIST =  	panelrc.in				panel.in				appletsConf.sh.in			dockletsConf.sh.in			panel.gnorba				panel.soundlist				APPLET_WRITING				panel.hints				gnome-panel-properties.desktop		nothing.cP				title-item.gob
 
 
-confexecdir = $(libdir)
+confexecdir = $(sysconfdir)
 confexec_DATA = appletsConf.sh dockletsConf.sh
 
 panelgnorbadir = $(sysconfdir)/CORBA/servers
--- panel/foobar-widget.c.orig	Wed Sep 20 00:03:43 2000
+++ panel/foobar-widget.c	Mon Sep 25 14:26:18 2000
@@ -602,7 +602,7 @@
 				   FALSE, "apps");
 	foo->settings =
 		append_folder_menu(menu_bar, _("Settings"),  NULL, TRUE,
-			           "gnome/apps/Settings");
+			           "apps/Settings");
 	append_desktop_menu (menu_bar);
 
 	gtk_box_pack_start (GTK_BOX (foo->hbox), menu_bar, FALSE, FALSE, 0);
--- panel/main.c.orig	Fri Jan 12 17:54:08 2001
+++ panel/main.c	Mon Feb 26 19:55:27 2001
@@ -153,3 +153,3 @@
 
-	merge_main_dir = gnome_datadir_file("gnome/apps/");
+	merge_main_dir = gnome_datadir_file("apps");
 	merge_main_dir_len = merge_main_dir != NULL ? strlen (merge_main_dir) : 0;
--- panel/menu.c.orig	Fri Apr 27 15:46:00 2001
+++ panel/menu.c	Fri May  4 15:11:16 2001
@@ -147,3 +147,3 @@
 	  and a level down*/
-	menu = gnome_datadir_file ("gnome/apps");
+	menu = gnome_datadir_file ("apps");
 	if (menu != NULL)
@@ -3436,3 +3436,3 @@
 {
-	char *menudir = gnome_datadir_file ("gnome/apps");
+	char *menudir = gnome_datadir_file ("apps");
 
@@ -4543,4 +4543,4 @@
 			   GTK_SIGNAL_FUNC(add_menu_to_panel),
-			   "gnome/apps");
-	setup_internal_applet_drag(submenuitem, "MENU:gnome/apps");
+			   "apps");
+	setup_internal_applet_drag(submenuitem, "MENU:apps");
 
--- panel/menu-properties.c.orig	Sat Sep  9 19:52:26 2000
+++ panel/menu-properties.c	Mon Sep 25 14:28:44 2000
@@ -40,7 +40,7 @@
 		arguments = ".";
 
 	if(strcmp(arguments, ".") == 0)
-		this_menu = gnome_unconditional_datadir_file ("gnome/apps");
+		this_menu = gnome_unconditional_datadir_file ("apps");
 	else if (*arguments == '/')
 		this_menu = g_strdup (arguments);
 	else if (*arguments == '~')
