[Monodevelop-patches-list] r2332 - in trunk/MonoDevelop: . Extras/MonoQuery

[Todd Berman <tberman@sevenl.net>]

Author: tberman
Date: 2005-03-12 17:03:26 -0500 (Sat, 12 Mar 2005)
New Revision: 2332

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/Extras/MonoQuery/Makefile.am
   trunk/MonoDevelop/configure.in
   trunk/MonoDevelop/monodevelop.desktop
Log:
Push 0.6


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2005-03-11 22:56:50 UTC (rev 2331)
+++ trunk/MonoDevelop/ChangeLog	2005-03-12 22:03:26 UTC (rev 2332)
@@ -1,3 +1,7 @@
+2005-03-12  Todd Berman  <tberman at off.net>
+
+	* configure.in: push/branch 0.6
+
 2005-02-28  John Luke  <john.luke at gmail.com>
 
 	* monodevelop.in: use /bin/sh and exec instead

Modified: trunk/MonoDevelop/Extras/MonoQuery/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Makefile.am	2005-03-11 22:56:50 UTC (rev 2331)
+++ trunk/MonoDevelop/Extras/MonoQuery/Makefile.am	2005-03-12 22:03:26 UTC (rev 2332)
@@ -73,7 +73,7 @@
 
 CLEANFILES = $(DLL) $(DLL).mdb $(ADDIN_BUILD)/$(ADDIN)
 
-EXTRA_DIST = $(FILES) $(ADDIN)
+EXTRA_DIST = $(FILES) $(ADDIN) $(SQLITE_FILES)
 
 monoquerydir = $(libdir)/monodevelop/AddIns/MonoQuery
 monoquery_DATA = $(DLL) $(ADDIN_BUILD)/$(ADDIN)

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2005-03-11 22:56:50 UTC (rev 2331)
+++ trunk/MonoDevelop/configure.in	2005-03-12 22:03:26 UTC (rev 2332)
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop], 0.5.99, [monodevelop-list at lists.ximian.com])
+AC_INIT([monodevelop], 0.6, [monodevelop-list at lists.ximian.com])
 AC_PREREQ(2.53)
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
@@ -10,7 +10,7 @@
 
 AM_PATH_GLIB_2_0
 
-ASSEMBLY_VERSION=0.5.99.0
+ASSEMBLY_VERSION=0.6.0.0
 
 AC_PATH_PROG(MONO, mono)
 AC_PATH_PROG(MCS, mcs)
@@ -32,6 +32,9 @@
 AC_PATH_PROG(UPDATE_MIME_DB, update-mime-database, no)
 AC_SUBST(UPDATE_MIME_DB)
 
+AC_PATH_PROG(UPDATE_DESKTOP_DB, update-desktop-database, no)
+AC_SUBST(UPDATE_DESKTOP_DB)
+
 dnl Find pkg-config
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
@@ -73,7 +76,7 @@
 
 dnl hard dependencies
 GTKSHARP_REQUIRED_VERSION=1.9.2
-GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.6.99
+GTKSOURCEVIEWSHARP_REQUIRED_VERSION=0.7
 GECKOSHARP_REQUIRED_VERSION=0.7
 MONODOC_REQUIRED_VERSION=1.0
 
@@ -89,7 +92,7 @@
 AC_SUBST(GCONF_SHARP_LIBS)
 PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
 AC_SUBST(GTKHTML_SHARP_LIBS)
-PKG_CHECK_MODULES(GTKSOURCEVIEW_SHARP, gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION)
+PKG_CHECK_MODULES(GTKSOURCEVIEW_SHARP, gtksourceview-sharp-2.0 >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION)
 AC_SUBST(GTKSOURCEVIEW_SHARP_LIBS)
 PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION)
 AC_SUBST(GECKO_SHARP_LIBS)
@@ -163,6 +166,11 @@
     enable_update_mimedb=yes)
  AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
 
+AC_ARG_ENABLE(update-desktopdb,
+   AC_HELP_STRING([--disable-update-desktopdb],
+                  [disable the update-desktop-database after install [default=np]]),,
+                  enable_update_desktopdb=yes)
+   AM_CONDITIONAL(ENABLE_UPDATE_DESKTOPDB, test x$enable_update_desktopdb = xyes)
 
 dnl MonoQuery
 PKG_CHECK_MODULES(MONOQUERY_DEPENDENCIES_SQLITE,mono >= 1.1.2.99, enable_monoquery_sqlite=yes, enable_monoquery_sqlite=no)

Modified: trunk/MonoDevelop/monodevelop.desktop
===================================================================
--- trunk/MonoDevelop/monodevelop.desktop	2005-03-11 22:56:50 UTC (rev 2331)
+++ trunk/MonoDevelop/monodevelop.desktop	2005-03-12 22:03:26 UTC (rev 2332)
@@ -10,6 +10,7 @@
 StartupNotify=true
 Terminal=false
 Type=Application
+MimeType=text/x-csharp;application/x-mds;application/x-mdp;application/x-cmbx;application/x-prjx;
 Categories=Application;Development;
 X-GNOME-Bugzilla-Bugzilla=Ximian
 X-GNOME-Bugzilla-Product=MonoDevelop