12 files changed, 234 insertions, 81 deletions

diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index 7b9fbd00d9e3..67b9f2bf6427 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION=	0.1.51
+PORTVERSION=	0.1.52
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
 DISTNAME=	gnome-pilot-${PORTVERSION}
diff --git a/palm/gnome-pilot/distinfo b/palm/gnome-pilot/distinfo
index 4e85d0289ab2..e5d3246148d5 100644
--- a/palm/gnome-pilot/distinfo
+++ b/palm/gnome-pilot/distinfo
@@ -1 +1 @@
-MD5 (gnome-pilot-0.1.51.tar.gz) = 90c1a2e46d62e877776cbb23ed4c9bb8
+MD5 (gnome-pilot-0.1.52.tar.gz) = f31268b4c50bf8a6ba2ae352c36d802a
diff --git a/palm/gnome-pilot/files/patch-ai b/palm/gnome-pilot/files/patch-ai
index 36f433be8b66..542aa22a4842 100644
--- a/palm/gnome-pilot/files/patch-ai
+++ b/palm/gnome-pilot/files/patch-ai
@@ -1,6 +1,15 @@
---- conduits/backup/Makefile.in.orig	Wed Apr 19 05:36:22 2000
-+++ conduits/backup/Makefile.in	Fri Apr 21 11:22:12 2000
-@@ -188,7 +188,7 @@
+--- conduits/backup/Makefile.in.orig	Wed May 10 00:03:11 2000
++++ conduits/backup/Makefile.in	Tue May 16 16:47:08 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = backup-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -9,9 +18,18 @@
  libbackup_conduit_la_DEPENDENCIES = 
  libbackup_conduit_la_OBJECTS =  backup_conduit.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/email/Makefile.in.orig	Wed Apr 19 05:36:26 2000
-+++ conduits/email/Makefile.in	Fri Apr 21 11:23:14 2000
-@@ -188,7 +188,7 @@
+--- conduits/email/Makefile.in.orig	Wed May 10 00:03:11 2000
++++ conduits/email/Makefile.in	Tue May 16 16:47:11 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = email-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -20,9 +38,18 @@
  libemail_conduit_la_DEPENDENCIES = 
  libemail_conduit_la_OBJECTS =  email_conduit.lo parsedate.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/expense/Makefile.in.orig	Wed Apr 19 05:36:33 2000
-+++ conduits/expense/Makefile.in	Fri Apr 21 11:23:26 2000
-@@ -188,7 +188,7 @@
+--- conduits/expense/Makefile.in.orig	Wed May 10 00:03:13 2000
++++ conduits/expense/Makefile.in	Tue May 16 16:47:14 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = expense-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -31,9 +58,18 @@
  libexpense_conduit_la_DEPENDENCIES = 
  libexpense_conduit_la_OBJECTS =  expense_conduit.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/file/Makefile.in.orig	Wed Apr 19 05:36:18 2000
-+++ conduits/file/Makefile.in	Fri Apr 21 11:23:36 2000
-@@ -198,7 +198,7 @@
+--- conduits/file/Makefile.in.orig	Wed May 10 00:03:10 2000
++++ conduits/file/Makefile.in	Tue May 16 16:47:17 2000
+@@ -181,7 +181,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = file-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -202,7 +202,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -42,9 +78,18 @@
  libfile_conduit_la_DEPENDENCIES = 
  libfile_conduit_la_OBJECTS =  file_conduit.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/memo_file/Makefile.in.orig	Wed Apr 19 05:36:29 2000
-+++ conduits/memo_file/Makefile.in	Fri Apr 21 11:23:50 2000
-@@ -188,7 +188,7 @@
+--- conduits/memo_file/Makefile.in.orig	Wed May 10 00:03:12 2000
++++ conduits/memo_file/Makefile.in	Tue May 16 16:47:20 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = memo_file_capplet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
diff --git a/palm/gnome-pilot/pkg-plist b/palm/gnome-pilot/pkg-plist
index 7ec5cdcbf528..84458afc3168 100644
--- a/palm/gnome-pilot/pkg-plist
+++ b/palm/gnome-pilot/pkg-plist
@@ -45,15 +45,21 @@ lib/libgpilotdconduit.so
 lib/libgpilotdconduit.so.0
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/gnome/apps/Settings/Peripherals/Conduits/.directory
+share/gnome/apps/Settings/Peripherals/Conduits/backup-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/email-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/expense-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/file-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/memo_file_capplet.desktop
+share/gnome/apps/Settings/Peripherals/gpilotd-control-applet.desktop
 share/gnome/applets/Utility/pilot_applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/.directory
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/.directory
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/backup-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/email-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/expense-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/file-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/memo_file_capplet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/gpilotd-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/.directory
+share/gnome/control-center/Peripherals/Conduits/backup-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/email-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/expense-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/file-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/memo_file_capplet.desktop
+share/gnome/control-center/Peripherals/gpilotd-control-applet.desktop
 share/gnome/gnome-pilot/conduits/backup.conduit
 share/gnome/gnome-pilot/conduits/expense.conduit
 share/gnome/gnome-pilot/conduits/file.conduit
@@ -88,8 +94,8 @@ share/locale/uk/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/gnome-pilot/glade
 @dirrm share/gnome/gnome-pilot/conduits
 @dirrm share/gnome/gnome-pilot
-@dirrm share/gnome/control-center/Peripherals/PalmPilot/Conduits
-@dirrm share/gnome/control-center/Peripherals/PalmPilot
+@dirrm share/gnome/control-center/Peripherals/Conduits
+@dirrm share/gnome/apps/Settings/Peripherals/Conduits
 @dirrm lib/gnome-pilot/conduits
 @dirrm lib/gnome-pilot
 @dirrm include/libgpilotdCM
diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile
index 7b9fbd00d9e3..67b9f2bf6427 100644
--- a/palm/gnomepilot/Makefile
+++ b/palm/gnomepilot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION=	0.1.51
+PORTVERSION=	0.1.52
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
 DISTNAME=	gnome-pilot-${PORTVERSION}
diff --git a/palm/gnomepilot/distinfo b/palm/gnomepilot/distinfo
index 4e85d0289ab2..e5d3246148d5 100644
--- a/palm/gnomepilot/distinfo
+++ b/palm/gnomepilot/distinfo
@@ -1 +1 @@
-MD5 (gnome-pilot-0.1.51.tar.gz) = 90c1a2e46d62e877776cbb23ed4c9bb8
+MD5 (gnome-pilot-0.1.52.tar.gz) = f31268b4c50bf8a6ba2ae352c36d802a
diff --git a/palm/gnomepilot/files/patch-ai b/palm/gnomepilot/files/patch-ai
index 36f433be8b66..542aa22a4842 100644
--- a/palm/gnomepilot/files/patch-ai
+++ b/palm/gnomepilot/files/patch-ai
@@ -1,6 +1,15 @@
---- conduits/backup/Makefile.in.orig	Wed Apr 19 05:36:22 2000
-+++ conduits/backup/Makefile.in	Fri Apr 21 11:22:12 2000
-@@ -188,7 +188,7 @@
+--- conduits/backup/Makefile.in.orig	Wed May 10 00:03:11 2000
++++ conduits/backup/Makefile.in	Tue May 16 16:47:08 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = backup-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -9,9 +18,18 @@
  libbackup_conduit_la_DEPENDENCIES = 
  libbackup_conduit_la_OBJECTS =  backup_conduit.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/email/Makefile.in.orig	Wed Apr 19 05:36:26 2000
-+++ conduits/email/Makefile.in	Fri Apr 21 11:23:14 2000
-@@ -188,7 +188,7 @@
+--- conduits/email/Makefile.in.orig	Wed May 10 00:03:11 2000
++++ conduits/email/Makefile.in	Tue May 16 16:47:11 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = email-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -20,9 +38,18 @@
  libemail_conduit_la_DEPENDENCIES = 
  libemail_conduit_la_OBJECTS =  email_conduit.lo parsedate.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/expense/Makefile.in.orig	Wed Apr 19 05:36:33 2000
-+++ conduits/expense/Makefile.in	Fri Apr 21 11:23:26 2000
-@@ -188,7 +188,7 @@
+--- conduits/expense/Makefile.in.orig	Wed May 10 00:03:13 2000
++++ conduits/expense/Makefile.in	Tue May 16 16:47:14 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = expense-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -31,9 +58,18 @@
  libexpense_conduit_la_DEPENDENCIES = 
  libexpense_conduit_la_OBJECTS =  expense_conduit.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/file/Makefile.in.orig	Wed Apr 19 05:36:18 2000
-+++ conduits/file/Makefile.in	Fri Apr 21 11:23:36 2000
-@@ -198,7 +198,7 @@
+--- conduits/file/Makefile.in.orig	Wed May 10 00:03:10 2000
++++ conduits/file/Makefile.in	Tue May 16 16:47:17 2000
+@@ -181,7 +181,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = file-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -202,7 +202,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -42,9 +78,18 @@
  libfile_conduit_la_DEPENDENCIES = 
  libfile_conduit_la_OBJECTS =  file_conduit.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/memo_file/Makefile.in.orig	Wed Apr 19 05:36:29 2000
-+++ conduits/memo_file/Makefile.in	Fri Apr 21 11:23:50 2000
-@@ -188,7 +188,7 @@
+--- conduits/memo_file/Makefile.in.orig	Wed May 10 00:03:12 2000
++++ conduits/memo_file/Makefile.in	Tue May 16 16:47:20 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = memo_file_capplet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
diff --git a/palm/gnomepilot/pkg-plist b/palm/gnomepilot/pkg-plist
index 7ec5cdcbf528..84458afc3168 100644
--- a/palm/gnomepilot/pkg-plist
+++ b/palm/gnomepilot/pkg-plist
@@ -45,15 +45,21 @@ lib/libgpilotdconduit.so
 lib/libgpilotdconduit.so.0
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/gnome/apps/Settings/Peripherals/Conduits/.directory
+share/gnome/apps/Settings/Peripherals/Conduits/backup-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/email-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/expense-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/file-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/memo_file_capplet.desktop
+share/gnome/apps/Settings/Peripherals/gpilotd-control-applet.desktop
 share/gnome/applets/Utility/pilot_applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/.directory
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/.directory
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/backup-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/email-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/expense-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/file-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/memo_file_capplet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/gpilotd-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/.directory
+share/gnome/control-center/Peripherals/Conduits/backup-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/email-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/expense-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/file-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/memo_file_capplet.desktop
+share/gnome/control-center/Peripherals/gpilotd-control-applet.desktop
 share/gnome/gnome-pilot/conduits/backup.conduit
 share/gnome/gnome-pilot/conduits/expense.conduit
 share/gnome/gnome-pilot/conduits/file.conduit
@@ -88,8 +94,8 @@ share/locale/uk/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/gnome-pilot/glade
 @dirrm share/gnome/gnome-pilot/conduits
 @dirrm share/gnome/gnome-pilot
-@dirrm share/gnome/control-center/Peripherals/PalmPilot/Conduits
-@dirrm share/gnome/control-center/Peripherals/PalmPilot
+@dirrm share/gnome/control-center/Peripherals/Conduits
+@dirrm share/gnome/apps/Settings/Peripherals/Conduits
 @dirrm lib/gnome-pilot/conduits
 @dirrm lib/gnome-pilot
 @dirrm include/libgpilotdCM
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index 7b9fbd00d9e3..67b9f2bf6427 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepilot
-PORTVERSION=	0.1.51
+PORTVERSION=	0.1.52
 CATEGORIES=	palm comms gnome
 MASTER_SITES=	http://www.gnome.org/gnome-pilot/download/
 DISTNAME=	gnome-pilot-${PORTVERSION}
diff --git a/palm/gnomepilot2/distinfo b/palm/gnomepilot2/distinfo
index 4e85d0289ab2..e5d3246148d5 100644
--- a/palm/gnomepilot2/distinfo
+++ b/palm/gnomepilot2/distinfo
@@ -1 +1 @@
-MD5 (gnome-pilot-0.1.51.tar.gz) = 90c1a2e46d62e877776cbb23ed4c9bb8
+MD5 (gnome-pilot-0.1.52.tar.gz) = f31268b4c50bf8a6ba2ae352c36d802a
diff --git a/palm/gnomepilot2/files/patch-ai b/palm/gnomepilot2/files/patch-ai
index 36f433be8b66..542aa22a4842 100644
--- a/palm/gnomepilot2/files/patch-ai
+++ b/palm/gnomepilot2/files/patch-ai
@@ -1,6 +1,15 @@
---- conduits/backup/Makefile.in.orig	Wed Apr 19 05:36:22 2000
-+++ conduits/backup/Makefile.in	Fri Apr 21 11:22:12 2000
-@@ -188,7 +188,7 @@
+--- conduits/backup/Makefile.in.orig	Wed May 10 00:03:11 2000
++++ conduits/backup/Makefile.in	Tue May 16 16:47:08 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = backup-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -9,9 +18,18 @@
  libbackup_conduit_la_DEPENDENCIES = 
  libbackup_conduit_la_OBJECTS =  backup_conduit.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/email/Makefile.in.orig	Wed Apr 19 05:36:26 2000
-+++ conduits/email/Makefile.in	Fri Apr 21 11:23:14 2000
-@@ -188,7 +188,7 @@
+--- conduits/email/Makefile.in.orig	Wed May 10 00:03:11 2000
++++ conduits/email/Makefile.in	Tue May 16 16:47:11 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = email-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -20,9 +38,18 @@
  libemail_conduit_la_DEPENDENCIES = 
  libemail_conduit_la_OBJECTS =  email_conduit.lo parsedate.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/expense/Makefile.in.orig	Wed Apr 19 05:36:33 2000
-+++ conduits/expense/Makefile.in	Fri Apr 21 11:23:26 2000
-@@ -188,7 +188,7 @@
+--- conduits/expense/Makefile.in.orig	Wed May 10 00:03:13 2000
++++ conduits/expense/Makefile.in	Tue May 16 16:47:14 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = expense-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -31,9 +58,18 @@
  libexpense_conduit_la_DEPENDENCIES = 
  libexpense_conduit_la_OBJECTS =  expense_conduit.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/file/Makefile.in.orig	Wed Apr 19 05:36:18 2000
-+++ conduits/file/Makefile.in	Fri Apr 21 11:23:36 2000
-@@ -198,7 +198,7 @@
+--- conduits/file/Makefile.in.orig	Wed May 10 00:03:10 2000
++++ conduits/file/Makefile.in	Tue May 16 16:47:17 2000
+@@ -181,7 +181,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = file-conduit-control-applet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -202,7 +202,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
@@ -42,9 +78,18 @@
  libfile_conduit_la_DEPENDENCIES = 
  libfile_conduit_la_OBJECTS =  file_conduit.lo
  PROGRAMS =  $(bin_PROGRAMS)
---- conduits/memo_file/Makefile.in.orig	Wed Apr 19 05:36:29 2000
-+++ conduits/memo_file/Makefile.in	Fri Apr 21 11:23:50 2000
-@@ -188,7 +188,7 @@
+--- conduits/memo_file/Makefile.in.orig	Wed May 10 00:03:12 2000
++++ conduits/memo_file/Makefile.in	Tue May 16 16:47:20 2000
+@@ -176,7 +176,7 @@
+ ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits
+ ccenterConduits_DATA = memo_file_capplet.desktop
+ 
+-paneldir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits
++paneldir = $(datadir)/apps/Settings/Peripherals/Conduits
+ panel_DATA = $(ccenterConduits_DATA)
+ 
+ Conduitdir = $(datadir)/gnome-pilot/conduits/
+@@ -192,7 +192,7 @@
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  LIBS = @LIBS@
diff --git a/palm/gnomepilot2/pkg-plist b/palm/gnomepilot2/pkg-plist
index 7ec5cdcbf528..84458afc3168 100644
--- a/palm/gnomepilot2/pkg-plist
+++ b/palm/gnomepilot2/pkg-plist
@@ -45,15 +45,21 @@ lib/libgpilotdconduit.so
 lib/libgpilotdconduit.so.0
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/gnome/apps/Settings/Peripherals/Conduits/.directory
+share/gnome/apps/Settings/Peripherals/Conduits/backup-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/email-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/expense-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/file-conduit-control-applet.desktop
+share/gnome/apps/Settings/Peripherals/Conduits/memo_file_capplet.desktop
+share/gnome/apps/Settings/Peripherals/gpilotd-control-applet.desktop
 share/gnome/applets/Utility/pilot_applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/.directory
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/.directory
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/backup-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/email-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/expense-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/file-conduit-control-applet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/Conduits/memo_file_capplet.desktop
-share/gnome/control-center/Peripherals/PalmPilot/gpilotd-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/.directory
+share/gnome/control-center/Peripherals/Conduits/backup-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/email-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/expense-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/file-conduit-control-applet.desktop
+share/gnome/control-center/Peripherals/Conduits/memo_file_capplet.desktop
+share/gnome/control-center/Peripherals/gpilotd-control-applet.desktop
 share/gnome/gnome-pilot/conduits/backup.conduit
 share/gnome/gnome-pilot/conduits/expense.conduit
 share/gnome/gnome-pilot/conduits/file.conduit
@@ -88,8 +94,8 @@ share/locale/uk/LC_MESSAGES/gnome-pilot.mo
 @dirrm share/gnome/gnome-pilot/glade
 @dirrm share/gnome/gnome-pilot/conduits
 @dirrm share/gnome/gnome-pilot
-@dirrm share/gnome/control-center/Peripherals/PalmPilot/Conduits
-@dirrm share/gnome/control-center/Peripherals/PalmPilot
+@dirrm share/gnome/control-center/Peripherals/Conduits
+@dirrm share/gnome/apps/Settings/Peripherals/Conduits
 @dirrm lib/gnome-pilot/conduits
 @dirrm lib/gnome-pilot
 @dirrm include/libgpilotdCM