Hello community,
here is the log from the commit of package msynctool
checked in at Thu Mar 29 22:24:17 CEST 2007.
--------
--- msynctool/msynctool.changes 2006-11-06 20:23:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/msynctool/msynctool.changes 2007-03-29 20:30:32.434654000 +0200
@@ -1,0 +2,9 @@
+Thu Mar 29 15:26:01 CEST 2007 - cstender@suse.de
+
+- updated to version 0.22
+ o added convtest
+ o fixed typo in format detector
+ o removed useless debugging output
+ o added event comparer to convcard
+
+-------------------------------------------------------------------
Old:
----
msynctool-0.20.tar.bz2
New:
----
msynctool-0.22.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ msynctool.spec ++++++
--- /var/tmp/diff_new_pack.CO1950/_old 2007-03-29 22:24:04.000000000 +0200
+++ /var/tmp/diff_new_pack.CO1950/_new 2007-03-29 22:24:04.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package msynctool (Version 0.20)
+# spec file for package msynctool (Version 0.22)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -13,26 +13,24 @@
Name: msynctool
BuildRequires: libopensync-devel
URL: http://www.opensync.org/
-Version: 0.20
+Version: 0.22
Release: 1
Summary: CLI for synchronization with OpenSync
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: Productivity/Other
Autoreqprov: on
Source: msynctool-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: libopensync >= 0.20
+Requires: libopensync >= 0.22
Obsoletes: multisync-cli
Provides: multisync-cli
%define prefix /usr
%description
-Command line version of MultiSync for the OpenSync-package. To allow
-synchronization on machines which lack a X server. It relies on the
-OpenSync framework to do the actual synchronization. You need to
-install the libopensync package and the plugins for it, too. This
-package is independent from the various multisync-* packages which will
-be obsoleted once OpenSync has left the beta phase.
+Command line interface for libopensync to allow synchronization on
+machines which lack a X server. It relies on the OpenSync framework to
+do the actual synchronization. You need to install the libopensync
+package and the plugins for it, too.
@@ -62,11 +60,18 @@
%defattr(-, root, root)
%{_bindir}/msynctool
%{_bindir}/convcard
+%{_bindir}/convtest
%{_mandir}/man1/convcard.1*
%{_mandir}/man1/msynctool.1*
%doc AUTHORS COPYING INSTALL ChangeLog NEWS README
-%changelog -n msynctool
+%changelog
+* Thu Mar 29 2007 - cstender@suse.de
+- updated to version 0.22
+ o added convtest
+ o fixed typo in format detector
+ o removed useless debugging output
+ o added event comparer to convcard
* Mon Nov 06 2006 - cstender@suse.de
- updated to version 0.20
o fixed a crash due to missing return
++++++ msynctool-0.20.tar.bz2 -> msynctool-0.22.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/msynctool-0.20/configure.in new/msynctool-0.22/configure.in
--- old/msynctool-0.20/configure.in 2006-11-06 19:00:23.000000000 +0100
+++ new/msynctool-0.22/configure.in 2007-03-25 18:10:22.000000000 +0200
@@ -2,7 +2,7 @@
AC_PREREQ(2.58)
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(msynctool, 0.20)
+AM_INIT_AUTOMAKE(msynctool, 0.22)
AM_CONFIG_HEADER(config.h)
AC_ISC_POSIX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/msynctool-0.20/tools/convcard.c new/msynctool-0.22/tools/convcard.c
--- old/msynctool-0.20/tools/convcard.c 2006-09-09 01:13:35.000000000 +0200
+++ new/msynctool-0.22/tools/convcard.c 2006-11-16 17:12:31.000000000 +0100
@@ -44,7 +44,9 @@
typedef enum conv_detection {
DETECT_AUTO = 0,
DETECT_VCARD_21 = 1,
- DETECT_VCARD_30 = 2
+ DETECT_VCARD_30 = 2,
+ DETECT_VEVENT_10 = 3,
+ DETECT_VEVENT_20 = 4
} conv_detection;
OSyncObjFormat *conv_run_detection(OSyncFormatEnv *env, OSyncChange *change)
@@ -71,8 +73,18 @@
targetformat = osync_conv_find_objformat(env, "vcard21");
return targetformat;
}
+
+ if (!strcmp(osync_objformat_get_name(sourceformat), "vevent10")) {
+ targetformat = osync_conv_find_objformat(env, "vevent20");
+ return targetformat;
+ }
- fprintf(stderr, "The file is no vcard. Try forcing conversion using --from-vcard2.1 or --from-vcard3.0.\n");
+ if (!strcmp(osync_objformat_get_name(sourceformat), "vevent20")) {
+ targetformat = osync_conv_find_objformat(env, "vevent10");
+ return targetformat;
+ }
+
+ fprintf(stderr, "The file is no vcard/vcal. Try forcing conversion --from-xyz!\n");
exit(1);
}
@@ -88,8 +100,18 @@
targetformat = osync_conv_find_objformat(osync, "vcard21");
return targetformat;
}
+
+ if (type == DETECT_VEVENT_10) {
+ targetformat = osync_conv_find_objformat(osync, "vevent10");
+ return targetformat;
+ }
- fprintf(stderr, "Did not recognize the file format2\n");
+ if (type == DETECT_VEVENT_20) {
+ targetformat = osync_conv_find_objformat(osync, "vevent20");
+ return targetformat;
+ }
+
+ fprintf(stderr, "Did not recognize the file format?\n");
exit(1);
}
@@ -105,15 +127,26 @@
sourceformat = osync_conv_find_objformat(osync, "vcard30");
return sourceformat;
}
+
+ if (type == DETECT_VEVENT_10) {
+ sourceformat = osync_conv_find_objformat(osync, "vevent10");
+ return sourceformat;
+ }
- fprintf(stderr, "Did not recognize the file format2\n");
+ if (type == DETECT_VEVENT_20) {
+ sourceformat = osync_conv_find_objformat(osync, "veven20");
+ return sourceformat;
+ }
+
+ fprintf(stderr, "Did not recognize the file format?\n");
exit(1);
}
int main (int argc, char *argv[])
{
- if (argc < 2)
+ if (argc < 2) {
usage (argv[0], 1);
+ }
char *filename = argv[1];
char *output = NULL;
@@ -127,6 +160,10 @@
type = DETECT_VCARD_21;
} else if (!strcmp (arg, "--from-vcard3.0")) {
type = DETECT_VCARD_30;
+ } else if (!strcmp (arg, "--from-vcal")) {
+ type = DETECT_VEVENT_10;
+ } else if (!strcmp (arg, "--from-ical")) {
+ type = DETECT_VEVENT_20;
} else if (!strcmp (arg, "--out")) {
output = argv[i + 1];
i++;
@@ -138,8 +175,10 @@
break;
} else if (arg[0] == '-') {
usage (argv[0], 1);
+ /*
} else {
usage (argv[0], 1);
+ */
}
}
@@ -173,12 +212,18 @@
if (type == DETECT_AUTO) {
targetformat = conv_run_detection(conv_env, change);
osync_debug("CONVCARD", 3, "Done detecting. %s", osync_objformat_get_name(osync_change_get_objformat(change)));
- } else {
+ } else if (type < DETECT_VEVENT_10) {
OSyncObjType *objtype = osync_conv_find_objtype(conv_env, "contact");
osync_change_set_objtype(change, objtype);
sourceformat = conv_type_to_sourceformat(conv_env, type);
osync_change_set_objformat(change, sourceformat);
targetformat = conv_type_to_targetformat(conv_env, type);
+ } else {
+ OSyncObjType *objtype = osync_conv_find_objtype(conv_env, "event");
+ osync_change_set_objtype(change, objtype);
+ sourceformat = conv_type_to_sourceformat(conv_env, type);
+ osync_change_set_objformat(change, sourceformat);
+ targetformat = conv_type_to_targetformat(conv_env, type);
}
if (!osync_change_convert(conv_env, change, targetformat, &error)) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/msynctool-0.20/tools/convtest.c new/msynctool-0.22/tools/convtest.c
--- old/msynctool-0.20/tools/convtest.c 1970-01-01 01:00:00.000000000 +0100
+++ new/msynctool-0.22/tools/convtest.c 2007-01-20 22:48:33.000000000 +0100
@@ -0,0 +1,175 @@
+/*
+ * convcard - A tool for converting vcards
+ * Copyright (C) 2004-2005 Armin Bauer