GNOME.org
 

[Setup-tool-hackers] .desktop file patch

Yay! Thrilled to see XST getting ported to GNOME2. We need to get this
baby into GNOME 2.2 :-)

This patch adds "Categories=" lines to all the desktop files, and
changes the install path (in the common makefile) to the correct
location for GNOME2 control center.

Commit?

-seth


? xst_patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/ChangeLog,v
retrieving revision 1.175
diff -u -p -r1.175 ChangeLog
--- ChangeLog	2002/02/10 21:09:48	1.175
+++ ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,8 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+        * Install .desktop files into the correct location
+	  and add vfolder keywords.
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: configure.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/configure.in,v
retrieving revision 1.133
diff -u -p -r1.133 configure.in
--- configure.in	2002/02/11 05:10:48	1.133
+++ configure.in	2002/02/11 23:08:29
@@ -114,7 +114,7 @@ if test "x${prefix}" = "xNONE"; then
   AC_DEFINE_UNQUOTED(ETSPECS_DIR,"${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/etspecs")
   etspecsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/etspecs"
   AC_DEFINE_UNQUOTED(FRONTEND_DIR,"${ac_default_prefix}/${BINDIRNAME}")
-  AC_DEFINE_UNQUOTED(DESKTOP_DATA_DIR,"${ac_default_prefix}/${DATADIRNAME}/control-center/capplets/System")
+  AC_DEFINE_UNQUOTED(DESKTOP_DATA_DIR,"${ac_default_prefix}/${DATADIRNAME}/control-center-2/capplets")
 else
   AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps")
   pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
@@ -123,7 +123,7 @@ else
   AC_DEFINE_UNQUOTED(ETSPECS_DIR,"${prefix}/${DATADIRNAME}/${PACKAGE}/etspecs")
   etspecsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/etspecs"
   AC_DEFINE_UNQUOTED(FRONTEND_DIR,"${prefix}/${BINDIRNAME}")
-  AC_DEFINE_UNQUOTED(DESKTOP_DATA_DIR,"${prefix}/${DATADIRNAME}/control-center/capplets/System")
+  AC_DEFINE_UNQUOTED(DESKTOP_DATA_DIR,"${prefix}/${DATADIRNAME}/control-center-2/capplets")
 fi
 
 AC_SUBST(scriptsdir)
Index: src/boot/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/boot/ChangeLog,v
retrieving revision 1.56
diff -u -p -r1.56 ChangeLog
--- src/boot/ChangeLog	2002/02/10 21:10:21	1.56
+++ src/boot/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* boot.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/boot/boot.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/boot/boot.desktop.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 boot.desktop.in.in
--- src/boot/boot.desktop.in.in	2001/06/01 20:14:23	1.2
+++ src/boot/boot.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=boot-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System;
\ No newline at end of file
Index: src/common/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/common/ChangeLog,v
retrieving revision 1.178
diff -u -p -r1.178 ChangeLog
--- src/common/ChangeLog	2002/02/11 22:05:59	1.178
+++ src/common/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* CommonMakefile:
+
 2002-02-11  Kenneth Rohde Christiansen  <kenneth@gnu.org>
 
 	* xst-utils.c: Port warning splash to GNOME 2.0
Index: src/common/CommonMakefile
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/common/CommonMakefile,v
retrieving revision 1.5
diff -u -p -r1.5 CommonMakefile
--- src/common/CommonMakefile	2002/02/10 19:45:31	1.5
+++ src/common/CommonMakefile	2002/02/11 23:08:29
@@ -9,8 +9,8 @@ $(desktop): %.desktop: %.desktop.in
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/System
 	$(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/gnome/apps/Settings/System/$(desktop)
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/System
-	$(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/System/$(desktop)
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center-2/capplets
+	$(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center-2/capplets/$(desktop)
 
 install-data-am: install-etspecsDATA install-data-local
 
Index: src/dhcpd/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/dhcpd/ChangeLog,v
retrieving revision 1.5
diff -u -p -r1.5 ChangeLog
--- src/dhcpd/ChangeLog	2002/02/10 21:10:24	1.5
+++ src/dhcpd/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* dhcpd.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/dhcpd/dhcpd.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/dhcpd/dhcpd.desktop.in.in,v
retrieving revision 1.1
diff -u -p -r1.1 dhcpd.desktop.in.in
--- src/dhcpd/dhcpd.desktop.in.in	2002/01/06 23:20:01	1.1
+++ src/dhcpd/dhcpd.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=internetsharing-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
Index: src/disks/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/disks/ChangeLog,v
retrieving revision 1.23
diff -u -p -r1.23 ChangeLog
--- src/disks/ChangeLog	2002/02/10 21:10:25	1.23
+++ src/disks/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* disks.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/disks/disks.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/disks/disks.desktop.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 disks.desktop.in.in
--- src/disks/disks.desktop.in.in	2001/05/30 01:47:33	1.2
+++ src/disks/disks.desktop.in.in	2002/02/11 23:08:29
@@ -5,4 +5,4 @@ Exec=disks-admin
 Icon=
 Terminal=0
 Type=Application
-
+Categories=Application;Settings;System
Index: src/display/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/display/ChangeLog,v
retrieving revision 1.37
diff -u -p -r1.37 ChangeLog
--- src/display/ChangeLog	2002/02/11 22:06:03	1.37
+++ src/display/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* display.desktop.in.in:
+
 2002-02-11  Kenneth Rohde Christiansen  <kenneth@gnu.org>
 
 	* Port to the GNOME 2.0 platform
Index: src/display/display.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/display/display.desktop.in.in,v
retrieving revision 1.3
diff -u -p -r1.3 display.desktop.in.in
--- src/display/display.desktop.in.in	2001/07/27 11:28:39	1.3
+++ src/display/display.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=display-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
Index: src/font/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/font/ChangeLog,v
retrieving revision 1.9
diff -u -p -r1.9 ChangeLog
--- src/font/ChangeLog	2002/02/10 21:10:29	1.9
+++ src/font/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* font.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/font/font.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/font/font.desktop.in.in,v
retrieving revision 1.1
diff -u -p -r1.1 font.desktop.in.in
--- src/font/font.desktop.in.in	2001/11/24 09:27:23	1.1
+++ src/font/font.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=font-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
Index: src/internetsharing/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/internetsharing/ChangeLog,v
retrieving revision 1.35
diff -u -p -r1.35 ChangeLog
--- src/internetsharing/ChangeLog	2002/02/10 21:10:30	1.35
+++ src/internetsharing/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* internetsharing.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/internetsharing/internetsharing.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/internetsharing/internetsharing.desktop.in.in,v
retrieving revision 1.3
diff -u -p -r1.3 internetsharing.desktop.in.in
--- src/internetsharing/internetsharing.desktop.in.in	2001/06/01 20:14:24	1.3
+++ src/internetsharing/internetsharing.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=internetsharing-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
Index: src/location-manager/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/location-manager/ChangeLog,v
retrieving revision 1.31
diff -u -p -r1.31 ChangeLog
--- src/location-manager/ChangeLog	2002/02/10 21:10:32	1.31
+++ src/location-manager/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* location-manager.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/location-manager/location-manager.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/location-manager/location-manager.desktop.in.in,v
retrieving revision 1.1
diff -u -p -r1.1 location-manager.desktop.in.in
--- src/location-manager/location-manager.desktop.in.in	2001/08/01 19:11:26	1.1
+++ src/location-manager/location-manager.desktop.in.in	2002/02/11 23:08:29
@@ -4,3 +4,4 @@ _Comment=Sets up configuration profiles
 Exec=location-manager
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
Index: src/memory/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/memory/ChangeLog,v
retrieving revision 1.25
diff -u -p -r1.25 ChangeLog
--- src/memory/ChangeLog	2002/02/10 21:10:34	1.25
+++ src/memory/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* memory.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/memory/memory.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/memory/memory.desktop.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 memory.desktop.in.in
--- src/memory/memory.desktop.in.in	2001/06/01 20:14:25	1.2
+++ src/memory/memory.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=memory-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
Index: src/network/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/network/ChangeLog,v
retrieving revision 1.137
diff -u -p -r1.137 ChangeLog
--- src/network/ChangeLog	2002/02/10 22:12:06	1.137
+++ src/network/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* network.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/network/network.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/network/network.desktop.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 network.desktop.in.in
--- src/network/network.desktop.in.in	2001/06/01 20:14:25	1.2
+++ src/network/network.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=network-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
Index: src/print/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/print/ChangeLog,v
retrieving revision 1.22
diff -u -p -r1.22 ChangeLog
--- src/print/ChangeLog	2002/02/10 22:12:10	1.22
+++ src/print/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* print.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/print/print.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/print/print.desktop.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 print.desktop.in.in
--- src/print/print.desktop.in.in	2001/06/01 20:14:26	1.2
+++ src/print/print.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=print-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
Index: src/shares/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/shares/ChangeLog,v
retrieving revision 1.92
diff -u -p -r1.92 ChangeLog
--- src/shares/ChangeLog	2002/02/10 22:12:11	1.92
+++ src/shares/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* shares.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/shares/shares.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/shares/shares.desktop.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 shares.desktop.in.in
--- src/shares/shares.desktop.in.in	2001/05/29 01:49:34	1.2
+++ src/shares/shares.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=shares-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
Index: src/time/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/time/ChangeLog,v
retrieving revision 1.48
diff -u -p -r1.48 ChangeLog
--- src/time/ChangeLog	2002/02/10 22:12:14	1.48
+++ src/time/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* time.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/time/time.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/time/time.desktop.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 time.desktop.in.in
--- src/time/time.desktop.in.in	2001/06/01 20:14:27	1.2
+++ src/time/time.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=time-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
Index: src/time/e-map/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/time/e-map/ChangeLog,v
retrieving revision 1.5
diff -u -p -r1.5 ChangeLog
--- src/time/e-map/ChangeLog	2002/02/10 22:12:17	1.5
+++ src/time/e-map/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* e-map.h:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/time/e-map/e-map.h
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/time/e-map/e-map.h,v
retrieving revision 1.7
diff -u -p -r1.7 e-map.h
--- src/time/e-map/e-map.h	2001/03/02 01:31:24	1.7
+++ src/time/e-map/e-map.h	2002/02/11 23:08:29
@@ -23,7 +23,6 @@
 #ifndef E_MAP_H
 #define E_MAP_H
 
-#include <libgnome/gnome-defs.h>
 #include <gtk/gtkwidget.h>
 
 #define TYPE_E_MAP            (e_map_get_type ())
Index: src/users/ChangeLog
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/users/ChangeLog,v
retrieving revision 1.142
diff -u -p -r1.142 ChangeLog
--- src/users/ChangeLog	2002/02/10 22:12:20	1.142
+++ src/users/ChangeLog	2002/02/11 23:08:29
@@ -1,3 +1,9 @@
+2002-02-11  Seth Nickell  <snickell@stanford.edu>
+
+	reviewed by: <delete if not using a buddy>
+
+	* users.desktop.in.in:
+
 2002-02-10  Chema Celorio  <chema@celorio.com>
 
 	* Port to the GNOME 2.0 platform
Index: src/users/users.desktop.in.in
===================================================================
RCS file: /cvs/gnome/ximian-setup-tools/src/users/users.desktop.in.in,v
retrieving revision 1.2
diff -u -p -r1.2 users.desktop.in.in
--- src/users/users.desktop.in.in	2001/06/01 20:14:28	1.2
+++ src/users/users.desktop.in.in	2002/02/11 23:08:29
@@ -5,3 +5,4 @@ Exec=users-admin
 Icon=
 Terminal=0
 Type=Application
+Categories=Application;Settings;System
\ No newline at end of file
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]