Merge libosso and hildon in maemo

svn path=/trunk/maemo-sharp/; revision=57814

AUTHORS

@@ -1,4 +1,4 @@
-Everaldo Canuto <everaldo@simios.org>
+Everaldo Canuto <everaldo@bananacrew.com>
 
 based on nhildon from:
     Alp Toker  <alp@atoker.com>

ChangeLog

@@ -1,7 +1,11 @@
-2006-02-23  Everaldo Canuto  <everaldo@simios.org>
+2006-03-11  Everaldo Canuto  <everaldo@bananacrew.com>
+
+	* Merge libosso and hildon into only one assembly 'maemo'.
+
+2006-02-23  Everaldo Canuto  <everaldo@bananacrew.com>
 
 	* COPYING: Change license to LGPL.
 
-2006-02-22  Everaldo Canuto  <everaldo@simios.org>
+2006-02-22  Everaldo Canuto  <everaldo@bananacrew.com>
 
 	Initial Import.

maemo/Osso.cs

@@ -2,7 +2,7 @@
 // Maemo# - Maemo bindings for Mono
 //
 // Author: 
-//   Everaldo Canuto <everaldo@simios.org>
+//   Everaldo Canuto <everaldo@bananacrew.com>
 //
 // (C) 2005 Everaldo Canuto
 //
@@ -30,7 +30,7 @@ using System;
 using System.Collections;
 using System.Runtime.InteropServices;
 
-namespace LibOSSO
+namespace Maemo
 {
 	public class Osso
 	{

samples/Makefile.am

@@ -7,7 +7,7 @@ DEBUGS = $(addsuffix .mdb, $(TARGETS))
 
 CLEANFILES = $(TARGETS) $(DEBUGS)
 
-references=-r:../hildon/hildon-sharp.dll -pkg:gtk-sharp-2.0
+references=-r:../hildon/hildon-sharp.dll -r:../libosso/libosso-sharp.dll -pkg:gtk-sharp-2.0
 
 all: $(TARGETS)
 

sources/Makefile.am

@@ -6,12 +6,12 @@ SOURCE_DIRS = \
 	hildon-libs \
 	hildon-fm
 
-EXTRA_DIST = hildon-sharp-sources.xml
+EXTRA_DIST = maemo-sharp-sources.xml
 
 api:
 	PERLLIB=$(GTKSHARP_PREFIX)/share/perl5 \
 	PATH=$(GTKSHARP_PREFIX)/bin:$$PATH \
-	gapi2-parser hildon-sharp-sources.xml
+	gapi2-parser maemo-sharp-sources.xml
 
 get-sources:
 	@for i in $(SOURCE_DIRS); do                                              \

sources/maemo-sharp-sources.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <gapi-parser-input>
-  <api filename="../hildon/hildon-api.raw">
+  <api filename="../maemo/maemo-api.raw">
     <library name="hildon-lgpl">
-      <namespace name="Hildon">
+      <namespace name="Maemo">
         <dir>hildon-lgpl/hildon-lgpl</dir>
       </namespace>
     </library>
     <library name="hildonwidgets">
-      <namespace name="Hildon">
+      <namespace name="Maemo">
         <dir>hildon-libs/hildon-widgets</dir>
       </namespace>
     </library>
     <library name="hildonfm">
-      <namespace name="Hildon">
+      <namespace name="Maemo">
         <dir>hildon-fm/hildon-fm</dir>
       </namespace>
     </library>