[maemo-commits] [maemo-commits] r9429 - in projects/haf/trunk/osso-gnomevfs-extra: . debian obex-utils/tests
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Mon Jan 29 17:03:36 EET 2007
- Previous message: [maemo-commits] r9428 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . src
- Next message: [maemo-commits] r9430 - projects/haf/tags/osso-gnomevfs-extra
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: richard Date: 2007-01-29 17:03:34 +0200 (Mon, 29 Jan 2007) New Revision: 9429 Modified: projects/haf/trunk/osso-gnomevfs-extra/ChangeLog projects/haf/trunk/osso-gnomevfs-extra/Makefile.am projects/haf/trunk/osso-gnomevfs-extra/acinclude.m4 projects/haf/trunk/osso-gnomevfs-extra/configure.in projects/haf/trunk/osso-gnomevfs-extra/debian/changelog projects/haf/trunk/osso-gnomevfs-extra/debian/control projects/haf/trunk/osso-gnomevfs-extra/debian/osso-gnomevfs-extra.install projects/haf/trunk/osso-gnomevfs-extra/debian/rules projects/haf/trunk/osso-gnomevfs-extra/obex-utils/tests/Makefile.am Log: Prepare for 1.9.1-1. Modified: projects/haf/trunk/osso-gnomevfs-extra/ChangeLog =================================================================== --- projects/haf/trunk/osso-gnomevfs-extra/ChangeLog 2007-01-29 14:50:48 UTC (rev 9428) +++ projects/haf/trunk/osso-gnomevfs-extra/ChangeLog 2007-01-29 15:03:34 UTC (rev 9429) @@ -1,3 +1,9 @@ +2007-01-29 Richard Hult <richard at imendio.com> + + * configure.in: Bump version. Also remove lots of things that were + only needed for the now removed parts: dbus daemon, file module, + filechooser backend. + 2007-01-03 Martyn Russell <martyn at imendio.com> * debian/Makefile.am: Modified: projects/haf/trunk/osso-gnomevfs-extra/Makefile.am =================================================================== --- projects/haf/trunk/osso-gnomevfs-extra/Makefile.am 2007-01-29 14:50:48 UTC (rev 9428) +++ projects/haf/trunk/osso-gnomevfs-extra/Makefile.am 2007-01-29 15:03:34 UTC (rev 9429) @@ -1,4 +1,4 @@ -SUBDIRS = debian \ +SUBDIRS = \ + debian \ obex-utils \ - obex-module \ - file-chooser + obex-module Modified: projects/haf/trunk/osso-gnomevfs-extra/acinclude.m4 =================================================================== --- projects/haf/trunk/osso-gnomevfs-extra/acinclude.m4 2007-01-29 14:50:48 UTC (rev 9428) +++ projects/haf/trunk/osso-gnomevfs-extra/acinclude.m4 2007-01-29 15:03:34 UTC (rev 9429) @@ -1,5 +1,5 @@ dnl Turn on the additional warnings last, so -Werror doesn't affect other tests. -AC_DEFUN([IMENDIO_COMPILE_WARNINGS],[ +AC_DEFUN([IDT_COMPILE_WARNINGS],[ if test -f $srcdir/autogen.sh; then default_compile_warnings="error" else @@ -61,7 +61,7 @@ dnl *************** dnl Timezone checks dnl *************** -AC_DEFUN([IMENDIO_CHECK_TIMEZONE],[ +AC_DEFUN([IDT_CHECK_TIMEZONE],[ AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff, AC_TRY_COMPILE([ #include <time.h> Modified: projects/haf/trunk/osso-gnomevfs-extra/configure.in =================================================================== --- projects/haf/trunk/osso-gnomevfs-extra/configure.in 2007-01-29 14:50:48 UTC (rev 9428) +++ projects/haf/trunk/osso-gnomevfs-extra/configure.in 2007-01-29 15:03:34 UTC (rev 9429) @@ -1,27 +1,10 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT(osso-gnomevfs-extra, 1.9.0) +AC_INIT(osso-gnomevfs-extra, 1.9.1) AC_CONFIG_SRCDIR(obex-module/src/obex-method.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]) @@ -51,11 +34,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_rdev]) AC_STRUCT_ST_BLOCKS -dnl Volume monitor stuff -AC_CHECK_FUNCS(setmntent endmntent hasmntopt getmntinfo) -AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h sys/statvfs.h) - -# Needed to build the obex and file modules outside of gnome-vfs. +# Needed to build the obex module. AC_CACHE_CHECK([for off64_t], ac_cv_have_off64_t, AC_TRY_COMPILE([ @@ -68,210 +47,22 @@ AC_DEFINE(HAVE_OFF64_T, 1, [Whether off64_t type is available]) fi -AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h) - -dnl -dnl file system type member in statfs struct -dnl -AC_CHECK_MEMBERS([struct statfs.f_type], ,[ - AC_CHECK_MEMBERS([struct statfs.f_fstyp], , , [#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif -#ifdef HAVE_SYS_VFS_H -#include <sys/vfs.h> -#endif -#ifdef HAVE_SYS_MOUNT_H -#include <sys/mount.h> -#endif -#ifdef HAVE_SYS_STATFS_H -#include <sys/statfs.h> -#endif])], [#ifdef HAVE_SYS_PARAM_H -#include <sys/param.h> -#endif -#ifdef HAVE_SYS_VFS_H -#include <sys/vfs.h> -#endif -#ifdef HAVE_SYS_MOUNT_H -#include <sys/mount.h> -#endif -#ifdef HAVE_SYS_STATFS_H -#include <sys/statfs.h> -#endif]) - - -dnl -dnl if statfs() takes 2 arguments or 4 (Solaris) -dnl -if test "$ac_cv_func_statfs" = yes ; then - AC_MSG_CHECKING([number of arguments to statfs()]) - AC_TRY_COMPILE([#include <unistd.h> - #ifdef HAVE_SYS_PARAM_H - #include <sys/param.h> - #endif - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif - #ifdef HAVE_SYS_MOUNT_H - #include <sys/mount.h> - #endif - #ifdef HAVE_SYS_STATFS_H - #include <sys/statfs.h> - #endif], [struct statfs st; - statfs(NULL, &st);],[ - AC_MSG_RESULT([2]) - AC_DEFINE(STATFS_ARGS, 2, [Number of arguments to statfs()])],[ - AC_TRY_COMPILE([#include <unistd.h> - #ifdef HAVE_SYS_PARAM_H - #include <sys/param.h> - #endif - #ifdef HAVE_SYS_VFS_H - #include <sys/vfs.h> - #endif - #ifdef HAVE_SYS_MOUNT_H - #include <sys/mount.h> - #endif - #ifdef HAVE_SYS_STATFS_H - #include <sys/statfs.h> - #endif], [struct statfs st; - statfs(NULL, &st, sizeof (st), 0);],[ - AC_MSG_RESULT([4]) - AC_DEFINE(STATFS_ARGS, 4, [Number of arguments to statfs()])],[ - AC_MSG_RESULT(unknown) - AC_MSG_ERROR([unable to determine number of arguments to statfs()])])]) -fi dnl test "$ac_cv_func_statfs" = yes - -AC_TYPE_MBSTATE_T - -AC_CHECK_FUNCS(dirname, [AC_CHECK_HEADERS(libgen.h)] ,[ - AC_SEARCH_LIBS(dirname, [gen])]) - -dnl borrowed from gnu findutils -dnl and relicensed as LGPL by the FSF - -AC_ARG_WITH(afs, - [ --with-afs support -fstype afs], - [ AC_DEFINE(AFS, [], [Define if you have the Andrew File System]) - CPPFLAGS="$CPPFLAGS -I/usr/afsws/include" - LIBS="$LIBS -L/usr/afsws/lib -L/usr/afsws/lib/afs -lsys -lrx -llwp"]) - -AC_MSG_CHECKING(how to get filesystem type) -fstype=no -# The order of these tests is important. -AC_TRY_CPP([#include <sys/statvfs.h> -#include <sys/fstyp.h>], AC_DEFINE(FSTYPE_STATVFS, [], - [Define to use SVR4 statvfs to get filesystem type]) fstype=SVR4) -if test $fstype = no; then -AC_TRY_CPP([#include <sys/statfs.h> -#include <sys/fstyp.h>], AC_DEFINE(FSTYPE_USG_STATFS, [], - [Define to use SVR3.2 statfs to get filesystem type]) fstype=SVR3) -fi -if test $fstype = no; then -AC_TRY_CPP([#include <sys/statfs.h> -#include <sys/vmount.h>], AC_DEFINE(FSTYPE_AIX_STATFS, [], - [Define to use AIX3 statfs to get filesystem type]) fstype=AIX) -fi -if test $fstype = no; then -AC_TRY_CPP([#include <mntent.h>], AC_DEFINE(FSTYPE_MNTENT, [], - [Define to use 4.3BSD getmntent to get filesystem typ]) fstype=4.3BSD) -fi -if test $fstype = no; then -AC_EGREP_HEADER(f_type;, sys/mount.h, AC_DEFINE(FSTYPE_STATFS, [], - [Define to use 4.4BSD and OSF1 statfs to get filesystem typ]) fstype=4.4BSD/OSF1) -fi -if test $fstype = no; then -AC_TRY_CPP([#include <sys/mount.h> -#include <sys/fs_types.h>], AC_DEFINE(FSTYPE_GETMNT, [], - [Define to use Ultrix getmnt to get filesystem typ]) fstype=Ultrix) -fi -AC_MSG_RESULT($fstype) - - dnl Defined in acinclude.m4 -IMENDIO_COMPILE_WARNINGS -IMENDIO_CHECK_TIMEZONE +IDT_COMPILE_WARNINGS +IDT_CHECK_TIMEZONE dnl This refers to osso-gnome-vfs. GNOME_VFS_REQUIRED=2.16.3 - DBUS_REQUIRED=0.60 GLIB_REQUIRED=2.6.0 LIBXML_REQUIRED=2.4 -GTK_REQUIRED=2.6.0 GWOBEX_REQUIRED=0.45.1 GWCONNECT_REQUIRED=0.93.2 dnl ======================================= -dnl File Chooser Backend -dnl ======================================= -PKG_CHECK_MODULES(FILE_SYSTEM, [ - gtk+-2.0 >= $GTK_REQUIRED - gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED -]) - -GTK_BINARY_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0` -AC_SUBST(FILE_SYSTEM_CFLAGS) -AC_SUBST(FILE_SYSTEM_LIBS) -AC_SUBST(GTK_BINARY_VERSION) -GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0` -AC_SUBST(GTK_VERSION) - -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) - - -# Docs -AC_ARG_WITH(doc-dir, [AC_HELP_STRING([--with-doc-dir=PATH], - [Path to installed docs (default=$datadir/doc)])]) -if test "x$with_doc_dir" = "x" ; then - eval "docdir=${datadir}/doc" -else - docdir=$with_doc_dir -fi - -eval "HTML_DIR=${docdir}/html" -eval "API_DIR=${docdir}/libossomime/API" -eval "localedir=${datadir}/locale" -eval "outomoduledir=${prefix}/lib/outo" -whoami=`whoami` - -AC_SUBST(docdir) -AC_SUBST(localedir) -AC_SUBST(outomoduledir) -AC_SUBST(HTML_DIR) -AC_SUBST(API_DIR) -AC_SUBST(whoami) - -dnl ======================================= dnl OBEX Module dnl ======================================= - PKG_CHECK_MODULES(OBEX_MODULE, [ glib-2.0 >= $GLIB_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED @@ -281,10 +72,6 @@ gwconnect >= $GWCONNECT_REQUIRED ]) -AC_SUBST(OBEX_MODULE_CFLAGS) -AC_SUBST(OBEX_MODULE_LIBS) - - dnl ======================================= dnl OBEX Utils dnl ======================================= @@ -298,28 +85,9 @@ glib-2.0 >= $GLIB_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED - gtk+-2.0 >= $GTK_REQUIRED ]) dnl ======================================= -dnl VFS Daemon -dnl ======================================= -PKG_CHECK_MODULES(VFS_DAEMON, [ - glib-2.0 >= $GLIB_REQUIRED - dbus-glib-1 >= $DBUS_REQUIRED - gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED - gnome-vfs-module-2.0 >= $GNOME_VFS_REQUIRED - gconf-2.0 -]) - -AC_SUBST(VFS_DAEMON_CFLAGS) -AC_SUBST(VFS_DAEMON_LIBS) - -DBUS_SERVICE_DIR=$libdir/dbus-1.0/services -AC_SUBST(DBUS_SERVICE_DIR) - - -dnl ======================================= dnl Nautilus workaround in the OBEX module dnl ======================================= AC_ARG_ENABLE(nautilus-workaround, [ --enable-nautilus-workaround enables workaround in the OBEX module for Nautilus],,enable_nautilus_around=no) @@ -351,9 +119,6 @@ AC_OUTPUT([ Makefile debian/Makefile - file-chooser/Makefile - file-chooser/src/Makefile - file-chooser/tests/Makefile obex-module/Makefile obex-module/docs/Makefile obex-module/src/Makefile Modified: projects/haf/trunk/osso-gnomevfs-extra/debian/changelog =================================================================== --- projects/haf/trunk/osso-gnomevfs-extra/debian/changelog 2007-01-29 14:50:48 UTC (rev 9428) +++ projects/haf/trunk/osso-gnomevfs-extra/debian/changelog 2007-01-29 15:03:34 UTC (rev 9429) @@ -1,3 +1,10 @@ +osso-gnomevfs-extra (1.9.1-1) unstable; urgency=low + + * Remove file-chooser backend, and clean up build + * Remove GTK+ dependency + + -- Richard Hult <richard at imendio.com> Thu, 21 Dec 2006 09:49:20 +0100 + osso-gnomevfs-extra (1.9.0-1) unstable; urgency=low * UNRELEASED Modified: projects/haf/trunk/osso-gnomevfs-extra/debian/control =================================================================== --- projects/haf/trunk/osso-gnomevfs-extra/debian/control 2007-01-29 14:50:48 UTC (rev 9428) +++ projects/haf/trunk/osso-gnomevfs-extra/debian/control 2007-01-29 15:03:34 UTC (rev 9429) @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Richard Hult <richard at imendio.com> -Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev (>= 2.8), libopenobex1-dev, libgwobex-dev (>= 0.47), libosso-gnomevfs2-dev (>= 2.16.3), libdbus-glib-1-dev, osso-gwconnect-dev (>=0.93.2), libgtk2.0-dev, libexpat1-dev +Build-Depends: debhelper (>= 4.0.0), libglib2.0-dev (>= 2.8), libopenobex1-dev, libgwobex-dev (>= 0.47), libosso-gnomevfs2-dev (>= 2.16.3), libdbus-glib-1-dev, osso-gwconnect-dev (>=0.93.2), libexpat1-dev Standards-Version: 3.6.1.0 Package: osso-gnomevfs-extra @@ -16,7 +16,6 @@ This package contains extra parts to GnomeVFS developed for Nokia. * An OBEX GnomeVFS module * Small library to retrieve the capabilities object from a remote devices. - * The GnomeVFS file backend for the GTK+ file chooser. Package: osso-gnomevfs-extra-dev Section: devel Modified: projects/haf/trunk/osso-gnomevfs-extra/debian/osso-gnomevfs-extra.install =================================================================== --- projects/haf/trunk/osso-gnomevfs-extra/debian/osso-gnomevfs-extra.install 2007-01-29 14:50:48 UTC (rev 9428) +++ projects/haf/trunk/osso-gnomevfs-extra/debian/osso-gnomevfs-extra.install 2007-01-29 15:03:34 UTC (rev 9429) @@ -1,4 +1,3 @@ etc/gnome-vfs-2.0/modules/*.conf usr/lib/libobex-vfs-utils.so usr/lib/gnome-vfs-2.0/modules/*.so -usr/lib/gtk-2.0/2.4.0/filesystems/*.so Modified: projects/haf/trunk/osso-gnomevfs-extra/debian/rules =================================================================== --- projects/haf/trunk/osso-gnomevfs-extra/debian/rules 2007-01-29 14:50:48 UTC (rev 9428) +++ projects/haf/trunk/osso-gnomevfs-extra/debian/rules 2007-01-29 15:03:34 UTC (rev 9429) @@ -33,7 +33,6 @@ ./configure $(confflags) \ --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ - --disable-update-categorydb \ --with-doc-dir=$(CURDIR)/debian/tmp/usr/share/doc touch configure-stamp Modified: projects/haf/trunk/osso-gnomevfs-extra/obex-utils/tests/Makefile.am =================================================================== --- projects/haf/trunk/osso-gnomevfs-extra/obex-utils/tests/Makefile.am 2007-01-29 14:50:48 UTC (rev 9428) +++ projects/haf/trunk/osso-gnomevfs-extra/obex-utils/tests/Makefile.am 2007-01-29 15:03:34 UTC (rev 9429) @@ -14,14 +14,10 @@ noinst_PROGRAMS = \ test-cap-parser \ - test-cap-dbus \ - test-xfer + test-cap-dbus test_cap_parser_SOURCES = \ test-cap-parser.c test_cap_dbus_SOURCES = \ test-cap-dbus.c - -test_xfer_SOURCES = \ - test-xfer.c
- Previous message: [maemo-commits] r9428 - in projects/haf/branches/maemo-af-desktop/hildon-desktop: . src
- Next message: [maemo-commits] r9430 - projects/haf/tags/osso-gnomevfs-extra
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]