[maemo-commits] [maemo-commits] r8853 - in projects/haf/trunk/libossomime: . data libossomime

Thu Dec 21 16:18:05 EET 2006

Author: richard
Date: 2006-12-21 16:18:04 +0200 (Thu, 21 Dec 2006)
New Revision: 8853

Removed:
   projects/haf/trunk/libossomime/data/categories.xml
Modified:
   projects/haf/trunk/libossomime/configure.in
   projects/haf/trunk/libossomime/data/Makefile.am
   projects/haf/trunk/libossomime/libossomime/Makefile.am
Log:
More work on splitting out libossomime.

Modified: projects/haf/trunk/libossomime/configure.in
===================================================================

--- projects/haf/trunk/libossomime/configure.in	2006-12-21 14:05:15 UTC (rev 8852)
+++ projects/haf/trunk/libossomime/configure.in	2006-12-21 14:18:04 UTC (rev 8853)
@@ -46,6 +46,7 @@
 DBUS_REQUIRED=0.60
 GLIB_REQUIRED=2.6.0
 GTK_REQUIRED=2.6.0
+LIBXML_REQUIRED=2.4
 
 dnl =======================================
 dnl libossomime
@@ -89,4 +90,5 @@
         libossomime/Makefile
         tests/Makefile
         data/Makefile
+	docs/Makefile
 ])

Modified: projects/haf/trunk/libossomime/data/Makefile.am
===================================================================
--- projects/haf/trunk/libossomime/data/Makefile.am	2006-12-21 14:05:15 UTC (rev 8852)
+++ projects/haf/trunk/libossomime/data/Makefile.am	2006-12-21 14:18:04 UTC (rev 8853)
@@ -1,19 +1,14 @@
-categoriesdir = $(datadir)/mime/packages
-categories_DATA = categories.xml
-
 defaultsdir = $(datadir)/applications
 defaults_DATA = uri-action-defaults.list
 
-install-data-hook: 
-if ENABLE_UPDATE_CATEGORYDB
-	$(DESTDIR)"$(bindir)/osso-update-category-database" "$(DESTDIR)${datadir}/mime"
-endif
+# This is how apps should install categories files:
+#
+#categoriesdir = $(datadir)/mime/packages
+#categories_DATA = categories.xml
+#
+#install-data-hook: 
+#if ENABLE_UPDATE_CATEGORYDB
+#	$(DESTDIR)"$(bindir)/osso-update-category-database" "$(DESTDIR)${datadir}/mime"
+#endif
 
-#uninstall-hook:
-#	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)${mimedir}/$${media}/"*.xml; done
-#	rm -f "$(DESTDIR)${mimedir}/globs"
-#	rm -f "$(DESTDIR)${mimedir}/magic"
-#	rm -f "$(DESTDIR)${mimedir}/XMLnamespaces"
-
-
-EXTRA_DIST = $(categories_DATA) $(defaults_DATA)
+EXTRA_DIST = $(defaults_DATA)

Deleted: projects/haf/trunk/libossomime/data/categories.xml
===================================================================
--- projects/haf/trunk/libossomime/data/categories.xml	2006-12-21 14:05:15 UTC (rev 8852)
+++ projects/haf/trunk/libossomime/data/categories.xml	2006-12-21 14:18:04 UTC (rev 8853)
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mime-info [
-  <!ELEMENT mime-info (mime-type)+>
-  <!ATTLIST mime-info xmlns CDATA #FIXED "http://www.freedesktop.org/standards/shared-mime-info">
-
-  <!ELEMENT mime-type (comment|glob|magic|root-XML|alias|sub-class-of)*>
-  <!ATTLIST mime-type type CDATA #REQUIRED>
-
-  <!ELEMENT comment (#PCDATA)>
-  <!ATTLIST comment xml:lang CDATA #IMPLIED>
-
-  <!ELEMENT glob EMPTY>
-  <!ATTLIST glob pattern CDATA #REQUIRED>
-
-  <!ELEMENT magic (match)+>
-  <!ATTLIST magic priority CDATA #IMPLIED>
-
-  <!ELEMENT match (match)*>
-  <!ATTLIST match offset CDATA #REQUIRED>
-  <!ATTLIST match type (string|big16|big32|little16|little32|host16|host32|byte) #REQUIRED>
-  <!ATTLIST match value CDATA #REQUIRED>
-  <!ATTLIST match mask CDATA #IMPLIED>
-
-  <!ELEMENT root-XML EMPTY>
-  <!ATTLIST root-XML
-  	namespaceURI CDATA #REQUIRED
-	localName CDATA #REQUIRED>
-
-  <!ELEMENT alias EMPTY>
-  <!ATTLIST alias
-  	type CDATA #REQUIRED>
-
-  <!ELEMENT sub-class-of EMPTY>
-  <!ATTLIST sub-class-of
-  	type CDATA #REQUIRED>
-]>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info" 
-           xmlns:osso="http://nokia.com/osso/mime-categories">
-
-  <mime-type type="application/pdf">
-    <osso:category name="documents"/>
-  </mime-type>
-  <mime-type type="text/plain">
-    <osso:category name="documents"/>
-  </mime-type>
-  <mime-type type="text/html">
-    <osso:category name="documents"/>
-  </mime-type>
-  <mime-type type="text/css">
-    <osso:category name="documents"/>
-  </mime-type>
-  <mime-type type="text/richtext">
-    <osso:category name="documents"/>
-  </mime-type>
-  <mime-type type="text/rdf">
-    <osso:category name="documents"/>
-  </mime-type>
-  <mime-type type="application/vnd.ms-excel">
-    <osso:category name="documents"/>
-  </mime-type>
-  <mime-type type="application/vnd.ms-word">
-    <osso:category name="documents"/>
-  </mime-type>
-  <mime-type type="application/vnd.ms-powerpoint">
-    <osso:category name="documents"/>
-  </mime-type>
-
-  <mime-type type="image/jpeg">
-    <osso:category name="images"/>
-  </mime-type>
-  <mime-type type="image/png">
-    <osso:category name="images"/>
-  </mime-type>
-  <mime-type type="image/gif">
-    <osso:category name="images"/>
-  </mime-type>
-  <mime-type type="image/tiff">
-    <osso:category name="images"/>
-  </mime-type>
-  <mime-type type="image/bmp">
-    <osso:category name="images"/>
-  </mime-type>
-
-  <mime-type type="audio/mpeg">
-    <osso:category name="audio"/>
-  </mime-type>
-  <mime-type type="audio/x-mpegurl">
-    <osso:category name="audio"/>
-  </mime-type>
-  <mime-type type="audio/x-mp3">
-    <osso:category name="audio"/>
-  </mime-type>
-  <mime-type type="application/ogg">
-    <osso:category name="audio"/>
-  </mime-type>
-  <mime-type type="audio/x-wav">
-    <osso:category name="audio"/>
-  </mime-type>
-  <mime-type type="audio/x-pn-realaudio">
-    <osso:category name="audio"/>
-  </mime-type>
-  <mime-type type="audio/vnd.rn-realaudio">
-    <osso:category name="audio"/>
-  </mime-type>
-  <mime-type type="audio/midi">
-    <osso:category name="audio"/>
-  </mime-type>
-
-  <mime-type type="video/mpeg">
-    <osso:category name="video"/>
-  </mime-type>
-  <mime-type type="video/quicktime">
-    <osso:category name="video"/>
-  </mime-type>
-  <mime-type type="video/x-msvideo">
-    <osso:category name="video"/>
-  </mime-type>
-  <mime-type type="video/x-ms-wmv">
-    <osso:category name="video"/>
-  </mime-type>
-  <mime-type type="application/vnd.rn-realmedia">
-    <osso:category name="video"/>
-  </mime-type>
-  <mime-type type="video/x-avi">
-    <osso:category name="video"/>
-  </mime-type>
-
-</mime-info>

Modified: projects/haf/trunk/libossomime/libossomime/Makefile.am
===================================================================
--- projects/haf/trunk/libossomime/libossomime/Makefile.am	2006-12-21 14:05:15 UTC (rev 8852)
+++ projects/haf/trunk/libossomime/libossomime/Makefile.am	2006-12-21 14:18:04 UTC (rev 8853)
@@ -1,6 +1,5 @@
 INCLUDES = 				\
 	-I$(top_srcdir)/libossomime	\
-	-I$(top_srcdir)/libossomime/src	\
 	-DPREFIX=\"${prefix}\"		\
 	-DGLOBS_FILE_PATH=\"$(datadir)/mime/globs\"
 
@@ -44,33 +43,32 @@
 
 test_open_SOURCES = test-open.c
 test_open_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_open_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_open_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_mime_types_SOURCES = test-mime-types.c
 test_mime_types_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_mime_types_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_mime_types_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_mime_icon_SOURCES = test-mime-icon.c
 test_mime_icon_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_mime_icon_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_mime_icon_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_mime_category_SOURCES = test-mime-category.c
 test_mime_category_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_mime_category_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_mime_category_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_mime_default_app_SOURCES = test-mime-default-app.c
 test_mime_default_app_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_mime_default_app_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_mime_default_app_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_uri_SOURCES = test-uri.c
 test_uri_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_uri_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_uri_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_service_SOURCES = test-service.c
 test_service_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_service_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
+test_service_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la
 
 test_mime_patterns_SOURCES = test-mime-patterns.c
 test_mime_patterns_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_mime_patterns_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/libossomime.la
-
+test_mime_patterns_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/libossomime.la


