Hello community, here is the log from the commit of package bluez-gnome checked in at Mon Oct 6 16:25:37 CEST 2008. -------- --- GNOME/bluez-gnome/bluez-gnome.changes 2008-09-16 09:47:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/bluez-gnome/bluez-gnome.changes 2008-09-29 23:04:16.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 30 07:01:33 WST 2008 - mboman@suse.de + +- Update to version 1.5: + + Use GIO to normalize pathnames. + + Fix getting name of remote devices. + + Write "time left" in human readable terms. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- bluez-gnome-1.4.tar.bz2 New: ---- bluez-gnome-1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bluez-gnome.spec ++++++ --- /var/tmp/diff_new_pack.dF2637/_old 2008-10-06 16:24:21.000000000 +0200 +++ /var/tmp/diff_new_pack.dF2637/_new 2008-10-06 16:24:21.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package bluez-gnome (Version 1.4) +# spec file for package bluez-gnome (Version 1.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,13 @@ Name: bluez-gnome -BuildRequires: bluez-devel gconf2-devel gtk2-devel hal-devel intltool libnotify-devel update-desktop-files +BuildRequires: bluez-devel +BuildRequires: gconf2-devel +BuildRequires: gtk2-devel +BuildRequires: hal-devel +BuildRequires: intltool +BuildRequires: libnotify-devel +BuildRequires: update-desktop-files %if %suse_version > 1010 BuildRequires: dbus-1-glib-devel %else @@ -28,8 +34,8 @@ License: GPL v2 or later Group: System/GUI/GNOME AutoReqProv: on -Version: 1.4 -Release: 2 +Version: 1.5 +Release: 1 Summary: Bluetooth helpers for GNOME Source: %{name}-%{version}.tar.bz2 Url: http://www.bluez.org @@ -113,6 +119,11 @@ %files lang -f bluetooth-manager.lang %changelog +* Tue Sep 30 2008 mboman@suse.de +- Update to version 1.5: + + Use GIO to normalize pathnames. + + Fix getting name of remote devices. + + Write "time left" in human readable terms. * Tue Sep 16 2008 dmueller@suse.de - adjust bluez requires * Tue Sep 16 2008 jpr@suse.de @@ -135,12 +146,12 @@ Enable bluetooth-wizard application. * Mon Sep 01 2008 ro@suse.de - for 11.0, require gvfs-backends instead of gnome-vfs-obexftp -* Tue Aug 12 2008 captain.magnus@opensuse.org +* Wed Aug 13 2008 captain.magnus@opensuse.org - Update to version 0.28 + Import translations from Ubuntu Rosetta. + Add selected device name property. + Hide filters box when not needed. -* Wed Jul 02 2008 jpr@suse.de +* Thu Jul 03 2008 jpr@suse.de - Update to version 0.27 * Improve the handling of error messages. * Make the display of service names translatable. @@ -185,7 +196,7 @@ Make notification library a requirement. Enable sendto application. Updated translations -* Thu Jan 31 2008 rodrigo@suse.de +* Fri Feb 01 2008 rodrigo@suse.de - Update to version 0.15: * Use buttons in notification popups * Use CreateSecureDevice for input device setup @@ -194,7 +205,7 @@ * Enable singleton support * Update device selection widget * Make tooltips HIG compliant -* Wed Nov 07 2007 jpr@suse.de +* Thu Nov 08 2007 jpr@suse.de - Require bluez-utils (#339906) * Thu Oct 25 2007 jpr@suse.de - Upgrade to 0.14 @@ -228,9 +239,9 @@ - Use gconf macros * Thu Jun 21 2007 sbrabec@suse.cz - Support for turning Bluetooth on by GUI (#226137). -* Sun Mar 11 2007 stbinner@suse.de +* Mon Mar 12 2007 stbinner@suse.de - fix build (/etc/xdg/autostart ownership) -* Wed Jan 10 2007 sbrabec@suse.cz +* Thu Jan 11 2007 sbrabec@suse.cz - Some specfile cleanup. * Thu Nov 30 2006 sbrabec@suse.cz - Build correctly in older products. ++++++ bluez-gnome-1.4.tar.bz2 -> bluez-gnome-1.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/analyzer/Makefile.in new/bluez-gnome-1.5/analyzer/Makefile.in --- old/bluez-gnome-1.4/analyzer/Makefile.in 2008-09-13 19:34:36.000000000 +0200 +++ new/bluez-gnome-1.5/analyzer/Makefile.in 2008-09-27 04:57:18.000000000 +0200 @@ -117,6 +117,8 @@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/applet/Makefile.in new/bluez-gnome-1.5/applet/Makefile.in --- old/bluez-gnome-1.4/applet/Makefile.in 2008-09-13 19:34:36.000000000 +0200 +++ new/bluez-gnome-1.5/applet/Makefile.in 2008-09-27 04:57:19.000000000 +0200 @@ -110,6 +110,8 @@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/browse/Makefile.in new/bluez-gnome-1.5/browse/Makefile.in --- old/bluez-gnome-1.4/browse/Makefile.in 2008-09-13 19:34:37.000000000 +0200 +++ new/bluez-gnome-1.5/browse/Makefile.in 2008-09-27 04:57:19.000000000 +0200 @@ -94,6 +94,8 @@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/ChangeLog new/bluez-gnome-1.5/ChangeLog --- old/bluez-gnome-1.4/ChangeLog 2008-09-13 19:34:11.000000000 +0200 +++ new/bluez-gnome-1.5/ChangeLog 2008-09-27 04:57:05.000000000 +0200 @@ -1,3 +1,8 @@ +ver 1.5: + Use GIO to normalize pathnames. + Fix getting name of remote devices. + Write "time left" in human readable terms. + ver 1.4: Use longer D-Bus timeout for device creation. Add Simple Pairing support to the wizard. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/common/helper.c new/bluez-gnome-1.5/common/helper.c --- old/bluez-gnome-1.4/common/helper.c 2008-09-13 19:34:11.000000000 +0200 +++ new/bluez-gnome-1.5/common/helper.c 2008-09-27 04:57:05.000000000 +0200 @@ -39,7 +39,7 @@ switch (type) { case BLUETOOTH_TYPE_PHONE: - g_object_set(cell, "icon-name", "stock_cell-phone", NULL); + g_object_set(cell, "icon-name", "phone", NULL); break; case BLUETOOTH_TYPE_MODEM: g_object_set(cell, "icon-name", "modem", NULL); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/common/Makefile.in new/bluez-gnome-1.5/common/Makefile.in --- old/bluez-gnome-1.4/common/Makefile.in 2008-09-13 19:34:37.000000000 +0200 +++ new/bluez-gnome-1.5/common/Makefile.in 2008-09-27 04:57:19.000000000 +0200 @@ -105,6 +105,8 @@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/configure new/bluez-gnome-1.5/configure --- old/bluez-gnome-1.4/configure 2008-09-13 19:34:40.000000000 +0200 +++ new/bluez-gnome-1.5/configure 2008-09-27 04:57:22.000000000 +0200 @@ -755,6 +755,8 @@ DBUS_CFLAGS DBUS_LIBS DBUS_BINDING_TOOL +GIO_CFLAGS +GIO_LIBS GTK_CFLAGS GTK_LIBS GLIB_GENMARSHAL @@ -777,6 +779,8 @@ PKG_CONFIG DBUS_CFLAGS DBUS_LIBS +GIO_CFLAGS +GIO_LIBS GTK_CFLAGS GTK_LIBS GCONF_CFLAGS @@ -1387,6 +1391,8 @@ PKG_CONFIG path to pkg-config utility DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config DBUS_LIBS linker flags for DBUS, overriding pkg-config + GIO_CFLAGS C compiler flags for GIO, overriding pkg-config + GIO_LIBS linker flags for GIO, overriding pkg-config GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config GCONF_CFLAGS @@ -2156,7 +2162,7 @@ # Define the identity of the package. PACKAGE=bluez-gnome - VERSION=1.4 + VERSION=1.5 cat >>confdefs.h <<_ACEOF @@ -6712,6 +6718,80 @@ pkg_failed=no +{ echo "$as_me:$LINENO: checking for GIO" >&5 +echo $ECHO_N "checking for GIO... $ECHO_C" >&6; } + +if test -n "$GIO_CFLAGS"; then + pkg_cv_GIO_CFLAGS="$GIO_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: $PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.16"") >&5 + ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.16") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.16" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$GIO_LIBS"; then + pkg_cv_GIO_LIBS="$GIO_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: $PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.16"") >&5 + ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.16") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: $? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.16" 2>/dev/null` +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= 2.16" 2>&1` + else + GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= 2.16" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$GIO_PKG_ERRORS" >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { { echo "$as_me:$LINENO: error: gio >= 2.16 is required" >&5 +echo "$as_me: error: gio >= 2.16 is required" >&2;} + { (exit 1); exit 1; }; } +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: gio >= 2.16 is required" >&5 +echo "$as_me: error: gio >= 2.16 is required" >&2;} + { (exit 1); exit 1; }; } +else + GIO_CFLAGS=$pkg_cv_GIO_CFLAGS + GIO_LIBS=$pkg_cv_GIO_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + dummy=yes +fi + + + + +pkg_failed=no { echo "$as_me:$LINENO: checking for GTK" >&5 echo $ECHO_N "checking for GTK... $ECHO_C" >&6; } @@ -6979,7 +7059,7 @@ fi -ac_config_files="$ac_config_files Makefile icons/Makefile common/Makefile applet/Makefile properties/Makefile wizard/Makefile sendto/Makefile browse/Makefile analyzer/Makefile proximity/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile icons/Makefile common/Makefile applet/Makefile properties/Makefile wizard/Makefile sendto/Makefile browse/Makefile analyzer/Makefile explorer/Makefile proximity/Makefile po/Makefile.in" cat >confcache <<_ACEOF # This file is a shell script that caches the results of configure @@ -7614,6 +7694,7 @@ "sendto/Makefile") CONFIG_FILES="$CONFIG_FILES sendto/Makefile" ;; "browse/Makefile") CONFIG_FILES="$CONFIG_FILES browse/Makefile" ;; "analyzer/Makefile") CONFIG_FILES="$CONFIG_FILES analyzer/Makefile" ;; + "explorer/Makefile") CONFIG_FILES="$CONFIG_FILES explorer/Makefile" ;; "proximity/Makefile") CONFIG_FILES="$CONFIG_FILES proximity/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; @@ -7862,6 +7943,8 @@ DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim DBUS_LIBS!$DBUS_LIBS$ac_delim DBUS_BINDING_TOOL!$DBUS_BINDING_TOOL$ac_delim +GIO_CFLAGS!$GIO_CFLAGS$ac_delim +GIO_LIBS!$GIO_LIBS$ac_delim GTK_CFLAGS!$GTK_CFLAGS$ac_delim GTK_LIBS!$GTK_LIBS$ac_delim GLIB_GENMARSHAL!$GLIB_GENMARSHAL$ac_delim @@ -7873,7 +7956,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim$/X/p" conf$$subs.sed | grep -c X` = 54; then + if test `sed -n "s/.*$ac_delim$/X/p" conf$$subs.sed | grep -c X` = 56; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/configure.ac new/bluez-gnome-1.5/configure.ac --- old/bluez-gnome-1.4/configure.ac 2008-09-13 19:34:11.000000000 +0200 +++ new/bluez-gnome-1.5/configure.ac 2008-09-27 04:57:05.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.50) AC_INIT() -AM_INIT_AUTOMAKE(bluez-gnome, 1.4) +AM_INIT_AUTOMAKE(bluez-gnome, 1.5) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -55,6 +55,11 @@ DBUS_BINDING_TOOL="dbus-binding-tool" AC_SUBST(DBUS_BINDING_TOOL) +PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.16, dummy=yes, + AC_MSG_ERROR(gio >= 2.16 is required)) +AC_SUBST(GIO_CFLAGS) +AC_SUBST(GIO_LIBS) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10, dummy=yes, AC_MSG_ERROR(gtk+ >= 2.10 is required)) AC_SUBST(GTK_CFLAGS) @@ -82,4 +87,4 @@ AC_OUTPUT(Makefile icons/Makefile common/Makefile applet/Makefile properties/Makefile wizard/Makefile sendto/Makefile browse/Makefile analyzer/Makefile - proximity/Makefile po/Makefile.in) + explorer/Makefile proximity/Makefile po/Makefile.in) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/explorer/Makefile.am new/bluez-gnome-1.5/explorer/Makefile.am --- old/bluez-gnome-1.4/explorer/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/bluez-gnome-1.5/explorer/Makefile.am 2008-09-27 04:57:05.000000000 +0200 @@ -0,0 +1,2 @@ + +MAINTAINERCLEANFILES = Makefile.in diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/explorer/Makefile.in new/bluez-gnome-1.5/explorer/Makefile.in --- old/bluez-gnome-1.4/explorer/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/bluez-gnome-1.5/explorer/Makefile.in 2008-09-27 04:57:19.000000000 +0200 @@ -0,0 +1,355 @@ +# Makefile.in generated by automake 1.10.1 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = explorer +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@ +DBUS_CFLAGS = @DBUS_CFLAGS@ +DBUS_LIBS = @DBUS_LIBS@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GCONFTOOL = @GCONFTOOL@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ +GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ +INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ +INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ +INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ +INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ +INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ +INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ +INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ +INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ +INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ +INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ +INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ +INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ +INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +NOTIFY_CFLAGS = @NOTIFY_CFLAGS@ +NOTIFY_LIBS = @NOTIFY_LIBS@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +UPDATE_DESKTOP_DATABASE = @UPDATE_DESKTOP_DATABASE@ +UPDATE_ICON_CACHE = @UPDATE_ICON_CACHE@ +UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +MAINTAINERCLEANFILES = Makefile.in +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu explorer/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu explorer/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\*]/\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\*]/\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '///!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/icons/Makefile.in new/bluez-gnome-1.5/icons/Makefile.in --- old/bluez-gnome-1.4/icons/Makefile.in 2008-09-13 19:34:37.000000000 +0200 +++ new/bluez-gnome-1.5/icons/Makefile.in 2008-09-27 04:57:19.000000000 +0200 @@ -76,6 +76,8 @@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/Makefile.am new/bluez-gnome-1.5/Makefile.am --- old/bluez-gnome-1.4/Makefile.am 2008-09-13 19:34:11.000000000 +0200 +++ new/bluez-gnome-1.5/Makefile.am 2008-09-27 04:57:05.000000000 +0200 @@ -1,6 +1,6 @@ -SUBDIRS = po icons common \ - applet properties wizard sendto browse analyzer proximity +SUBDIRS = po icons common applet properties wizard \ + sendto browse analyzer explorer proximity EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/Makefile.in new/bluez-gnome-1.5/Makefile.in --- old/bluez-gnome-1.4/Makefile.in 2008-09-13 19:34:38.000000000 +0200 +++ new/bluez-gnome-1.5/Makefile.in 2008-09-27 04:57:20.000000000 +0200 @@ -101,6 +101,8 @@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -214,8 +216,8 @@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = po icons common \ - applet properties wizard sendto browse analyzer proximity +SUBDIRS = po icons common applet properties wizard \ + sendto browse analyzer explorer proximity EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/properties/Makefile.in new/bluez-gnome-1.5/properties/Makefile.in --- old/bluez-gnome-1.4/properties/Makefile.in 2008-09-13 19:34:37.000000000 +0200 +++ new/bluez-gnome-1.5/properties/Makefile.in 2008-09-27 04:57:20.000000000 +0200 @@ -107,6 +107,8 @@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/proximity/Makefile.in new/bluez-gnome-1.5/proximity/Makefile.in --- old/bluez-gnome-1.4/proximity/Makefile.in 2008-09-13 19:34:38.000000000 +0200 +++ new/bluez-gnome-1.5/proximity/Makefile.in 2008-09-27 04:57:20.000000000 +0200 @@ -74,6 +74,8 @@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/sendto/main.c new/bluez-gnome-1.5/sendto/main.c --- old/bluez-gnome-1.4/sendto/main.c 2008-09-13 19:34:11.000000000 +0200 +++ new/bluez-gnome-1.5/sendto/main.c 2008-09-27 04:57:05.000000000 +0200 @@ -29,6 +29,7 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> +#include <gio/gio.h> #include <gtk/gtk.h> #include <dbus/dbus-glib.h> @@ -59,6 +60,18 @@ static gint64 first_update = 0; static gint64 last_update = 0; +static gchar *filename_to_path(const gchar *filename) +{ + GFile *file; + gchar *path; + + file = g_file_new_for_commandline_arg(filename); + path = g_file_get_path(file); + g_object_unref(file); + + return path; +} + static gint64 get_system_time(void) { struct timeval tmp; @@ -69,6 +82,44 @@ (gint64) tmp.tv_sec * G_GINT64_CONSTANT(1000000); } +static gchar *format_time(gint seconds) +{ + gint hours, minutes; + + if (seconds < 0) + seconds = 0; + + if (seconds < 60) + return g_strdup_printf(ngettext("%'d second", + "%'d seconds", seconds), seconds); + + if (seconds < 60 * 60) { + minutes = (seconds + 30) / 60; + return g_strdup_printf(ngettext("%'d minute", + "%'d minutes", minutes), minutes); + } + + hours = seconds / (60 * 60); + + if (seconds < 60 * 60 * 4) { + gchar *res, *h, *m; + + minutes = (seconds - hours * 60 * 60 + 30) / 60; + + h = g_strdup_printf(ngettext("%'d hour", + "%'d hours", hours), hours); + m = g_strdup_printf(ngettext("%'d minute", + "%'d minutes", minutes), minutes); + res = g_strconcat(h, ", ", m, NULL); + g_free(h); + g_free(m); + return res; + } + + return g_strdup_printf(ngettext("approximately %'d hour", + "approximately %'d hours", hours), hours); +} + static void response_callback(GtkWidget *dialog, gint response, gpointer user_data) { @@ -265,14 +316,7 @@ remaining_time = (total_size - current_sent) / transfer_rate; - if (remaining_time >= 3600) - time = g_strdup_printf(_("%d:%02d:%02d Remaining"), - remaining_time / 3600, - (remaining_time % 3600) / 60, - (remaining_time % 3600) % 60); - else - time = g_strdup_printf(_("%d:%02d Remaining"), - remaining_time / 60, remaining_time % 60); + time = format_time(remaining_time); if (transfer_rate >= 3000) rate = g_strdup_printf(_("%d KB/s"), transfer_rate / 1000); @@ -415,51 +459,83 @@ G_TYPE_INVALID); } +static gchar *get_name(DBusGProxy *device) +{ + GHashTable *hash; + + if (dbus_g_proxy_call(device, "GetProperties", NULL, + G_TYPE_INVALID, dbus_g_type_get_map("GHashTable", + G_TYPE_STRING, G_TYPE_VALUE), + &hash, G_TYPE_INVALID) != FALSE) { + GValue *value; + gchar *name; + + value = g_hash_table_lookup(hash, "Name"); + name = value ? g_value_dup_string(value) : NULL; + g_hash_table_destroy(hash); + + return name; + } + + return NULL; +} + static gchar *get_device_name(const gchar *address) { DBusGConnection *connection; - DBusGProxy *manager, *proxy; - gchar *adapter, *name; + DBusGProxy *manager; + GPtrArray *adapters; + gchar *name; + guint i; + + name = NULL; connection = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL); if (connection == NULL) - return NULL; + return name; manager = dbus_g_proxy_new_for_name(connection, "org.bluez", - "/org/bluez", "org.bluez.Manager"); + "/", "org.bluez.Manager"); if (manager == NULL) { dbus_g_connection_unref(connection); - return NULL; + return name; } - if (dbus_g_proxy_call(manager, "DefaultAdapter", NULL, G_TYPE_INVALID, - G_TYPE_STRING, &adapter, G_TYPE_INVALID) == FALSE) { + if (dbus_g_proxy_call(manager, "ListAdapters", NULL, + G_TYPE_INVALID, dbus_g_type_get_collection("GPtrArray", + DBUS_TYPE_G_OBJECT_PATH), + &adapters, G_TYPE_INVALID) == FALSE) { g_object_unref(manager); dbus_g_connection_unref(connection); - return NULL; + return name; } - g_object_unref(manager); + for (i = 0; i < adapters->len && name == NULL; i++) { + DBusGProxy *adapter; + char *device_path; + + adapter = dbus_g_proxy_new_for_name(connection, "org.bluez", + g_ptr_array_index(adapters, i), + "org.bluez.Adapter"); + + if (dbus_g_proxy_call(adapter, "FindDevice", NULL, + G_TYPE_STRING, address, G_TYPE_INVALID, + DBUS_TYPE_G_OBJECT_PATH, &device_path, + G_TYPE_INVALID) == TRUE) { + DBusGProxy *device; + device = dbus_g_proxy_new_for_name(connection, + "org.bluez", device_path, + "org.bluez.Device"); + name = get_name(device); + g_object_unref(device); + break; + } - proxy = dbus_g_proxy_new_for_name(connection, "org.bluez", - adapter, "org.bluez.Adapter"); - if (proxy == NULL) { - g_free(adapter); - dbus_g_connection_unref(connection); - return NULL; + g_object_unref(adapter); } - g_free(adapter); - - if (dbus_g_proxy_call(proxy, "GetRemoteName", NULL, - G_TYPE_STRING, address, G_TYPE_INVALID, - G_TYPE_STRING, &name, G_TYPE_INVALID) == FALSE) { - g_object_unref(proxy); - dbus_g_connection_unref(connection); - return NULL; - } - - g_object_unref(proxy); + g_ptr_array_free(adapters, TRUE); + g_object_unref(manager); dbus_g_connection_unref(connection); @@ -525,17 +601,10 @@ file_count = g_strv_length(option_files); for (i = 0; i < file_count; i++) { - gchar *filename = NULL; + gchar *filename; struct stat st; - if (g_str_has_prefix(option_files[i], "file://") == TRUE) { - filename = g_filename_from_uri(option_files[i], - NULL, NULL); - } else if (option_files[i][0] != '/') { - gchar *dir = g_get_current_dir(); - filename = g_build_filename(dir, option_files[i], NULL); - g_free(dir); - } + filename = filename_to_path(option_files[i]); if (filename != NULL) { g_free(option_files[i]); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/sendto/Makefile.am new/bluez-gnome-1.5/sendto/Makefile.am --- old/bluez-gnome-1.4/sendto/Makefile.am 2008-09-13 19:34:11.000000000 +0200 +++ new/bluez-gnome-1.5/sendto/Makefile.am 2008-09-27 04:57:05.000000000 +0200 @@ -4,9 +4,9 @@ bluetooth_sendto_SOURCES = main.c bluetooth_sendto_LDADD = $(top_builddir)/common/libcommon.a \ - @GTK_LIBS@ @DBUS_LIBS@ + @GTK_LIBS@ @GIO_LIBS@ @DBUS_LIBS@ -AM_CFLAGS = @DBUS_CFLAGS@ @GTK_CFLAGS@ +AM_CFLAGS = @DBUS_CFLAGS@ @GIO_CFLAGS@ @GTK_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/sendto/Makefile.in new/bluez-gnome-1.5/sendto/Makefile.in --- old/bluez-gnome-1.4/sendto/Makefile.in 2008-09-13 19:34:38.000000000 +0200 +++ new/bluez-gnome-1.5/sendto/Makefile.in 2008-09-27 04:57:20.000000000 +0200 @@ -94,6 +94,8 @@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -209,9 +211,9 @@ top_srcdir = @top_srcdir@ bluetooth_sendto_SOURCES = main.c bluetooth_sendto_LDADD = $(top_builddir)/common/libcommon.a \ - @GTK_LIBS@ @DBUS_LIBS@ + @GTK_LIBS@ @GIO_LIBS@ @DBUS_LIBS@ -AM_CFLAGS = @DBUS_CFLAGS@ @GTK_CFLAGS@ +AM_CFLAGS = @DBUS_CFLAGS@ @GIO_CFLAGS@ @GTK_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_builddir)/common man_MANS = bluetooth-sendto.1 EXTRA_DIST = $(man_MANS) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/bluez-gnome-1.4/wizard/Makefile.in new/bluez-gnome-1.5/wizard/Makefile.in --- old/bluez-gnome-1.4/wizard/Makefile.in 2008-09-13 19:34:38.000000000 +0200 +++ new/bluez-gnome-1.5/wizard/Makefile.in 2008-09-27 04:57:20.000000000 +0200 @@ -94,6 +94,8 @@ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GIO_CFLAGS = @GIO_CFLAGS@ +GIO_LIBS = @GIO_LIBS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org