* New upstream release.

  * Fix include with Dbusmenu 0.5.90
  * Fix GTK3 include paths in pkgconfig file (LP: #869373)
  * Add title property (LP: #923971)
  * Don't specify pyglib-2.0-python2.6 in LDFLAGS
  * fix fallback icon of the GtkStatusIcon (LP: #820080)

1 files changed, 23 insertions, 34 deletions

diff --git a/bindings/mono/Makefile.in b/bindings/mono/Makefile.in
index b29add9..63e875f 100644
--- a/bindings/mono/Makefile.in
+++ b/bindings/mono/Makefile.in
@@ -34,6 +34,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@BUILD_MONO_TEST_TRUE@am__append_1 = $(TEST) 
+@BUILD_MONO_TEST_TRUE@am__append_2 = $(TEST_SOURCES)
 subdir = bindings/mono
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/appindicator-sharp-0.1.pc.in \
@@ -202,6 +204,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MONO_DEPENDENCY_CFLAGS = @MONO_DEPENDENCY_CFLAGS@
 MONO_DEPENDENCY_LIBS = @MONO_DEPENDENCY_LIBS@
+MONO_NUNIT_CFLAGS = @MONO_NUNIT_CFLAGS@
+MONO_NUNIT_LIBS = @MONO_NUNIT_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 NUNIT_CFLAGS = @NUNIT_CFLAGS@
@@ -299,7 +303,7 @@ top_srcdir = @top_srcdir@
 SUBDIRS = . examples
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = appindicator-sharp-0.1.pc
-TEST = AppIndicator.Test.dll
+@BUILD_MONO_TEST_TRUE@TEST = AppIndicator.Test.dll
 API = libappindicator-api.xml
 MIDDLE_API = libappindicator-api.middle
 RAW_API = libappindicator-api.raw
@@ -325,40 +329,21 @@ TARGET = \
 
 assemblydir = $(libdir)/cli/appindicator-sharp-0.1
 assembly_DATA = $(TARGET)
-CLEANFILES = \
-	$(ASSEMBLY) \
-	$(ASSEMBLY).mdb \
-	generated-stamp \
-	generated/*.cs \
-	$(API) \
-	$(MIDDLE_API) \
-	$(RAW_API) \
-	$(TEST) \
-	$(DLLPOLICY) \
-	$(DLLPOLICY1) \
-	$(WRAPPER_FREE_BINDING) \
-	$(POLICY).config \
-	$(POLICY1).config
-
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp \
+	generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(DLLPOLICY) \
+	$(DLLPOLICY1) $(WRAPPER_FREE_BINDING) $(POLICY).config \
+	$(POLICY1).config $(am__append_1)
 DISTCLEANFILES = $(ASSEMBLY).config
-TEST_SOURCES = TestIndicator.cs
+@BUILD_MONO_TEST_TRUE@TEST_SOURCES = TestIndicator.cs
 customs = ApplicationIndicator.custom
-EXTRA_DIST = \
-	AssemblyInfo.cs \
-	$(RAW_API)				\
-	$(METADATA)				\
-	appindicator-sharp-0.1.pc.in		\
-	appindicator-sharp.dll.config.in	\
-	app-indicator.sources.xml		\
-	$(ASSEMBLY_NAME).snk			\
-	$(POLICY).config.in \
-	$(POLICY1).config.in \
-	$(customs)				\
-	$(TEST_SOURCES)
-
+EXTRA_DIST = AssemblyInfo.cs $(RAW_API) $(METADATA) \
+	appindicator-sharp-0.1.pc.in appindicator-sharp.dll.config.in \
+	app-indicator.sources.xml $(ASSEMBLY_NAME).snk \
+	$(POLICY).config.in $(POLICY1).config.in $(customs) \
+	$(am__append_2)
 GACUTIL_FLAGS = -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib
 references = $(GTK_SHARP_LIBS)
-test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY)
+@BUILD_MONO_TEST_TRUE@test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) $(MONO_NUNIT_LIBS) -r:$(ASSEMBLY)
 api_includes = $(GTK_SHARP_CFLAGS)
 build_customs = $(addprefix $(srcdir)/, $(customs))
 all: all-recursive
@@ -777,12 +762,14 @@ $(MIDDLE_API): $(METADATA) $(RAW_API)
 
 $(API): $(MIDDLE_API) Makefile.am
 	sed -e "s|PROP_ID_S|id|" \
+		-e "s|PROP_STATUS_S|Status|" \
 		-e "s|PROP_STATUS_S|status|" \
 		-e "s|PROP_CATEGORY_S|Category|" \
 		-e "s|PROP_CATEGORY_S|category|" \
 		-e "s|PROP_ICON_NAME_S|icon-name|" \
 		-e "s|PROP_ICON_DESC_S|IconDesc|" \
 		-e "s|PROP_ICON_DESC_S|icon-desc|" \
+		-e "s|PROP_ATTENTION_ICON_NAME_S|AttentionIconName|" \
 		-e "s|PROP_ATTENTION_ICON_NAME_S|attention-icon-name|" \
 		-e "s|PROP_ATTENTION_ICON_DESC_S|AttentionIconDesc|" \
 		-e "s|PROP_ATTENTION_ICON_DESC_S|attention-icon-desc|" \
@@ -794,6 +781,8 @@ $(API): $(MIDDLE_API) Makefile.am
 		-e "s|PROP_ORDERING_INDEX_S|ordering-index|" \
 		-e "s|PROP_DBUS_MENU_SERVER_S|DbusMenuServer|" \
 		-e "s|PROP_DBUS_MENU_SERVER_S|dbus-menu-server|" \
+		-e "s|PROP_TITLE_S|Title|" \
+		-e "s|PROP_TITLE_S|title|" \
 		$< > $@
 
 generated-stamp: $(API) $(build_customs)
@@ -819,10 +808,10 @@ uninstall-local:
 	echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)";  \
             $(GACUTIL) -u $(POLICY) $(GACUTIL_FLAGS) || exit 1;
 
-$(TEST): $(ASSEMBLY) $(TEST_SOURCES)
-	$(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES)
+@BUILD_MONO_TEST_TRUE@$(TEST): $(ASSEMBLY) $(TEST_SOURCES)
+@BUILD_MONO_TEST_TRUE@	$(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES)
 
-all: $(TEST)
+@BUILD_MONO_TEST_TRUE@all: $(TEST)
 
 $(POLICY).config: $(POLICY).config.in Makefile
 	sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \