[maemo-commits] [maemo-commits] r10130 - in projects/haf/trunk/libossomime: . data debian
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Feb 21 16:23:46 EET 2007
- Previous message: [maemo-commits] r10129 - in projects/haf/branches/hildon-control-panel/refactoring: . src
- Next message: [maemo-commits] r10131 - projects/haf/trunk/libhildonmime/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: erikarls Date: 2007-02-21 16:23:45 +0200 (Wed, 21 Feb 2007) New Revision: 10130 Added: projects/haf/trunk/libossomime/autogen.sh projects/haf/trunk/libossomime/configure.in projects/haf/trunk/libossomime/debian/ projects/haf/trunk/libossomime/debian/Makefile.am projects/haf/trunk/libossomime/debian/changelog projects/haf/trunk/libossomime/debian/compat projects/haf/trunk/libossomime/debian/control projects/haf/trunk/libossomime/debian/copyright projects/haf/trunk/libossomime/debian/hildon-update-category-database.install projects/haf/trunk/libossomime/debian/hildon-update-category-database.postinst projects/haf/trunk/libossomime/debian/libossomime-dev.install projects/haf/trunk/libossomime/debian/libossomime0.install projects/haf/trunk/libossomime/debian/rules Modified: projects/haf/trunk/libossomime/Makefile.am projects/haf/trunk/libossomime/data/Makefile.am Log: First version Modified: projects/haf/trunk/libossomime/Makefile.am =================================================================== --- projects/haf/trunk/libossomime/Makefile.am 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/Makefile.am 2007-02-21 14:23:45 UTC (rev 10130) @@ -1,13 +1,8 @@ -SUBDIRS = src data #ut +SUBDIRS = debian \ + libossomime \ + tests \ + data \ + docs -#install-data-local: -# mkdir -p $(API_DIR) -# $(DOXYGEN) Doxyfile - -#uninstall-local: -# $(RM) -r -v $(API_DIR) - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libossomime.pc - -EXTRA_DIST = mime-category-mapping.txt mime-dbus-mapping.txt Added: projects/haf/trunk/libossomime/autogen.sh =================================================================== --- projects/haf/trunk/libossomime/autogen.sh 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/autogen.sh 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1,68 @@ +#!/bin/sh + +PACKAGE="libossomime" + +have_libtool=false +have_autoconf=false +have_automake=false +need_configure_in=false + +if libtool --version < /dev/null > /dev/null 2>&1 ; then + libtool_version=`libtoolize --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + have_libtool=true + case $libtool_version in + 1.3*) + need_configure_in=true + ;; + esac +fi + +if autoconf --version < /dev/null > /dev/null 2>&1 ; then + autoconf_version=`autoconf --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` + have_autoconf=true + case $autoconf_version in + 2.13) + need_configure_in=true + ;; + esac +fi + +if $have_libtool ; then : ; else + echo; + echo "You must have libtool >= 1.3 installed to compile $PACKAGE"; + echo; + exit; +fi + +(automake-1.8 --version) < /dev/null > /dev/null 2>&1 || { + echo; + echo "You must have automake 1.8 installed to compile $PACKAGE"; + echo; + exit; +} + +echo "Generating configuration files for $PACKAGE, please wait...." +echo; + +if $need_configure_in ; then + if test ! -f configure.in ; then + echo "Creating symlink from configure.in to configure.ac..." + echo + ln -s configure.ac configure.in + fi +fi + +aclocal-1.8 $ACLOCAL_FLAGS +libtoolize --force +autoheader +automake-1.8 --add-missing +autoconf + +if test x$NOCONFIGURE = x; then + echo Running $srcdir/configure "$@" ... + ./configure "$@" --enable-maintainer-mode \ + && echo Now type \`make\' to compile $PROJECT || exit 1 +else + echo Skipping configure process. +fi + Property changes on: projects/haf/trunk/libossomime/autogen.sh ___________________________________________________________________ Name: svn:executable + * Added: projects/haf/trunk/libossomime/configure.in =================================================================== --- projects/haf/trunk/libossomime/configure.in 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/configure.in 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1,94 @@ +dnl Process this file with autoconf to produce a configure script. +AC_PREREQ(2.52) + +AC_INIT(libossomime, 1.8.5) +AC_CONFIG_SRCDIR(libossomime/osso-uri.c) +AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + +dnl Versioning for libossomime + +dnl Increase when changing the API (adding, removing, changing) +LIBOSSOMIME_CURRENT=1 + +dnl Increase when changing implementation of current API, +dnl reset to 0 when changing CURRENT. This is the revision of current +dnl API version. +LIBOSSOMIME_REVISION=3 + +dnl Change this only if CURRENT has been changed. Increase if API +dnl change is ABI compatible, otherwise reset to 0 +LIBOSSOMIME_AGE=1 + +LIBOSSOMIME_VERSION_INFO="$LIBOSSOMIME_CURRENT:$LIBOSSOMIME_REVISION:$LIBOSSOMIME_AGE" +AC_SUBST(LIBOSSOMIME_VERSION_INFO) + +dnl Globally define_GNU_SOURCE and therefore enable the GNU extensions +AC_DEFINE(_GNU_SOURCE, 1, [Enable GNU Extensions]) + +AM_MAINTAINER_MODE +AM_CONFIG_HEADER(config.h) + +AM_DISABLE_STATIC +AM_PROG_LIBTOOL + +AC_ISC_POSIX +AC_PROG_CC +AM_PROG_CC_STDC +AC_HEADER_STDC + +AC_HEADER_TIME +AC_CHECK_HEADERS([stdlib.h string.h]) + +dnl Defined in acinclude.m4 +IDT_COMPILE_WARNINGS + +GNOME_VFS_REQUIRED=2.16.3 +DBUS_REQUIRED=0.60 +GLIB_REQUIRED=2.6.0 +GTK_REQUIRED=2.6.0 +LIBXML_REQUIRED=2.4 + +dnl ======================================= +dnl libossomime +dnl ======================================= +PKG_CHECK_MODULES(LIBOSSOMIME, [ + glib-2.0 >= $GLIB_REQUIRED + gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED + gnome-vfs-module-2.0 >= $GNOME_VFS_REQUIRED + dbus-glib-1 >= $DBUS_REQUIRED +]) + +AC_SUBST(LIBOSSOMIME_CFLAGS) +AC_SUBST(LIBOSSOMIME_LIBS) + +dnl ======================================= +dnl update-category-database +dnl ======================================= +PKG_CHECK_MODULES(UPDATE_CATEGORY, [ + glib-2.0 >= $GLIB_REQUIRED + libxml-2.0 >= $LIBXML_REQUIRED +]) +AC_SUBST(UPDATE_CATEGORY_CFLAGS) +AC_SUBST(UPDATE_CATEGORY_LIBS) + +AC_ARG_ENABLE(update-categorydb, + AC_HELP_STRING([--disable-update-categoryb], + [disable the update-category-database after install [default=no]]),, + enable_update_categorydb=yes) +AM_CONDITIONAL(ENABLE_UPDATE_CATEGORYDB, test x$enable_update_categorydb = xyes) + + +dnl This will cause the automake generated makefiles to pass the +dnl correct flags to aclocal. +ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" +AC_SUBST(ACLOCAL_AMFLAGS) + +AC_OUTPUT([ + Makefile + libossomime.pc + debian/Makefile + libossomime/Makefile + tests/Makefile + data/Makefile + docs/Makefile +]) Modified: projects/haf/trunk/libossomime/data/Makefile.am =================================================================== --- projects/haf/trunk/libossomime/data/Makefile.am 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/data/Makefile.am 2007-02-21 14:23:45 UTC (rev 10130) @@ -1,8 +1,6 @@ categoriesdir = $(datadir)/mime/packages categories_DATA = categories.xml -defaultsdir = $(datadir)/applications -defaults_DATA = uri-action-defaults.list install-data-hook: if ENABLE_UPDATE_CATEGORYDB Added: projects/haf/trunk/libossomime/debian/Makefile.am =================================================================== --- projects/haf/trunk/libossomime/debian/Makefile.am 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/debian/Makefile.am 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1,10 @@ +EXTRA_DIST = \ + changelog \ + control \ + compat \ + copyright \ + hildon-update-category-database.install \ + hildon-update-category-database.postinst \ + libhildonmime0.install \ + libhildonmime-dev.install \ + rules Added: projects/haf/trunk/libossomime/debian/changelog =================================================================== --- projects/haf/trunk/libossomime/debian/changelog 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/debian/changelog 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1,5 @@ +libhildonmime (1.8.5-1) unstable; urgency=low + + * Start new development branch + + -- Erik Karlsson <erik.b.karlsson at nokia.com> Wed, 21 Feb 2007 16:00:20 +0200 Added: projects/haf/trunk/libossomime/debian/compat =================================================================== --- projects/haf/trunk/libossomime/debian/compat 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/debian/compat 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1 @@ +4 Added: projects/haf/trunk/libossomime/debian/control =================================================================== --- projects/haf/trunk/libossomime/debian/control 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/debian/control 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1,37 @@ +Source: libossomime +Section: libs +Priority: optional +Maintainer: Erik Karlsson <erik.b.karlsson at nokia.com> +Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev (>= 2.8), libosso-gnomevfs2-dev (>= 2.16.3), libdbus-glib-1-dev +Standards-Version: 3.6.1.0 + +Package: libossomime0 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, osso-update-category-database (= ${Source-Version}), osso-uri-l10n-mr0 | osso-uri-l10n-mr +Description: Library for activating an application to handle a certain mime type + This package contains a library for activating an application to handle + a certain mime type. + +Package: libossomime-dev +Section: devel +Architecture: any +Depends: libossomime0 (= ${Source-Version}), libosso-gnomevfs2-dev (>= 2.8.4.7), libdbus-glib-1-dev +Description: libossomime development files + Development files for the libossomime package. + +Package: libossomime0-dbg +Section: devel +Priority: extra +Architecture: any +Depends: libossomime0 (= ${Source-Version}) +Description: libossomime debugging symbols + Development files for the libossomime package. + +Package: osso-update-category-database +Section: misc +Architecture: any +Depends: ${shlibs:Depends} +Description: Tool for managing the mime/category database + This package contains a tool that manages the mime/category mapping + database. Added: projects/haf/trunk/libossomime/debian/copyright =================================================================== --- projects/haf/trunk/libossomime/debian/copyright 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/debian/copyright 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1,7 @@ +Copyright (C) 2004-2006 Nokia Corporation. +Copyright (C) 1999 Free Software Foundation + +The code is licensed under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; version 2 of the +License. See individual source files for more information. + Added: projects/haf/trunk/libossomime/debian/hildon-update-category-database.install =================================================================== --- projects/haf/trunk/libossomime/debian/hildon-update-category-database.install 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/debian/hildon-update-category-database.install 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1 @@ +usr/bin/hildon-update-category-database Added: projects/haf/trunk/libossomime/debian/hildon-update-category-database.postinst =================================================================== --- projects/haf/trunk/libossomime/debian/hildon-update-category-database.postinst 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/debian/hildon-update-category-database.postinst 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1,6 @@ +#! /bin/sh +set -e + +if [ "$1" = "configure" ]; then + /usr/bin/hildon-update-category-database /usr/share/mime +fi Added: projects/haf/trunk/libossomime/debian/libossomime-dev.install =================================================================== --- projects/haf/trunk/libossomime/debian/libossomime-dev.install 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/debian/libossomime-dev.install 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1,4 @@ +usr/lib/libhildonmime.so +usr/lib/libhildonmime.la +usr/lib/pkgconfig/libhildonmime.pc +usr/include/*.h Added: projects/haf/trunk/libossomime/debian/libossomime0.install =================================================================== --- projects/haf/trunk/libossomime/debian/libossomime0.install 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/debian/libossomime0.install 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1,2 @@ +usr/lib/libhildonmime.so.* +usr/lib/outo/*.so Added: projects/haf/trunk/libossomime/debian/rules =================================================================== --- projects/haf/trunk/libossomime/debian/rules 2007-02-21 14:17:23 UTC (rev 10129) +++ projects/haf/trunk/libossomime/debian/rules 2007-02-21 14:23:45 UTC (rev 10130) @@ -0,0 +1,81 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +CFLAGS += -g + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + + NOCONFIGURE=1 ./autogen.sh + + ./configure $(confflags) \ + --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-update-categorydb + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + -$(MAKE) clean + -if [ -f Makefile ] ; then $(MAKE) distclean ; fi + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + +binary-arch: install + dh_testdir + 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 + dh_fixperms + dh_makeshlibs -V + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure Property changes on: projects/haf/trunk/libossomime/debian/rules ___________________________________________________________________ Name: svn:executable + *
- Previous message: [maemo-commits] r10129 - in projects/haf/branches/hildon-control-panel/refactoring: . src
- Next message: [maemo-commits] r10131 - projects/haf/trunk/libhildonmime/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]