[maemo-commits] [maemo-commits] r10132 - in projects/haf/trunk/libossomime: . debian src

[From: subversion at stage.maemo.org]

Author: erikarls
Date: 2007-02-21 16:37:10 +0200 (Wed, 21 Feb 2007)
New Revision: 10132

Modified:
   projects/haf/trunk/libossomime/Makefile.am
   projects/haf/trunk/libossomime/configure.in
   projects/haf/trunk/libossomime/debian/Makefile.am
   projects/haf/trunk/libossomime/debian/changelog
   projects/haf/trunk/libossomime/debian/libossomime-dev.install
   projects/haf/trunk/libossomime/debian/libossomime0.install
   projects/haf/trunk/libossomime/debian/rules
   projects/haf/trunk/libossomime/src/Makefile.am
Log:
working version of the libossomime

Modified: projects/haf/trunk/libossomime/Makefile.am
===================================================================
--- projects/haf/trunk/libossomime/Makefile.am	2007-02-21 14:36:50 UTC (rev 10131)
+++ projects/haf/trunk/libossomime/Makefile.am	2007-02-21 14:37:10 UTC (rev 10132)
@@ -1,8 +1,6 @@
 SUBDIRS = debian		\
-	libossomime             \
-	tests			\
-	data			\
-	docs
+	src             \
+	data
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libossomime.pc

Modified: projects/haf/trunk/libossomime/configure.in
===================================================================
--- projects/haf/trunk/libossomime/configure.in	2007-02-21 14:36:50 UTC (rev 10131)
+++ projects/haf/trunk/libossomime/configure.in	2007-02-21 14:37:10 UTC (rev 10132)
@@ -2,7 +2,7 @@
 AC_PREREQ(2.52)
  
 AC_INIT(libossomime, 1.8.5)
-AC_CONFIG_SRCDIR(libossomime/osso-uri.c)
+AC_CONFIG_SRCDIR(src/osso-uri.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 dnl Versioning for libossomime
@@ -87,8 +87,6 @@
 	Makefile 
 	libossomime.pc
 	debian/Makefile
-        libossomime/Makefile
-        tests/Makefile
+        src/Makefile
         data/Makefile
-	docs/Makefile
 ])

Modified: projects/haf/trunk/libossomime/debian/Makefile.am
===================================================================
--- projects/haf/trunk/libossomime/debian/Makefile.am	2007-02-21 14:36:50 UTC (rev 10131)
+++ projects/haf/trunk/libossomime/debian/Makefile.am	2007-02-21 14:37:10 UTC (rev 10132)
@@ -5,6 +5,6 @@
 	copyright		   	\
 	hildon-update-category-database.install \
 	hildon-update-category-database.postinst \
-	libhildonmime0.install		\
-	libhildonmime-dev.install		\
+	libossomime0.install		\
+	libossomime-dev.install		\
 	rules

Modified: projects/haf/trunk/libossomime/debian/changelog
===================================================================
--- projects/haf/trunk/libossomime/debian/changelog	2007-02-21 14:36:50 UTC (rev 10131)
+++ projects/haf/trunk/libossomime/debian/changelog	2007-02-21 14:37:10 UTC (rev 10132)
@@ -1,4 +1,4 @@
-libhildonmime (1.8.5-1) unstable; urgency=low
+libossomime (1.8.5-1) unstable; urgency=low
 
   * Start new development branch
 

Modified: projects/haf/trunk/libossomime/debian/libossomime-dev.install
===================================================================
--- projects/haf/trunk/libossomime/debian/libossomime-dev.install	2007-02-21 14:36:50 UTC (rev 10131)
+++ projects/haf/trunk/libossomime/debian/libossomime-dev.install	2007-02-21 14:37:10 UTC (rev 10132)
@@ -1,4 +1,4 @@
-usr/lib/libhildonmime.so
-usr/lib/libhildonmime.la
-usr/lib/pkgconfig/libhildonmime.pc
+usr/lib/libossomime.so
+usr/lib/libossomime.la
+usr/lib/pkgconfig/libossomime.pc
 usr/include/*.h

Modified: projects/haf/trunk/libossomime/debian/libossomime0.install
===================================================================
--- projects/haf/trunk/libossomime/debian/libossomime0.install	2007-02-21 14:36:50 UTC (rev 10131)
+++ projects/haf/trunk/libossomime/debian/libossomime0.install	2007-02-21 14:37:10 UTC (rev 10132)
@@ -1,2 +1,2 @@
-usr/lib/libhildonmime.so.*
+usr/lib/libossomime.so.*
 usr/lib/outo/*.so

Modified: projects/haf/trunk/libossomime/debian/rules
===================================================================
--- projects/haf/trunk/libossomime/debian/rules	2007-02-21 14:36:50 UTC (rev 10131)
+++ projects/haf/trunk/libossomime/debian/rules	2007-02-21 14:37:10 UTC (rev 10132)
@@ -65,7 +65,6 @@
 	dh_testroot
 	dh_install --sourcedir=debian/tmp
 	dh_installchangelogs 
-	dh_installdocs README docs/mime-category-mapping.txt docs/mime-dbus-mapping.txt
 	dh_link
 	dh_strip --dbg-package=libossomime0
 	dh_compress

Modified: projects/haf/trunk/libossomime/src/Makefile.am
===================================================================
--- projects/haf/trunk/libossomime/src/Makefile.am	2007-02-21 14:36:50 UTC (rev 10131)
+++ projects/haf/trunk/libossomime/src/Makefile.am	2007-02-21 14:37:10 UTC (rev 10132)
@@ -32,45 +32,5 @@
 osso_update_category_database_CFLAGS = $(UPDATE_CATEGORY_CFLAGS)
 osso_update_category_database_LDADD = $(UPDATE_CATEGORY_LIBS)
 
-noinst_PROGRAMS = 		\
-	test-open 		\
-	test-mime-types         \
-	test-mime-icon 		\
-	test-mime-category	\
-	test-mime-default-app	\
-	test-uri		\
-	test-service            \
-	test-mime-patterns
 
-test_open_SOURCES = test-open.c
-test_open_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_open_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/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_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_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_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_uri_SOURCES = test-uri.c
-test_uri_CFLAGS = $(LIBOSSOMIME_CFLAGS)
-test_uri_LDADD = $(LIBOSSOMIME_LIBS) $(top_builddir)/libossomime/src/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_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
-