On Mon, 08 Nov 2010 10:05:15 +0100, Patrick Ohly <patrick.o...@intel.com> wrote: > On So, 2010-11-07 at 22:05 +0000, Adam D. Barratt wrote:
> > I'm not sure I'm going to like the answer, given the commit count you > > mention below, but how large is the diff between what's currently in > > squeeze and the proposed 1.0 packages? Just upstream changes: % git diff --shortstat syncevolution-1-0-beta-2a syncevolution-1-0 178 files changed, 26314 insertions(+), 8971 deletions(-) About half of this is translations. Detailed diffstat is at the end. > > Not sure about the Debian versions. But the Synthesis engine hasn't > changed that much recently, so the one from experimental should be fine > for SyncEvolution 1.0.1. > I guess the version of libsynthesis in testing is also too old (3.4.0.5+something). The difference between that and the version shipped with syncevolution 1.0 (ignoring file renames) is 74 files changed, 3701 insertions(+), 1008 deletions(-) David Here is the detailed diffstat for syncevolution, with translations removed. It _looks_ like I see more differences than Patrick, I'm not sure why. .gitignore | 3 +- HACKING | 74 + Makefile-gen.am | 51 +- NEWS | 283 +++ README | 856 --------- README.packagers | 5 +- README.rst | 631 +++++++ configure-post.in | 7 +- configure-pre.in | 103 +- dbus-timeout.patch | 58 - gen-autotools.sh | 94 +- src/Makefile-gen.am | 121 +- src/backends/evolution/EvolutionCalendarSource.cpp | 41 +- .../evolution/EvolutionCalendarSourceRegister.cpp | 3 +- src/backends/evolution/EvolutionContactSource.cpp | 16 +- src/backends/evolution/e-cal-check-timezones.c | 3 +- src/backends/file/FileSyncSource.cpp | 3 +- src/backends/file/FileSyncSourceRegister.cpp | 12 + src/backends/sqlite/SQLiteContactSource.cpp | 1 + src/backends/sqlite/SQLiteContactSource.h | 1 + src/client-test-app.cpp | 22 +- src/dbus/Makefile.am | 2 + src/dbus/interfaces/Makefile.am | 30 +- src/dbus/interfaces/README | 9 + src/dbus/interfaces/dbus-introspect-docs.dtd | 32 + src/dbus/interfaces/spec-strip-docs.xsl | 1 + src/dbus/interfaces/spec-to-docbook.xsl | 271 ++- src/dbus/interfaces/syncevo-server-full.xml | 175 ++- src/dbus/interfaces/syncevo-session-full.xml | 45 +- src/dbus/qt/dbustypes.cpp | 78 + src/dbus/qt/dbustypes.h | 97 + src/dbus/syncevo-dbus-types.h | 1 + src/dbus/syncevo-server.c | 6 +- src/dbus/test.c | 1 - src/gdbus/gdbus-cxx-bridge.h | 587 +++++- src/gdbus/mainloop.c | 12 +- src/gtk-ui/Makefile.am | 3 +- src/gtk-ui/close.png | Bin 631 -> 0 bytes src/gtk-ui/close_hover.png | Bin 767 -> 0 bytes src/gtk-ui/mux-icon-button.c | 283 --- src/gtk-ui/mux-icon-button.h | 71 - src/gtk-ui/mux-window.c | 630 ------- src/gtk-ui/mux-window.h | 92 - src/gtk-ui/settings.png | Bin 1094 -> 0 bytes src/gtk-ui/settings_hover.png | Bin 1389 -> 0 bytes src/gtk-ui/sync-config-widget.c | 439 +++-- src/gtk-ui/sync-config-widget.h | 2 + src/gtk-ui/sync-ui.c | 627 +++++-- src/gtk-ui/sync-ui.rc | 12 +- src/gtk-ui/ui.glade | 1349 +++++++------- src/syncevo-dbus-server-startup.sh.in | 3 + src/syncevo-dbus-server.cpp | 1984 +++++++++++++++----- src/syncevo-dbus-server.desktop.in | 6 + src/syncevo/Cmdline.cpp | 432 ++++- src/syncevo/Cmdline.h | 89 +- src/syncevo/ConfigNode.cpp | 43 + src/syncevo/DataBlob.h | 63 + src/syncevo/FileConfigNode.cpp | 18 - src/syncevo/FileDataBlob.cpp | 71 + src/syncevo/FileDataBlob.h | 61 + src/syncevo/IniConfigNode.cpp | 375 ++++ src/syncevo/IniConfigNode.h | 130 ++ src/syncevo/LogRedirect.cpp | 347 +++- src/syncevo/LogRedirect.h | 60 +- src/syncevo/LogStdout.cpp | 9 +- src/syncevo/Logging.cpp | 23 + src/syncevo/Logging.h | 10 + src/syncevo/Makefile.am | 15 + src/syncevo/MultiplexConfigNode.cpp | 7 +- src/syncevo/MultiplexConfigNode.h | 7 + src/syncevo/ObexTransportAgent.cpp | 25 +- src/syncevo/ObexTransportAgent.h | 2 +- src/syncevo/SafeOstream.cpp | 51 + src/syncevo/SafeOstream.h | 56 + src/syncevo/SingleFileConfigTree.cpp | 242 +++ src/syncevo/SingleFileConfigTree.h | 94 + src/syncevo/StringDataBlob.cpp | 47 + src/syncevo/StringDataBlob.h | 61 + src/syncevo/SyncConfig.cpp | 409 ++++- src/syncevo/SyncConfig.h | 96 +- src/syncevo/SyncContext.cpp | 465 +++-- src/syncevo/SyncContext.h | 64 +- src/syncevo/SyncML.cpp | 22 + src/syncevo/SyncML.h | 12 + src/syncevo/SyncSource.cpp | 58 +- src/syncevo/SyncSource.h | 68 +- src/syncevo/SynthesisDBPlugin.cpp | 88 +- src/syncevo/SynthesisEngine.cpp | 32 +- src/syncevo/SynthesisEngine.h | 23 +- src/syncevo/TrackingSyncSource.cpp | 1 + src/syncevo/TrackingSyncSource.h | 1 + src/syncevo/configs/datatypes/01vcard-profile.xml | 38 +- .../configs/datatypes/11calendar-profile.xml | 4 + .../configs/remoterules/00_need_tz_in_event.xml | 1 + .../configs/remoterules/client/01mobical.xml | 8 + .../configs/remoterules/server/45_N7210c.xml | 8 + src/syncevo/configs/remoterules/server/46_E55.xml | 14 + src/syncevo/configs/scripting/11calendar.xml | 26 +- src/syncevo/declarations.h | 17 + src/syncevo/eds_abi_wrapper.cpp | 12 +- src/syncevo/eds_abi_wrapper.h | 12 + src/syncevo/lcs.h | 16 +- src/syncevo/util.cpp | 144 ++ src/syncevo/util.h | 72 + src/syncevolution.cpp | 1119 +++++++++++- src/synthesis-includes/Makefile.am | 9 + src/templates/clients/SyncEvolution.ini | 26 + src/templates/clients/SyncEvolution/config.ini | 4 - .../SyncEvolution/sources/addressbook/config.ini | 2 - .../SyncEvolution/sources/calendar/config.ini | 2 - .../clients/SyncEvolution/sources/memo/config.ini | 2 - .../clients/SyncEvolution/sources/todo/config.ini | 2 - src/templates/clients/SyncEvolution/template.ini | 3 - src/templates/clients/default/template.ini | 3 - src/templates/clients/phone/nokia/S40/7210c.ini | 29 + .../clients/phone/nokia/S40/7210c/config.ini | 2 - .../nokia/S40/7210c/sources/addressbook/config.ini | 2 - .../S40/7210c/sources/calendar+todo/config.ini | 4 - .../nokia/S40/7210c/sources/calendar/config.ini | 1 - .../phone/nokia/S40/7210c/sources/memo/config.ini | 2 - .../phone/nokia/S40/7210c/sources/todo/config.ini | 1 - .../clients/phone/nokia/S40/7210c/template.ini | 3 - src/templates/clients/phone/nokia/S60/N85.ini | 31 + src/templates/clients/phone/nokia/maemo/n900.ini | 29 + src/templates/servers/Funambol.ini | 28 + src/templates/servers/Funambol/config.ini | 6 - .../Funambol/sources/addressbook/config.ini | 2 - .../servers/Funambol/sources/calendar/config.ini | 3 - .../servers/Funambol/sources/memo/config.ini | 1 - .../servers/Funambol/sources/todo/config.ini | 3 - src/templates/servers/Funambol/template.ini | 3 - src/templates/servers/ScheduleWorld.ini | 22 + src/templates/servers/ScheduleWorld/config.ini | 5 - .../ScheduleWorld/sources/addressbook/config.ini | 2 - .../ScheduleWorld/sources/calendar/config.ini | 1 - .../servers/ScheduleWorld/sources/memo/config.ini | 1 - .../servers/ScheduleWorld/sources/todo/config.ini | 1 - src/templates/servers/ScheduleWorld/template.ini | 3 - src/valgrind.supp | 17 + test/ClientTest.cpp | 214 ++- test/ClientTest.h | 39 +- test/Makefile.am | 3 + test/README.Ovi | 111 ++ test/README.funambol | 2 +- test/README.syncevolution-server | 57 + test/client-test-main.cpp | 6 +- test/evo.supp | 264 +++- test/generate-html.xsl | 53 +- test/resultchecker.py | 7 +- test/runtests.py | 72 +- test/synccompare.pl | 40 +- test/syncevo-http-server.py | 58 +- test/syncevo-phone-config.py | 724 +++++++ test/test-dbus.py | 166 ++- test/testcases/ical20.ics.Ovi.tem.patch | 187 ++ test/testcases/ical20.ics.local | 66 + test/testcases/itodo20.ics.Ovi.tem.patch | 36 + test/testcases/itodo20.ics.funambol.tem.patch | 6 +- test/testcases/vcard30.vcf.Ovi.tem.patch | 23 + -- To UNSUBSCRIBE, email to debian-release-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/87aalim17p....@rocinante.cs.unb.ca