Merge lp://staging/~dobey/ubuntuone-client/slay-the-C-beast into lp://staging/ubuntuone-client

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 1396
Merged at revision: 1396
Proposed branch: lp://staging/~dobey/ubuntuone-client/slay-the-C-beast
Merge into: lp://staging/ubuntuone-client
Diff against target: 8810 lines (+7/-8515)
48 files modified (+1/-1) (+1/-1) (+5/-52)
docs/ (+0/-1)
docs/reference/ (+0/-62)
docs/reference/libsyncdaemon-docs.sgml (+0/-48)
libsyncdaemon/ (+0/-114)
libsyncdaemon/ (+0/-11)
libsyncdaemon/libsyncdaemon.h (+0/-50)
libsyncdaemon/syncdaemon-authentication.c (+0/-298)
libsyncdaemon/syncdaemon-authentication.h (+0/-75)
libsyncdaemon/syncdaemon-config-interface.c (+0/-276)
libsyncdaemon/syncdaemon-config-interface.h (+0/-83)
libsyncdaemon/syncdaemon-credentials.c (+0/-215)
libsyncdaemon/syncdaemon-credentials.h (+0/-75)
libsyncdaemon/syncdaemon-daemon.c (+0/-1477)
libsyncdaemon/syncdaemon-daemon.h (+0/-172)
libsyncdaemon/syncdaemon-events-interface.c (+0/-130)
libsyncdaemon/syncdaemon-events-interface.h (+0/-71)
libsyncdaemon/syncdaemon-file-info.c (+0/-236)
libsyncdaemon/syncdaemon-file-info.h (+0/-78)
libsyncdaemon/syncdaemon-filesystem-interface.c (+0/-190)
libsyncdaemon/syncdaemon-filesystem-interface.h (+0/-84)
libsyncdaemon/syncdaemon-folder-info.c (+0/-176)
libsyncdaemon/syncdaemon-folder-info.h (+0/-73)
libsyncdaemon/syncdaemon-folders-interface.c (+0/-494)
libsyncdaemon/syncdaemon-folders-interface.h (+0/-76)
libsyncdaemon/syncdaemon-interface.c (+0/-274)
libsyncdaemon/syncdaemon-interface.h (+0/-70)
libsyncdaemon/syncdaemon-marshal.list (+0/-5)
libsyncdaemon/syncdaemon-metadata.c (+0/-284)
libsyncdaemon/syncdaemon-metadata.h (+0/-79)
libsyncdaemon/syncdaemon-publicfiles-interface.c (+0/-259)
libsyncdaemon/syncdaemon-publicfiles-interface.h (+0/-73)
libsyncdaemon/syncdaemon-share-info.c (+0/-357)
libsyncdaemon/syncdaemon-share-info.h (+0/-91)
libsyncdaemon/syncdaemon-shares-interface.c (+0/-497)
libsyncdaemon/syncdaemon-shares-interface.h (+0/-79)
libsyncdaemon/syncdaemon-status-info.c (+0/-259)
libsyncdaemon/syncdaemon-status-info.h (+0/-80)
libsyncdaemon/syncdaemon-status-interface.c (+0/-448)
libsyncdaemon/syncdaemon-status-interface.h (+0/-71)
libsyncdaemon/syncdaemon-transfer-info.c (+0/-247)
libsyncdaemon/syncdaemon-transfer-info.h (+0/-78)
libsyncdaemon/test-libsyncdaemon.c (+0/-536)
libsyncdaemon/utils.c (+0/-60)
libsyncdaemon/utils.h (+0/-48)
po/ (+0/-1)
To merge this branch: bzr merge lp://staging/~dobey/ubuntuone-client/slay-the-C-beast
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve
Mike McCracken (community) Approve
Review via email:

Commit message

Drop libsyncdaemon from the tree.

Description of the change

This branch removes libsyncdaemon and the necessary related parts from the tree and build. It doesn't move away from autotools yet, as that is a very large change, and would be best done in a branch after this.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) :
review: Approve
Revision history for this message
Brian Curtin (brian.curtin) wrote :

Looks good.

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (3.3 KiB)

The attempt to merge lp:~dobey/ubuntuone-client/slay-the-C-beast into lp:ubuntuone-client failed. Below is the output from the failed tests.

checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.69
checking for automake >= 1.10...
  testing automake-1.12... not found.
  testing automake-1.11... found 1.11.6
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./
Running intltoolize...
Running aclocal-1.11...
Running autoconf...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking 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 how to create a ustar tar archive... gnutar
checking whether make supports nested variables... yes
checking whether NLS is requested... 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... none
checking for intltool >= 0.40.0... 0.50.2 found
checking for intltool-update... /usr/bin/intltool-update
checking for intltool-merge... /usr/bin/intltool-merge
checking for intltool-extract... /usr/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.14.2
checking for XML::Parser... ok
checking for lndir... /usr/bin/lndir
checking development series build... no
checking for a Python interpreter with version >= 2.6... python
checking for python... /usr/bin/python
checking for python version... 2.7
checking for python platform... linux2
checking for python script directory... ${prefix}/lib/python2.7/dist-packages
checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages
checking for ubuntu-sso-client... using system path
checking for ubuntuone-storage-protocol... using system path
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.9.0... yes
checking for DBUS... yes
configure: creating ./config.status
config.status: creating Makefile
config.status: creating data/Makefile
config.status: creating po/
config.status: creating docs/Makefile
config.status: executing depfiles commands
config.status: executing po/stamp-it commands
Now type `make' to compile ubuntuone-client installing `./install-sh' installing `./missing'


Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.


People subscribed via source and target branches