Merging patch to add assembly information to Mono binding (LP: #547195)

4 files changed, 46 insertions, 7 deletions

diff --git a/bindings/mono/AssemblyInfo.cs b/bindings/mono/AssemblyInfo.cs
new file mode 100644
index 0000000..269981a
--- /dev/null
+++ b/bindings/mono/AssemblyInfo.cs
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Cody Russell <cody.russell@canonical.com>
+ */
+
+using System.Reflection;
+
+[assembly: AssemblyTitle ("Application Indicators")]
+[assembly: AssemblyDescription ("Ubuntu Application Indicators")]
+[assembly: AssemblyConfiguration ("")]
+[assembly: AssemblyCompany ("Canonical, Ltd.")]
+[assembly: AssemblyProduct ("Ubuntu")]
+[assembly: AssemblyCopyright ("© 2010 Canonical, Ltd.")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyCulture ("")]
+[assembly: AssemblyVersion ("0.1")]
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 455a23e..e573c9b 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -76,7 +76,7 @@ generated-stamp: $(API) $(build_customs)
 
 $(ASSEMBLY): generated-stamp
 	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES)
+	$(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
 
 install-data-local:
 	echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll  -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib";  \
diff --git a/debian/changelog b/debian/changelog
index 1c8d572..945aa8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-application (0.0.19-0ubuntu3) UNRELEASED; urgency=low
+
+  * Merging patch to add assembly information to Mono binding (LP: #547195)
+
+ -- Ted Gould <ted@ubuntu.com>  Wed, 14 Apr 2010 11:48:49 -0500
+
 indicator-application (0.0.19-0ubuntu2) lucid; urgency=low
 
   * debian/control:
diff --git a/src/Makefile.am b/src/Makefile.am
index efae713..9f2771e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-CLEANFILES = 
-DISTCLEANFILES = 
-BUILT_SOURCES = 
+CLEANFILES =
+DISTCLEANFILES =
+BUILT_SOURCES =
 EXTRA_DIST = libappindicator/appindicator-0.1.pc.in
 
 include $(top_srcdir)/Makefile.am.enum
@@ -21,7 +21,8 @@ libapplication_la_CFLAGS = $(INDICATOR_CFLAGS) \
 	-Wl,-Bsymbolic-functions \
 	-Wl,-z,defs \
 	-Wl,--as-needed \
-	-Werror
+	-Werror \
+	-DG_LOG_DOMAIN=\"Indicator-Application\"
 libapplication_la_LIBADD = $(INDICATOR_LIBS)
 libapplication_la_LDFLAGS = -module -avoid-version
 
@@ -48,7 +49,8 @@ indicator_application_service_SOURCES = \
 	notification-watcher-server.h
 indicator_application_service_CFLAGS = \
 	$(INDICATOR_CFLAGS) \
-	-Wall -Werror
+	-Wall -Werror \
+	-DG_LOG_DOMAIN=\"indicator-application-service\"
 indicator_application_service_LDADD = \
 	$(INDICATOR_LIBS)
 
@@ -104,7 +106,8 @@ libappindicator_la_LDFLAGS = \
 
 libappindicator_la_CFLAGS = \
 	$(INDICATOR_CFLAGS) \
-	-Wall -Werror
+	-Wall -Werror \
+	-DG_LOG_DOMAIN=\"libappindicator\"
 
 libappindicator_la_LIBADD = \
 	$(INDICATOR_LIBS)