Merge into trunk : contact-default-icon : Code : Ubuntu One Client

Status:

Merged

Approved by:

dobey on 2010-06-03

Approved revision:

528

Merged at revision:

530

Proposed branch:

lp://staging/~rodrigo-moya/ubuntuone-client/contact-default-icon

Merge into:

lp://staging/ubuntuone-client

Diff against target:

28 lines (+3/-3)

1 file modified

nautilus/contacts-view.c (+3/-3)

To merge this branch:

bzr merge lp://staging/~rodrigo-moya/ubuntuone-client/contact-default-icon

Undecided

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Rick McBride (community)		Approve on 2010-06-02
Roman Yepishev (community)	2010-06-02	Approve on 2010-06-02
Review via email: mp+26571@code.staging.launchpad.net

Commit message

Use contact icon from icon theme for contacts that have no photo

Description of the change

Use contact icon from icon theme for contacts that have no photo

Revision history for this message

Roman Yepishev (rye) wrote on 2010-06-02:

#

Before: http://ubuntuone.com/p/5pA/
After: http://ubuntuone.com/p/5p8/

Looks changed, so approving.

review: Approve

Revision history for this message

Rick McBride (rmcbride) wrote on 2010-06-02:

#

+1

review: Approve

Revision history for this message

dobey (dobey) wrote on 2010-06-03:

#

Download full text (24.9 KiB)

The attempt to merge lp:~rodrigo-moya/ubuntuone-client/contact-default-icon into lp:ubuntuone-client failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
[1mchecking for autoconf >= 2.53...
[m(B testing autoconf2.50... not found.
testing autoconf... found 2.65
[1mchecking for automake >= 1.10...
[m(B testing automake-1.11... found 1.11.1
[1mchecking for libtool >= 1.5...
[m(B testing libtoolize... found 2.2.6b
[1mchecking for intltool >= 0.30...
[m(B testing intltoolize... found 0.41.0
[1mchecking for pkg-config >= 0.14.0...
[m(B testing pkg-config... found 0.22
[1mChecking for required M4 macros...
[m(B[1mChecking for forbidden M4 macros...
[m(B[1mProcessing ./configure.ac
[m(B[1mRunning libtoolize...
[m(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
[1mRunning intltoolize...
[m(B[1mRunning aclocal-1.11...
[m(B[1mRunning autoconf...
[m(B[1mRunning autoheader...
[m(B[1mRunning automake-1.11...
[m(B[1mRunning ./configure --with-protocol=/var/cache/tarmac/ubuntuone-storage-protocol/trunk ...
[m(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld ...

The attempt to merge lp:~rodrigo-moya/ubuntuone-client/contact-default-icon into lp:ubuntuone-client failed.Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
[1mchecking for autoconf >= 2.53...
[m(B  testing autoconf2.50... not found.
  testing autoconf... found 2.65
[1mchecking for automake >= 1.10...
[m(B  testing automake-1.11... found 1.11.1
[1mchecking for libtool >= 1.5...
[m(B  testing libtoolize... found 2.2.6b
[1mchecking for intltool >= 0.30...
[m(B  testing intltoolize... found 0.41.0
[1mchecking for pkg-config >= 0.14.0...
[m(B  testing pkg-config... found 0.22
[1mChecking for required M4 macros...
[m(B[1mChecking for forbidden M4 macros...
[m(B[1mProcessing ./configure.ac
[m(B[1mRunning libtoolize...
[m(Blibtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
[1mRunning intltoolize...
[m(B[1mRunning aclocal-1.11...
[m(B[1mRunning autoconf...
[m(B[1mRunning autoheader...
[m(B[1mRunning automake-1.11...
[m(B[1mRunning ./configure --with-protocol=/var/cache/tarmac/ubuntuone-storage-protocol/trunk ...
[m(Bchecking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables... 
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking how to run the C preprocessor... gcc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking for dlfcn.h... yes
checking for objdir... .libs
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC -DPIC
checking if gcc PIC flag -fPIC -DPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking if gcc supports -c -o file.o... (cached) yes
checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... yes
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.19... yes
checking whether NLS is requested... yes
checking for intltool >= 0.40.0... 0.41.0 found
checking for intltool-update... /usr/local/bin/intltool-update
checking for intltool-merge... /usr/local/bin/intltool-merge
checking for intltool-extract... /usr/local/bin/intltool-extract
checking for xgettext... /usr/bin/xgettext
checking for msgmerge... /usr/bin/msgmerge
checking for msgfmt... /usr/bin/msgfmt
checking for gmsgfmt... /usr/bin/msgfmt
checking for perl... /usr/bin/perl
checking for perl >= 5.8.1... 5.10.1
checking for XML::Parser... ok
checking for lndir... /usr/bin/lndir
checking for icontool-render... /usr/bin/icontool-render
checking development series build... yes
checking for a Python interpreter with version >= 2.5... python
checking for python... /usr/bin/python
checking for python version... 2.6
checking for python platform... linux2
checking for python script directory... ${prefix}/lib/python2.6/dist-packages
checking for python extension module directory... ${exec_prefix}/lib/python2.6/dist-packages
checking for pycentral... no
checking for ubuntuone-storage-protocol... /var/cache/tarmac/ubuntuone-storage-protocol/trunk/ubuntuone/storageprotocol
checking for NAUTILUS... yes
checking for DBUS... yes
checking for glib-genmarshal... /usr/bin/glib-genmarshal
configure: creating ./config.status
config.status: creating Makefile
config.status: creating data/Makefile
config.status: creating libsyncdaemon/Makefile
config.status: creating nautilus/Makefile
config.status: creating po/Makefile.in
config.status: creating config.h
config.status: config.h is unchanged
config.status: executing depfiles commands
config.status: executing libtool commands
config.status: executing po/stamp-it commands
Now type `make' to compile ubuntuone-client
Making check in data
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
make[1]: Nothing to be done for `check'.
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
Making check in libsyncdaemon
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/libsyncdaemon'
make[1]: Nothing to be done for `check'.
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/libsyncdaemon'
Making check in nautilus
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/nautilus'
/bin/bash ../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I..    -DG_LOG_DOMAIN=\"UbuntuOne-Nautilus\" -DGNOMELOCALEDIR=\""/usr/local/share/locale"\" -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -g -O2 -MT libnautilus_ubuntuone_la-contacts-view.lo -MD -MP -MF .deps/libnautilus_ubuntuone_la-contacts-view.Tpo -c -o libnautilus_ubuntuone_la-contacts-view.lo `test -f 'contacts-view.c' || echo './'`contacts-view.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -DG_LOG_DOMAIN=\"UbuntuOne-Nautilus\" -DGNOMELOCALEDIR=\"/usr/local/share/locale\" -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -g -O2 -MT libnautilus_ubuntuone_la-contacts-view.lo -MD -MP -MF .deps/libnautilus_ubuntuone_la-contacts-view.Tpo -c contacts-view.c  -fPIC -DPIC -o .libs/libnautilus_ubuntuone_la-contacts-view.o
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -DG_LOG_DOMAIN=\"UbuntuOne-Nautilus\" -DGNOMELOCALEDIR=\"/usr/local/share/locale\" -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -g -O2 -MT libnautilus_ubuntuone_la-contacts-view.lo -MD -MP -MF .deps/libnautilus_ubuntuone_la-contacts-view.Tpo -c contacts-view.c -o libnautilus_ubuntuone_la-contacts-view.o >/dev/null 2>&1
mv -f .deps/libnautilus_ubuntuone_la-contacts-view.Tpo .deps/libnautilus_ubuntuone_la-contacts-view.Plo
/bin/bash ../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I..    -DG_LOG_DOMAIN=\"UbuntuOne-Nautilus\" -DGNOMELOCALEDIR=\""/usr/local/share/locale"\" -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -g -O2 -MT libnautilus_ubuntuone_la-u1-contacts-picker.lo -MD -MP -MF .deps/libnautilus_ubuntuone_la-u1-contacts-picker.Tpo -c -o libnautilus_ubuntuone_la-u1-contacts-picker.lo `test -f 'u1-contacts-picker.c' || echo './'`u1-contacts-picker.c
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -DG_LOG_DOMAIN=\"UbuntuOne-Nautilus\" -DGNOMELOCALEDIR=\"/usr/local/share/locale\" -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -g -O2 -MT libnautilus_ubuntuone_la-u1-contacts-picker.lo -MD -MP -MF .deps/libnautilus_ubuntuone_la-u1-contacts-picker.Tpo -c u1-contacts-picker.c  -fPIC -DPIC -o .libs/libnautilus_ubuntuone_la-u1-contacts-picker.o
libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I.. -DG_LOG_DOMAIN=\"UbuntuOne-Nautilus\" -DGNOMELOCALEDIR=\"/usr/local/share/locale\" -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -g -O2 -MT libnautilus_ubuntuone_la-u1-contacts-picker.lo -MD -MP -MF .deps/libnautilus_ubuntuone_la-u1-contacts-picker.Tpo -c u1-contacts-picker.c -o libnautilus_ubuntuone_la-u1-contacts-picker.o >/dev/null 2>&1
mv -f .deps/libnautilus_ubuntuone_la-u1-contacts-picker.Tpo .deps/libnautilus_ubuntuone_la-u1-contacts-picker.Plo
/bin/bash ../libtool --tag=CC   --mode=link gcc -DG_LOG_DOMAIN=\"UbuntuOne-Nautilus\" -DGNOMELOCALEDIR=\""/usr/local/share/locale"\" -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include   -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -g -O2 -no-undefined -avoid-version  -o libnautilus-ubuntuone.la -rpath /usr/local/lib/nautilus/extensions-2.0 libnautilus_ubuntuone_la-contacts-view.lo libnautilus_ubuntuone_la-u1-contacts-picker.lo libnautilus_ubuntuone_la-ubuntuone-marshallers.lo libnautilus_ubuntuone_la-ubuntuone-nautilus.lo -pthread -L/lib -ldbus-glib-1 -ldbus-1 -lpthread -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0   -pthread -lnautilus-extension -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lebook-1.2 -ledataserver-1.2 -lxml2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgobject-2.0 -lgthread-2.0 -lrt -lgconf-2 -lglib-2.0   
libtool: link: rm -fr  .libs/libnautilus-ubuntuone.a .libs/libnautilus-ubuntuone.la .libs/libnautilus-ubuntuone.lai .libs/libnautilus-ubuntuone.so
libtool: link: gcc -shared  .libs/libnautilus_ubuntuone_la-contacts-view.o .libs/libnautilus_ubuntuone_la-u1-contacts-picker.o .libs/libnautilus_ubuntuone_la-ubuntuone-marshallers.o .libs/libnautilus_ubuntuone_la-ubuntuone-nautilus.o   -L/lib -ldbus-glib-1 -ldbus-1 -lpthread -lnautilus-extension /usr/lib/libgtk-x11-2.0.so /usr/lib/libgdk-x11-2.0.so /usr/lib/libatk-1.0.so /usr/lib/libpangoft2-1.0.so /usr/lib/libgdk_pixbuf-2.0.so -lm /usr/lib/libpangocairo-1.0.so /usr/lib/libcairo.so /usr/lib/libpango-1.0.so /usr/lib/libfreetype.so -lfontconfig -lebook-1.2 -ledataserver-1.2 /usr/lib/libxml2.so -lsoup-2.4 /usr/lib/libbonobo-2.so /usr/lib/libgio-2.0.so /usr/lib/libbonobo-activation.so /usr/lib/libgmodule-2.0.so /usr/lib/libORBit-2.so /usr/lib/libgobject-2.0.so /usr/lib/libgthread-2.0.so -lrt /usr/lib/libgconf-2.so /usr/lib/libglib-2.0.so  -pthread -pthread -pthread -pthread   -pthread -Wl,-soname -Wl,libnautilus-ubuntuone.so -o .libs/libnautilus-ubuntuone.so
libtool: link: ar cru .libs/libnautilus-ubuntuone.a  libnautilus_ubuntuone_la-contacts-view.o libnautilus_ubuntuone_la-u1-contacts-picker.o libnautilus_ubuntuone_la-ubuntuone-marshallers.o libnautilus_ubuntuone_la-ubuntuone-nautilus.o
libtool: link: ranlib .libs/libnautilus-ubuntuone.a
libtool: link: ( cd ".libs" && rm -f "libnautilus-ubuntuone.la" && ln -s "../libnautilus-ubuntuone.la" "libnautilus-ubuntuone.la" )
gcc -DHAVE_CONFIG_H -I. -I..    -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -g -O2 -MT test_contacts_picker-contacts-view.o -MD -MP -MF .deps/test_contacts_picker-contacts-view.Tpo -c -o test_contacts_picker-contacts-view.o `test -f 'contacts-view.c' || echo './'`contacts-view.c
mv -f .deps/test_contacts_picker-contacts-view.Tpo .deps/test_contacts_picker-contacts-view.Po
gcc -DHAVE_CONFIG_H -I. -I..    -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -g -O2 -MT test_contacts_picker-u1-contacts-picker.o -MD -MP -MF .deps/test_contacts_picker-u1-contacts-picker.Tpo -c -o test_contacts_picker-u1-contacts-picker.o `test -f 'u1-contacts-picker.c' || echo './'`u1-contacts-picker.c
mv -f .deps/test_contacts_picker-u1-contacts-picker.Tpo .deps/test_contacts_picker-u1-contacts-picker.Po
/bin/bash ../libtool --tag=CC   --mode=link gcc -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -g -O2   -o test-contacts-picker test_contacts_picker-test-contacts-picker.o test_contacts_picker-contacts-view.o test_contacts_picker-u1-contacts-picker.o -pthread -lnautilus-extension -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lebook-1.2 -ledataserver-1.2 -lxml2 -lsoup-2.4 -lbonobo-2 -lgio-2.0 -lbonobo-activation -lgmodule-2.0 -lORBit-2 -lgobject-2.0 -lgthread-2.0 -lrt -lgconf-2 -lglib-2.0   
libtool: link: gcc -pthread -D_REENTRANT -DORBIT2=1 -I/usr/include/nautilus -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/directfb -I/usr/include/libpng12 -I/usr/include/evolution-data-server-2.28 -I/usr/include/libbonobo-2.0 -I/usr/include/orbit-2.0 -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2 -I/usr/include/gconf/2 -I/usr/include/libsoup-2.4 -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -g -O2 -o test-contacts-picker test_contacts_picker-test-contacts-picker.o test_contacts_picker-contacts-view.o test_contacts_picker-u1-contacts-picker.o -pthread  -lnautilus-extension /usr/lib/libgtk-x11-2.0.so /usr/lib/libgdk-x11-2.0.so /usr/lib/libatk-1.0.so /usr/lib/libpangoft2-1.0.so /usr/lib/libgdk_pixbuf-2.0.so -lm /usr/lib/libpangocairo-1.0.so /usr/lib/libcairo.so /usr/lib/libpango-1.0.so /usr/lib/libfreetype.so -lfontconfig -lebook-1.2 -ledataserver-1.2 /usr/lib/libxml2.so -lsoup-2.4 /usr/lib/libbonobo-2.so /usr/lib/libgio-2.0.so /usr/lib/libbonobo-activation.so /usr/lib/libgmodule-2.0.so /usr/lib/libORBit-2.so /usr/lib/libgobject-2.0.so /usr/lib/libgthread-2.0.so -lrt /usr/lib/libgconf-2.so /usr/lib/libglib-2.0.so -pthread
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/nautilus'
Making check in po
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/po'
INTLTOOL_EXTRACT=/usr/local/bin/intltool-extract srcdir=. /usr/local/bin/intltool-update --gettext-package ubuntuone-client --pot
rm -f missing notexist
srcdir=. /usr/local/bin/intltool-update -m
if [ -r missing -o -r notexist ]; then \
	  exit 1; \
	fi
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/po'
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk'
if test "x." != "x."; then \
		/bin/mkdir -p ubuntuone; \
		/bin/mkdir -p tests; \
		(cd ubuntuone && /usr/bin/lndir ./../ubuntuone > /dev/null); \
		(cd tests && /usr/bin/lndir ./../tests > /dev/null); \
	fi
sed -e 's|\@localedir\@|/usr/local/share/locale|g' \
	-e 's|\@libexecdir\@|/usr/local/libexec|g' \
	-e 's|\@GETTEXT_PACKAGE\@|ubuntuone-client|g' \
	-e 's|\@VERSION\@|1.3|g' < ubuntuone/clientdefs.py.in > ubuntuone/clientdefs.py
PROTOCOL="ubuntuone/storageprotocol"; \
	if [ ! -d /var/cache/tarmac/ubuntuone-storage-protocol/trunk/ubuntuone/storageprotocol ]; then \
		echo "ERROR: Not found: /var/cache/tarmac/ubuntuone-storage-protocol/trunk/ubuntuone/storageprotocol"; \
		exit 1; \
	fi; \
	if [ ! -e $PROTOCOL -a ! -h $PROTOCOL ]; then \
		ln -s /var/cache/tarmac/ubuntuone-storage-protocol/trunk/ubuntuone/storageprotocol $PROTOCOL; \
	elif [ ! -e $PROTOCOL -a -h $PROTOCOL ]; then \
		rm -f $PROTOCOL; \
		ln -s /var/cache/tarmac/ubuntuone-storage-protocol/trunk/ubuntuone/storageprotocol $PROTOCOL; \
	fi
if test "x." != "x."; then \
		if [ ! -e pylintrc -a ! -h pylintrc ]; then \
			ln -s ./pylintrc; \
		fi; \
	fi
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk'
PROTOCOL="ubuntuone/storageprotocol"; \
	if [ ! -d /var/cache/tarmac/ubuntuone-storage-protocol/trunk/ubuntuone/storageprotocol ]; then \
		echo "ERROR: Not found: /var/cache/tarmac/ubuntuone-storage-protocol/trunk/ubuntuone/storageprotocol"; \
		exit 1; \
	fi; \
	if [ ! -e $PROTOCOL -a ! -h $PROTOCOL ]; then \
		ln -s /var/cache/tarmac/ubuntuone-storage-protocol/trunk/ubuntuone/storageprotocol $PROTOCOL; \
	elif [ ! -e $PROTOCOL -a -h $PROTOCOL ]; then \
		rm -f $PROTOCOL; \
		ln -s /var/cache/tarmac/ubuntuone-storage-protocol/trunk/ubuntuone/storageprotocol $PROTOCOL; \
	fi
if test "x." != "x."; then \
		if [ ! -e pylintrc -a ! -h pylintrc ]; then \
			ln -s ./pylintrc; \
		fi; \
	fi
PYTHONPATH="".:."" SRCDIR="." USE_PYFLAKES="true" \
	/usr/bin/python ./contrib/pylint-wrapper
make -C data logging.conf
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
make[1]: `logging.conf' is up to date.
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
sed -e 's|\@localedir\@|/usr/local/share/locale|g' \
	-e 's|\@libexecdir\@|/usr/local/libexec|g' \
	-e 's|\@GETTEXT_PACKAGE\@|ubuntuone-client|g' \
	-e 's|\@VERSION\@|1.3|g' < ubuntuone/clientdefs.py.in > ubuntuone/clientdefs.py
if test "x." == "x."; then \
		PYTHONPATH="".:."" /usr/bin/python ./contrib/test; \
	fi

Traceback (most recent call last):
  File "./contrib/test", line 130, in <module>
    TestRunner().run(testpath, options.test, options.loops) 
  File "./contrib/test", line 96, in run
    suite = self._collect_tests(testpath, test_pattern)
  File "./contrib/test", line 59, in _collect_tests
    module_suite = self._load_unittest(path)
  File "./contrib/test", line 23, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/var/cache/tarmac/ubuntuone-client/trunk/tests/test_login.py", line 24, in <module>
    from contrib.testing.testcase import DBusTwistedTestCase, FakeLogin
  File "/var/cache/tarmac/ubuntuone-client/trunk/contrib/testing/testcase.py", line 29, in <module>
    from ubuntuone.syncdaemon import (
  File "/var/cache/tarmac/ubuntuone-client/trunk/ubuntuone/syncdaemon/action_queue.py", line 52, in <module>
    from ubuntuone.storageprotocol import protocol_pb2
ImportError: cannot import name protocol_pb2
make: *** [test] Error 1

Ubuntu One Client

Merge lp://staging/~rodrigo-moya/ubuntuone-client/contact-default-icon into lp://staging/ubuntuone-client

Commit message

Description of the change

Preview Diff

Subscribers