* Upstream updates:

  * Mono build fixes.
  * Mono metadata file cleanups.

4 files changed, 42 insertions, 3 deletions

diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 87f1e5a..fe56158 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -13,8 +13,9 @@ ASSEMBLY = appindicator-sharp.dll
 TARGET = $(ASSEMBLY) $(ASSEMBLY).config
 assemblydir = $(libdir)/appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(RAW_API) $(TEST)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(ASSEMBLY_NAME).snk $(API) $(RAW_API) $(TEST)
 DISTCLEANFILES = $(ASSEMBLY).config
+TEST_SOURCES = TestIndicator.cs
 EXTRA_DIST = \
 	$(RAW_API) \
 	$(METADATA) \
@@ -23,7 +24,7 @@ EXTRA_DIST = \
 	app-indicator.sources.xml \
 	$(TEST_SOURCES)
 
-TEST_SOURCES = TestIndicator.cs
+GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"
 
 references = $(GTK_SHARP_LIBS)
 test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY)
@@ -49,7 +50,16 @@ generated-stamp: $(API)
 
 $(ASSEMBLY): generated-stamp
 	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES)
+	$(SN) -k $(ASSEMBLY_NAME).snk
+	$(CSC) $(CSFLAGS) -keyfile:$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES)
+
+install-data-local:
+	echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll  -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib";  \
+            $(GACUTIL) -i $(ASSEMBLY_NAME).dll  -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
+
+uninstall-local:
+	echo "$(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
+            $(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
 
 $(TEST): $(ASSEMBLY) $(TEST_SOURCES)
 	$(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES)
diff --git a/bindings/mono/libappindicator-api.metadata b/bindings/mono/libappindicator-api.metadata
index ad0ebc0..f019f0a 100644
--- a/bindings/mono/libappindicator-api.metadata
+++ b/bindings/mono/libappindicator-api.metadata
@@ -7,11 +7,25 @@
 	<attr path="/api/namespace/object[@cname='AppIndicator']/signal[@field_name='new_icon']" name="name">NewIcon</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ID_S']" name="name">ID</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="name">Category</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CATEGORY_S']" name="type">AppIndicatorCategory</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="name">Status</attr>
+	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_STATUS_S']" name="type">AppIndicatorStatus</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ICON_NAME_S']" name="name">IconName</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_ATTENTION_ICON_NAME_S']" name="name">AttentionIconName</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_MENU_S']" name="name">Menu</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_MENU_S']" name="type">GtkMenu*</attr>
 	<attr path="/api/namespace/object[@cname='AppIndicator']/property[@cname='PROP_CONNECTED_S']" name="name">Connected</attr>
         <attr path="/api/namespace/object[@cname='AppIndicator']/method[@name='SetMenu']" name="name">SetMenu</attr>
+        
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_id']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_status']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_icon']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_category']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_get_attention_icon']" />
+        
+	<remove-node path="/api/namespace/object/method[@cname='app_indicator_set_id']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_status']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_icon']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_category']" />
+        <remove-node path="/api/namespace/object/method[@cname='app_indicator_set_attention_icon']" />        
 </metadata>
diff --git a/configure.ac b/configure.ac
index 1ff33d8..114b42b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,8 +76,20 @@ if test "x$CSC" = "xno" ; then
    AC_MSG_ERROR([No Mono compiler found.])
 fi
 
+AC_PATH_PROG(GACUTIL, gacutil, no)
+if test "x$GACUTIL" = "xno" ; then
+   AC_MSG_ERROR([No gacutil tool found])
+fi
+
+AC_PATH_PROG(SN, sn, no)
+if test "x$SN" = "xno" ; then
+   AC_MSG_ERROR([No sn tool found])
+fi
+
 AC_SUBST(RUNTIME)
 AC_SUBST(CSC)
+AC_SUBST(GACUTIL)
+AC_SUBST(SN)
 AC_SUBST(LIB_PREFIX)
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(GENERATED_SOURCES)
diff --git a/debian/changelog b/debian/changelog
index b3451a4..06752c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 indicator-application (0.0.4-0ubuntu3~ppa2) UNRELEASED; urgency=low
 
+  * Upstream updates:
+    * Mono build fixes.
+    * Mono metadata file cleanups.
   * debian/control: Adding a build-dep on nunit
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 17 Dec 2009 08:33:58 -0600