Hello community,
here is the log from the commit of package telepathy-haze for openSUSE:Factory
checked in at Fri Jun 12 18:37:21 CEST 2009.
--------
--- GNOME/telepathy-haze/telepathy-haze.changes 2009-04-05 13:47:56.000000000 +0200
+++ telepathy-haze/telepathy-haze.changes 2009-06-09 14:10:28.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Jun 9 14:09:06 CEST 2009 - vuntz@novell.com
+
+- Update to version 0.3.1:
+ + Enhancements:
+ - Shaved `make` output.
+ - haze.manager has been updated for more recent libpurples.
+ Fixes fdo#17709.
+ + Fixes:
+ - Connection.GetInterfaces() now includes Requests. Fixes
+ fdo#21800.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
telepathy-haze-0.3.0.tar.bz2
New:
----
telepathy-haze-0.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telepathy-haze.spec ++++++
--- /var/tmp/diff_new_pack.qS9439/_old 2009-06-12 18:32:47.000000000 +0200
+++ /var/tmp/diff_new_pack.qS9439/_new 2009-06-12 18:32:47.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package telepathy-haze (Version 0.3.0)
+# spec file for package telepathy-haze (Version 0.3.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -20,7 +20,7 @@
Url: http://telepathy.freedesktop.org/wiki/
Name: telepathy-haze
-Version: 0.3.0
+Version: 0.3.1
Release: 1
License: GPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -67,6 +67,15 @@
%{_mandir}/man8/telepathy-haze.8.gz
%changelog
+* Tue Jun 09 2009 vuntz@novell.com
+- Update to version 0.3.1:
+ + Enhancements:
+ - Shaved `make` output.
+ - haze.manager has been updated for more recent libpurples.
+ Fixes fdo#17709.
+ + Fixes:
+ - Connection.GetInterfaces() now includes Requests. Fixes
+ fdo#21800.
* Sun Apr 05 2009 vuntz@novell.com
- Update to version 0.3.0:
+ Dependencies:
++++++ telepathy-haze-0.3.0.tar.bz2 -> telepathy-haze-0.3.1.tar.bz2 ++++++
++++ 2437 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/configure.ac new/telepathy-haze-0.3.1/configure.ac
--- old/telepathy-haze-0.3.0/configure.ac 2009-04-04 12:23:45.000000000 +0200
+++ new/telepathy-haze-0.3.1/configure.ac 2009-06-05 01:09:59.000000000 +0200
@@ -8,7 +8,7 @@
m4_define([haze_major_version], [0])
m4_define([haze_minor_version], [3])
-m4_define([haze_micro_version], [0])
+m4_define([haze_micro_version], [1])
m4_define([haze_nano_version], [0])
m4_define([haze_base_version],
@@ -91,6 +91,8 @@
#AC_SUBST(DBUS_SERVICES_DIR)
#AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [DBus services directory])
+SHAVE_INIT(.)
+
AC_OUTPUT([Makefile
src/Makefile
data/Makefile
@@ -98,4 +100,6 @@
tests/Makefile
tests/twisted/Makefile
tools/Makefile
+ shave
+ shave-libtool
])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/data/haze.manager new/telepathy-haze-0.3.1/data/haze.manager
--- old/telepathy-haze-0.3.0/data/haze.manager 2008-11-10 17:06:58.000000000 +0100
+++ new/telepathy-haze-0.3.1/data/haze.manager 2009-06-05 00:46:57.000000000 +0200
@@ -7,10 +7,14 @@
param-password=s required
param-server=s
param-port=i
+param-use_ssl=b
param-always-use-rv-proxy=b
+param-allow_multiple_logins=b
default-server=login.messaging.aol.com
default-port=5190
+default-use_ssl=false
default-always-use-rv-proxy=false
+default-allow_multiple_logins=true
[Protocol gadugadu]
param-account=s required
@@ -30,11 +34,15 @@
param-password=s required
param-server=s
param-port=i
+param-use_ssl=b
param-always-use-rv-proxy=b
+param-allow_multiple_logins=b
param-charset=s
default-server=login.messaging.aol.com
default-port=5190
+default-use_ssl=false
default-always-use-rv-proxy=false
+default-allow_multiple_logins=true
default-charset=UTF-8
[Protocol irc]
@@ -42,11 +50,13 @@
param-password=s
param-port=i
param-charset=s
+param-autodetect_utf8=b
param-username=s
param-realname=s
param-ssl=b
default-port=6667
default-charset=UTF-8
+default-autodetect_utf8=false
default-ssl=false
[Protocol jabber]
@@ -58,19 +68,23 @@
param-port=i
param-server=s
param-ft-proxies=s
+param-custom_smileys=b
default-require-encryption=false
default-old-ssl=false
default-auth-plain-in-clear=false
default-port=5222
-default-ft-proxies=proxy.jabber.org:7777
+default-ft-proxies=proxy.jabber.org
+default-custom_smileys=true
[Protocol local-xmpp]
param-account=s required
+param-port=i
param-first-name=s required
param-last-name=s required
param-email=s
param-AIM=s
param-jid=s
+default-port=5298
[Protocol msn]
param-account=s required
@@ -97,10 +111,22 @@
[Protocol qq]
param-account=s required
param-password=s required
-param-use-tcp=b
param-server=s
-param-port=s
-default-use-tcp=false
+param-client_version=s
+param-use-tcp=b
+param-show_notice=b
+param-show_news=b
+param-show_chat=b
+param-keep_alive_interval=i
+param-update_interval=i
+default-server=auto
+default-client_version=qq2005
+default-use-tcp=true
+default-show_notice=true
+default-show_news=true
+default-show_chat=true
+default-keep_alive_interval=60
+default-update_interval=300
[Protocol sametime]
param-account=s required
@@ -113,32 +139,6 @@
default-force-login=false
default-fake-client-id=false
-[Protocol silc]
-param-account=s required
-param-password=s
-param-server=s
-param-port=i
-param-public-key=s
-param-private-key=s
-param-cipher=s
-param-hmac=s
-param-pfs=b
-param-pubkey-auth=b
-param-block-ims=b
-param-block-wb=b
-param-open-wb=b
-param-sign-verify=b
-default-server=silc.silcnet.org
-default-port=706
-default-cipher=aes-256-ctr
-default-hmac=hmac-sha256-96
-default-pfs=false
-default-pubkey-auth=false
-default-block-ims=false
-default-block-wb=false
-default-open-wb=false
-default-sign-verify=false
-
[Protocol simple]
param-account=s required
param-password=s required
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/data/Makefile.am new/telepathy-haze-0.3.1/data/Makefile.am
--- old/telepathy-haze-0.3.0/data/Makefile.am 2009-03-01 18:27:48.000000000 +0100
+++ new/telepathy-haze-0.3.1/data/Makefile.am 2009-06-05 00:47:29.000000000 +0200
@@ -1,3 +1,5 @@
+include $(top_srcdir)/tools/shave.mk
+
# Telepathy manager file
managerdir = $(datadir)/telepathy/managers
dist_manager_DATA = haze.manager
@@ -15,4 +17,4 @@
# Rule to make the service file with libexecdir expanded
$(service_DATA): $(service_in_files) Makefile
- @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ $(QUIET_GEN)sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/INSTALL new/telepathy-haze-0.3.1/INSTALL
--- old/telepathy-haze-0.3.0/INSTALL 2009-03-30 00:34:38.000000000 +0200
+++ new/telepathy-haze-0.3.1/INSTALL 2009-06-05 01:00:40.000000000 +0200
@@ -2,15 +2,15 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-Briefly, the shell commands `./configure; make; make install' should
+ Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
@@ -73,9 +73,9 @@
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -88,7 +88,7 @@
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
@@ -100,10 +100,24 @@
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
Installation Names
==================
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
@@ -126,7 +140,7 @@
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -138,14 +152,36 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -171,9 +207,9 @@
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -182,7 +218,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -201,11 +237,19 @@
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
`--version'
`-V'
@@ -232,6 +276,16 @@
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/m4/libtool.m4 new/telepathy-haze-0.3.1/m4/libtool.m4
--- old/telepathy-haze-0.3.0/m4/libtool.m4 2009-03-30 00:34:25.000000000 +0200
+++ new/telepathy-haze-0.3.1/m4/libtool.m4 2009-06-05 01:00:33.000000000 +0200
@@ -4261,6 +4261,9 @@
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/m4/Makefile.am new/telepathy-haze-0.3.1/m4/Makefile.am
--- old/telepathy-haze-0.3.0/m4/Makefile.am 2009-03-01 18:30:04.000000000 +0100
+++ new/telepathy-haze-0.3.1/m4/Makefile.am 2009-06-05 00:47:29.000000000 +0200
@@ -1,4 +1,5 @@
EXTRA_DIST = \
as-ac-expand.m4 \
as-compiler-flag.m4 \
-tp-compiler-warnings.m4
+tp-compiler-warnings.m4 \
+shave.m4
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/m4/shave.m4 new/telepathy-haze-0.3.1/m4/shave.m4
--- old/telepathy-haze-0.3.0/m4/shave.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/telepathy-haze-0.3.1/m4/shave.m4 2009-06-05 00:47:29.000000000 +0200
@@ -0,0 +1,77 @@
+dnl Make automake/libtool output more friendly to humans
+dnl Damien Lespiau
+dnl
+dnl SHAVE_INIT([shavedir],[default_mode])
+dnl
+dnl shavedir: the directory where the shave scripts are, it defaults to
+dnl $(top_builddir)
+dnl default_mode: (enable|disable) default shave mode. This parameter
+dnl controls shave's behaviour when no option has been
+dnl given to configure. It defaults to disable.
+dnl
+dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just
+dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and
+dnl LIBTOOL, you don't want the configure tests to have these variables
+dnl re-defined.
+dnl * This macro requires GNU make's -s option.
+
+AC_DEFUN([_SHAVE_ARG_ENABLE],
+[
+ AC_ARG_ENABLE([shave],
+ AS_HELP_STRING(
+ [--enable-shave],
+ [use shave to make the build pretty [[default=$1]]]),,
+ [enable_shave=$1]
+ )
+])
+
+AC_DEFUN([SHAVE_INIT],
+[
+ dnl you can tweak the default value of enable_shave
+ m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)])
+
+ if test x"$enable_shave" = xyes; then
+ dnl where can we find the shave scripts?
+ m4_if([$1],,
+ [shavedir="$ac_pwd"],
+ [shavedir="$ac_pwd/$1"])
+ AC_SUBST(shavedir)
+
+ dnl make is now quiet
+ AC_SUBST([MAKEFLAGS], [-s])
+ AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`'])
+
+ dnl we need sed
+ AC_CHECK_PROG(SED,sed,sed,false)
+
+ dnl substitute libtool
+ SHAVE_SAVED_LIBTOOL=$LIBTOOL
+ LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'"
+ AC_SUBST(LIBTOOL)
+
+ dnl substitute cc/cxx
+ SHAVE_SAVED_CC=$CC
+ SHAVE_SAVED_CXX=$CXX
+ SHAVE_SAVED_FC=$FC
+ SHAVE_SAVED_F77=$F77
+ SHAVE_SAVED_OBJC=$OBJC
+ CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}"
+ CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}"
+ FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}"
+ F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}"
+ OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}"
+ AC_SUBST(CC)
+ AC_SUBST(CXX)
+ AC_SUBST(FC)
+ AC_SUBST(F77)
+ AC_SUBST(OBJC)
+
+ V=@
+ else
+ V=1
+ fi
+ Q='$(V:1=)'
+ AC_SUBST(V)
+ AC_SUBST(Q)
+])
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/NEWS new/telepathy-haze-0.3.1/NEWS
--- old/telepathy-haze-0.3.0/NEWS 2009-04-04 12:23:45.000000000 +0200
+++ new/telepathy-haze-0.3.1/NEWS 2009-06-05 01:09:59.000000000 +0200
@@ -1,3 +1,20 @@
+telepathy-haze 0.3.1 (2009-06-05)
+=================================
+
+The “man3 encounters player, who quotes Hayek” release.
+
+Enhancements:
+
+ * Shaved `make` output, courtesy of Jonny Lamb. This is disabled by
+ default; ./configure --enable-shave to enable it.
+
+ * haze.manager has been updated for more recent libpurples. Fixes
+ fd.o#17709.
+
+Fixes:
+
+ * Connection.GetInterfaces() now includes Requests. Fixes fd.o#21800.
+
telepathy-haze 0.3.0 (2009-04-04)
=================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/shave.in new/telepathy-haze-0.3.1/shave.in
--- old/telepathy-haze-0.3.0/shave.in 1970-01-01 01:00:00.000000000 +0100
+++ new/telepathy-haze-0.3.1/shave.in 2009-06-05 00:47:29.000000000 +0200
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+# we need sed
+SED=@SED@
+if test -z "$SED" ; then
+SED=sed
+fi
+
+lt_unmangle ()
+{
+ last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
+}
+
+# the tool to wrap (cc, cxx, ar, ranlib, ..)
+tool="$1"
+shift
+
+# the reel tool (to call)
+REEL_TOOL="$1"
+shift
+
+pass_through=0
+preserved_args=
+while test "$#" -gt 0; do
+ opt="$1"
+ shift
+
+ case $opt in
+ --shave-mode=*)
+ mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
+ ;;
+ -o)
+ lt_output="$1"
+ preserved_args="$preserved_args $opt"
+ ;;
+ *)
+ preserved_args="$preserved_args $opt"
+ ;;
+ esac
+done
+
+# mode=link is handled in the libtool wrapper
+case "$mode,$tool" in
+link,*)
+ pass_through=1
+ ;;
+*,cxx)
+ Q=" CXX "
+ ;;
+*,cc)
+ Q=" CC "
+ ;;
+*,fc)
+ Q=" FC "
+ ;;
+*,f77)
+ Q=" F77 "
+ ;;
+*,objc)
+ Q=" OBJC "
+ ;;
+*,*)
+ # should not happen
+ Q=" CC "
+ ;;
+esac
+
+lt_unmangle "$lt_output"
+output=$last_result
+
+if test -z $V; then
+ if test $pass_through -eq 0; then
+ echo "$Q$output"
+ fi
+ $REEL_TOOL $preserved_args
+else
+ echo $REEL_TOOL $preserved_args
+ $REEL_TOOL $preserved_args
+fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/shave-libtool.in new/telepathy-haze-0.3.1/shave-libtool.in
--- old/telepathy-haze-0.3.0/shave-libtool.in 1970-01-01 01:00:00.000000000 +0100
+++ new/telepathy-haze-0.3.1/shave-libtool.in 2009-06-05 00:47:29.000000000 +0200
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# we need sed
+SED=@SED@
+if test -z "$SED" ; then
+SED=sed
+fi
+
+lt_unmangle ()
+{
+ last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'`
+}
+
+# the real libtool to use
+LIBTOOL="$1"
+shift
+
+# if 1, don't print anything, the underlaying wrapper will do it
+pass_though=0
+
+# scan the arguments, keep the right ones for libtool, and discover the mode
+preserved_args=
+while test "$#" -gt 0; do
+ opt="$1"
+ shift
+
+ case $opt in
+ --mode=*)
+ mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'`
+ preserved_args="$preserved_args $opt"
+ ;;
+ -o)
+ lt_output="$1"
+ preserved_args="$preserved_args $opt"
+ ;;
+ *)
+ preserved_args="$preserved_args $opt"
+ ;;
+ esac
+done
+
+case "$mode" in
+compile)
+ # shave will be called and print the actual CC/CXX/LINK line
+ preserved_args="$preserved_args --shave-mode=$mode"
+ pass_though=1
+ ;;
+link)
+ preserved_args="$preserved_args --shave-mode=$mode"
+ Q=" LINK "
+ ;;
+*)
+ # let's u
+ # echo "*** libtool: Unimplemented mode: $mode, fill a bug report"
+ ;;
+esac
+
+lt_unmangle "$lt_output"
+output=$last_result
+
+if test -z $V; then
+ if test $pass_though -eq 0; then
+ echo "$Q$output"
+ fi
+ $LIBTOOL --silent $preserved_args
+else
+ echo $LIBTOOL $preserved_args
+ $LIBTOOL $preserved_args
+fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/src/connection.c new/telepathy-haze-0.3.1/src/connection.c
--- old/telepathy-haze-0.3.0/src/connection.c 2009-03-30 14:10:00.000000000 +0200
+++ new/telepathy-haze-0.3.1/src/connection.c 2009-06-05 00:46:57.000000000 +0200
@@ -550,6 +550,7 @@
TpBaseConnectionClass *base_class = TP_BASE_CONNECTION_CLASS (klass);
GParamSpec *param_spec;
static const gchar *interfaces_always_present[] = {
+ TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
TP_IFACE_CONNECTION_INTERFACE_PRESENCE,
TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE,
TP_IFACE_CONNECTION_INTERFACE_CONTACTS,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/src/Makefile.am new/telepathy-haze-0.3.1/src/Makefile.am
--- old/telepathy-haze-0.3.0/src/Makefile.am 2009-03-01 18:30:04.000000000 +0100
+++ new/telepathy-haze-0.3.1/src/Makefile.am 2009-06-05 00:47:29.000000000 +0200
@@ -1,9 +1,11 @@
+include $(top_srcdir)/tools/shave.mk
+
libexec_PROGRAMS = telepathy-haze
man_MANS = telepathy-haze.8
%.8: %.8.in Makefile
- sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@
+ $(QUIET_GEN)sed -e 's,[@]libexecdir[@],@libexecdir@,' < $< > $@
EXTRA_DIST = telepathy-haze.8.in
CLEANFILES = $(man_MANS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/tests/Makefile.am new/telepathy-haze-0.3.1/tests/Makefile.am
--- old/telepathy-haze-0.3.0/tests/Makefile.am 2009-03-22 10:59:31.000000000 +0100
+++ new/telepathy-haze-0.3.1/tests/Makefile.am 2009-06-05 00:47:29.000000000 +0200
@@ -1,3 +1,5 @@
+include $(top_srcdir)/tools/shave.mk
+
SUBDIRS = .
if WANT_TWISTED_TESTS
@@ -5,13 +7,13 @@
endif
%.conf: %.conf.in
- sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
+ $(QUIET_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" $< > $@
# We don't use the full filename for the .in because > 99 character filenames
# in tarballs are non-portable (and automake 1.8 doesn't let us build
# non-archaic tarballs)
org.freedesktop.Telepathy.ConnectionManager.%.service: %.service.in
- sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
+ $(QUIET_GEN)sed -e "s|[@]abs_top_builddir[@]|@abs_top_builddir@|g" \
-e "s|[@]abs_top_srcdir[@]|@abs_top_srcdir@|g" $< > $@
# D-Bus service file for testing
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/tools/Makefile.am new/telepathy-haze-0.3.1/tools/Makefile.am
--- old/telepathy-haze-0.3.0/tools/Makefile.am 2009-03-22 10:59:31.000000000 +0100
+++ new/telepathy-haze-0.3.1/tools/Makefile.am 2009-06-05 00:47:29.000000000 +0200
@@ -1,5 +1,6 @@
EXTRA_DIST = \
- with-session-bus.sh
+ with-session-bus.sh \
+ shave.mk
all: $(EXTRA_DIST)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.0/tools/shave.mk new/telepathy-haze-0.3.1/tools/shave.mk
--- old/telepathy-haze-0.3.0/tools/shave.mk 1970-01-01 01:00:00.000000000 +0100
+++ new/telepathy-haze-0.3.1/tools/shave.mk 2009-06-05 00:47:29.000000000 +0200
@@ -0,0 +1 @@
+QUIET_GEN = $(Q:@=@echo ' GEN '$@;)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org