[Monodevelop-patches-list] r2124 - trunk/MonoDevelop

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2005-01-11 20:31:03 -0500 (Tue, 11 Jan 2005)
New Revision: 2124

Removed:
   trunk/MonoDevelop/monodevelop.applications
   trunk/MonoDevelop/monodevelop.keys
   trunk/MonoDevelop/monodevelop.mime
Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/Makefile.am
   trunk/MonoDevelop/configure.in
Log:
2005-01-11  John Luke  <john.luke at gmail.com>

        * monodevelop.applications:
        * monodevelop.keys:
        * monodevelop.mime: kill old style mime stuff, since we depend
        on a newer gnome via gtk#2
        * configure.in: AC_SUBST the path of update_mime_database and
        rename the variable to UPDATE_MIME_DB
        * Makefile.am: remove old mime stuff, use UPDATE_MIME_DB
        variable from configure



Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2005-01-12 01:07:21 UTC (rev 2123)
+++ trunk/MonoDevelop/ChangeLog	2005-01-12 01:31:03 UTC (rev 2124)
@@ -0,0 +1,11 @@
+2005-01-11  John Luke  <john.luke at gmail.com>
+
+	* monodevelop.applications:
+	* monodevelop.keys:
+	* monodevelop.mime: kill old style mime stuff, since we depend
+	on a newer gnome via gtk#2
+	* configure.in: AC_SUBST the path of update_mime_database and
+	rename the variable to UPDATE_MIME_DB
+	* Makefile.am: remove old mime stuff, use UPDATE_MIME_DB
+	variable from configure
+

Modified: trunk/MonoDevelop/Makefile.am
===================================================================
--- trunk/MonoDevelop/Makefile.am	2005-01-12 01:07:21 UTC (rev 2123)
+++ trunk/MonoDevelop/Makefile.am	2005-01-12 01:31:03 UTC (rev 2124)
@@ -14,35 +14,16 @@
 pixmapdir = $(gnome_data)/pixmaps
 pixmap_DATA = monodevelop.png
 
-if ENABLE_XDGMIME
-
 # need to respect $XDG_DATA_DIR probably
 xdgmimedir = $(gnome_data)/mime/packages
 xdgmime_DATA = monodevelop.xml
 
 install-data-hook:
-if ENABLE_UPDATE_MIMEDB
-	update-mime-database $(gnome_data)/mime
-endif
+	$(UPDATE_MIME_DB) $(gnome_data)/mime
 
 uninstall-hook:
-if ENABLE_UPDATE_MIMEDB
-	update-mime-database $(gnome_data)/mime
-endif
-else
+	$(UPDATE_MIME_DB) $(gnome_data)/mime
 
-install-data-hook:
-
-uninstall-hook:
-
-mimeinfodir = $(gnome_data)/mime-info
-mimeinfo_DATA = monodevelop.mime monodevelop.keys
-
-applicationdir = $(gnome_data)/application-registry
-application_DATA = monodevelop.applications
-
-endif
-
 run: runmd
 
 runmd: $(PROGRAM)
@@ -61,7 +42,6 @@
 
 # we can't use the variables that are conditionally defined
 EXTRA_DIST = $(bin_SCRIPTS) $(desktop_DATA) $(pixmap_DATA) \
-	monodevelop.mime monodevelop.keys monodevelop.applications \
 	monodevelop.xml mkinstalldirs intltool-extract.in \
 	intltool-merge.in intltool-update.in
 

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2005-01-12 01:07:21 UTC (rev 2123)
+++ trunk/MonoDevelop/configure.in	2005-01-12 01:31:03 UTC (rev 2124)
@@ -14,7 +14,6 @@
 
 AC_PATH_PROG(MONO, mono)
 AC_PATH_PROG(MCS, mcs)
-AC_PATH_PROG(XDGMIME, update-mime-database, no)
 
 if test "x$MONO" = "x" ; then
   AC_PATH_PROG(MINT, mint)
@@ -29,6 +28,10 @@
 AC_SUBST(PATH)
 AC_SUBST(LD_LIBRARY_PATH)
 
+dnl to add MD's mimetypes
+AC_PATH_PROG(UPDATE_MIME_DB, update-mime-database, no)
+AC_SUBST(UPDATE_MIME_DB)
+
 dnl Find pkg-config
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then

Deleted: trunk/MonoDevelop/monodevelop.applications
===================================================================
--- trunk/MonoDevelop/monodevelop.applications	2005-01-12 01:07:21 UTC (rev 2123)
+++ trunk/MonoDevelop/monodevelop.applications	2005-01-12 01:31:03 UTC (rev 2124)
@@ -1,8 +0,0 @@
-monodevelop
-	command=monodevelop
-	name=MonoDevelop
-	can_open_multiple_files=true
-	expects_uris=false
-	requires_terminal=false
-	mime_types=text/x-csharp,text/x-java,text/x-msil,text/x-nemerle,text/x-vb,application/x-cmbx,application/x-prjx
-	uses_gnomevfs=false

Deleted: trunk/MonoDevelop/monodevelop.keys
===================================================================
--- trunk/MonoDevelop/monodevelop.keys	2005-01-12 01:07:21 UTC (rev 2123)
+++ trunk/MonoDevelop/monodevelop.keys	2005-01-12 01:31:03 UTC (rev 2124)
@@ -1,31 +0,0 @@
-text/x-csharp:
-	open=monodevelop %f
-	edit=monodevelop %f
-	view=monodevelop %f
-
-text/x-java:
-	open=monodevelop %f
-	edit=monodevelop %f
-	view=monodevelop %f
-
-text/x-msil:
-	open=monodevelop %f
-	edit=monodevelop %f
-	view=monodevelop %f
-
-text/x-nemerle:
-	open=monodevelop %f
-	edit=monodevelop %f
-	view=monodevelop %f
-
-text/x-vb:
-	open=monodevelop %f
-	edit=monodevelop %f
-	view=monodevelop %f
-
-application/x-prjx:
-	open=monodevelop %f
-
-application/x-cmbx:
-	open=monodevelop %f
-

Deleted: trunk/MonoDevelop/monodevelop.mime
===================================================================
--- trunk/MonoDevelop/monodevelop.mime	2005-01-12 01:07:21 UTC (rev 2123)
+++ trunk/MonoDevelop/monodevelop.mime	2005-01-12 01:31:03 UTC (rev 2124)
@@ -1,15 +0,0 @@
-application/x-cmbx
-	category=Software Development
-	default_action_type=monodevelop
-	description=MonoDevelop Solution
-	ext: cmbx
-	icon_filename=monodevelop.png
-	short_list_application_ids_for_novice_user_level=monodevelop
-
-application/x-prjx
-	category=Software Development
-	default_action_type=monodevelop
-	description=MonoDevelop Project
-	ext: prjx
-	icon_filename=monodevelop.png
-	short_list_application_ids_for_novice_user_level=monodevelop