update to libical cvs on 20071210 attempt 3

calendar/libical/.cvsignore

@@ -0,0 +1,5 @@
+Makefile
+.deps
+.libs
+*.lo
+*.la

calendar/libical/AUTHORS

@@ -1,3 +1,7 @@
+Art Cancro (version 0.27)
+
+Omar Kilani (version 0.26)
+
 John Gray <gray@agora-net.com>
 Andrea Campi <a.campi@inet.it>
 

calendar/libical/ChangeLog

@@ -1,3 +1,24 @@
+2004-02-04  JP Rosevear <jpr@ximian.com> (merged to upstream by Ross Burton and Art Cancro)
+	* src/libicalvcal/icalvcal.c (icalvcal_traverse_objects): just
+	return on unknown property
+
+2004-08-02  Not Zed  <NotZed@Ximian.com> (merged to upstream by Ross Burton and Art Cancro)
+	* src/libicalvcal/vcc.y: re-alloc when we reach the buffer length,
+	not one past it.  Fixes an ABW.
+
+2005-09-15  Tor Lillqvist  <tml@novell.com> (merged to upstream by Ross Burton and Art Cancro)
+	* src/libical/vsnprintf.c: No reason not to include config.h also
+	on Win32.
+
+2007-05-18  Matthew Barnes  <mbarnes@redhat.com> (merged to upstream by Ross Burton and Art Cancro)
+	* src/libical/icalvalue.c: Fix implicit function declarations.
+
+2007-03-??  Art Cancro <ajc@uncensored.citadel.org>
+        * Updated tzdata in order to deal with daylight savings time changes in the US.
+
+200?-??-??  Omar Kilani (merged to upstream by Art Cancro)
+	* Merge the libical forks from KDE, Evolution, and SourceForge.
+
 2002-07-09  Andrea Campi  <a.campi@inet.it>
 
 	* src/libical/icalcomponent.c

calendar/libical/README

@@ -1,6 +1,10 @@
 
 LIBICAL -- An implementation of basic iCAL protocols
 
+Most of the code in here was written by Eric Busboom with help from
+dozens of contributors.  It is currently (and minimally) maintained
+by Art Cancro.
+
 The code and datafiles in this distribution are licensed under the
 Mozilla Public License. See http://www.mozilla.org/NPL/MPL-1.0.html
 for a copy of the license. Alternately, you may use libical under the
@@ -26,7 +30,7 @@ This code is under active development. If you would like to contribute
 to the project, you can contact me, Eric Busboom, at
 eric@softwarestudio.org. The project has a webpage at
 
-	http://softwarestudio.org/libical/index.html 
+	http://www.softwarestudio.org/softwarestudio/app.php/libical
 
 and a mailing list that you can join by sending the following mail:
 
@@ -39,9 +43,9 @@ and a mailing list that you can join by sending the following mail:
 Building the library
 --------------------
 
-This distribution is developed on Red Hat Linux 6.0 and usually
+This distribution is developed on CentOS Linux and usually
-compiles on SunOS 5.6 and FreeBSD 2.27. I have reports of success of
+compiles on Solaris and FreeBSD.   There are reports of success of
-previous version on MacOS ( with CodeWarrior ) and on UnixWare, but I
+previous version on MacOS ( with CodeWarrior ) and on UnixWare, but we
 don't know about any other systems.
 
 The library is configured with automake. IF YOU ARE BUILDING THE
@@ -95,8 +99,3 @@ Using the Library
 
 There is rudimentary, unfinished documentation in the /doc directory,
 and annotated examples in /examples and the test code in src/test.
-
-
-
-Eric Busboom
-eric@softwarestudio.org

calendar/libical/design-data/Makefile.in

@@ -1,7 +1,8 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,58 +13,49 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+install_sh_DATA = $(install_sh) -c -m 644
-INSTALL_DATA = @INSTALL_DATA@
+install_sh_PROGRAM = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+subdir = design-data
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
-AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BDB_DIR = @BDB_DIR@
 BDB_DIR_INCLUDE = @BDB_DIR_INCLUDE@
@@ -71,40 +63,118 @@ BDB_DIR_LIB = @BDB_DIR_LIB@
 BDB_LIB = @BDB_LIB@
 BDB_VERSION = @BDB_VERSION@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
+DEV_FALSE = @DEV_FALSE@
+DEV_TRUE = @DEV_TRUE@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+HAVE_PTHREAD_FALSE = @HAVE_PTHREAD_FALSE@
+HAVE_PTHREAD_TRUE = @HAVE_PTHREAD_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JAR = @JAR@
+LDFLAGS = @LDFLAGS@
-JAVA = @JAVA@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JAVA_PLATFORM = @JAVA_PLATFORM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-OBJDUMP = @OBJDUMP@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
 PTHREAD_LIBS = @PTHREAD_LIBS@
-PY_CFLAGS = @PY_CFLAGS@
-PY_EXTRA_LIBS = @PY_EXTRA_LIBS@
-PY_LIBS = @PY_LIBS@
-PY_LIB_LOC = @PY_LIB_LOC@
 RANLIB = @RANLIB@
-RRCAP_CFLAGS = @RRCAP_CFLAGS@
+SED = @SED@
-RRCAP_LIBS = @RRCAP_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
 VERSION = @VERSION@
+WITH_BDB4_FALSE = @WITH_BDB4_FALSE@
+WITH_BDB4_TRUE = @WITH_BDB4_TRUE@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
-python_val = @python_val@
+libdir = @libdir@
-
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 EXTRA_DIST = \
  properties.csv \
  parameters.csv \
@@ -112,15 +182,38 @@ EXTRA_DIST = \
  status.txt \
  value-types.csv
 
-subdir = design-data
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  design-data/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  design-data/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -130,33 +223,35 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  design-data/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	  CONFIG_HEADERS= CONFIG_LINKS= \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 uninstall-info-am:
 tags: TAGS
 TAGS:
 
+ctags: CTAGS
+CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	    || exit 1; \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
@@ -166,9 +261,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -180,6 +273,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -187,7 +281,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -197,13 +291,15 @@ clean: clean-am
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-libtool
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -219,23 +315,32 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
+	dvi-am html html-am info info-am install install-am \
-	install-data-am install-exec install-exec-am install-info \
+	install-data install-data-am install-exec install-exec-am \
-	install-info-am install-man install-strip installcheck \
+	install-info install-info-am install-man install-strip \
-	installcheck-am installdirs maintainer-clean \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

calendar/libical/design-data/parameters.csv

@@ -6,7 +6,7 @@
 "DELEGATED-TO","const char*",
 "DIR","const char*",
 "ENCODING","icalparameter_encoding","8BIT;BASE64"
-"FBTYPE","icalparameter_fbtype","FREE;BUSY;BUSYUNAVAILABLE;BUSYTENTATIVE"
+"FBTYPE","icalparameter_fbtype","FREE;BUSY;BUSY-UNAVAILABLE;BUSY-TENTATIVE"
 "FMTTYPE","const char*",
 "LANGUAGE","const char*",
 "MEMBER","const char*",
@@ -22,12 +22,3 @@
 "X","const char*",
 "X-LIC-ERRORTYPE","icalparameter_xlicerrortype","COMPONENT-PARSE-ERROR;PROPERTY-PARSE-ERROR;PARAMETER-NAME-PARSE-ERROR;PARAMETER-VALUE-PARSE-ERROR;VALUE-PARSE-ERROR;INVALID-ITIP;UNKNOWN-VCAL-PROP-ERROR;MIME-PARSE-ERROR;VCAL-PROP-PARSE-ERROR"
 "X-LIC-COMPARETYPE","icalparameter_xliccomparetype","EQUAL;NOTEQUAL;LESS;GREATER;LESSEQUAL;GREATEREQUAL;REGEX;ISNULL;ISNOTNULL"
-"#CAP Parameters","Draft 8",
-"#this parameter should really be called ACTION, but this conflicts with the ACTION property"
-"ACTIONPARAM","icalparameter_action","ASK;ABORT"
-"ID","const char*",
-"ENABLE","icalparameter_enable","TRUE;FALSE"
-"LATENCY","const char*",
-"LOCAL","icalparameter_local","TRUE;FALSE"
-"LOCALIZE","const char*",
-"OPTIONS","const char*",

calendar/libical/design-data/properties.csv

@@ -1,15 +1,22 @@
 ,,
 "#Property Name","libical Value type","iCalendar default value"
 "ACTION","ACTION","ACTION"
+"ALLOW-CONFLICT","TEXT","TEXT"
 "ATTACH","ATTACH","URI"
 "ATTENDEE","CAL-ADDRESS","CAL-ADDRESS"
 "CALSCALE","TEXT","TEXT"
 "CATEGORIES","TEXT","TEXT"
+"CALID","TEXT","TEXT"
+"CARID","TEXT","TEXT"
 "CLASS","CLASS","CLASS"
 "COMMENT","TEXT","TEXT"
 "COMPLETED","DATE-TIME","DATE-TIME"
 "CONTACT","TEXT","TEXT"
 "CREATED","DATE-TIME","DATE-TIME"
+"DECREED","TEXT","TEXT"
+"DEFAULT-CHARSET","TEXT","TEXT"
+"DEFAULT-LOCALE","TEXT","TEXT"
+"DEFAULT-TZID","TEXT","TEXT"
 "DESCRIPTION","TEXT","TEXT"
 "DTEND","DATE-TIME","DATE-TIME"
 "DTSTAMP","DATE-TIME","DATE-TIME"
@@ -24,12 +31,14 @@
 "LOCATION","TEXT","TEXT"
 "METHOD","METHOD","METHOD"
 "ORGANIZER","CAL-ADDRESS","CAL-ADDRESS"
+"OWNER","TEXT","TEXT"
 "PERCENT-COMPLETE","INTEGER","INTEGER"
 "PRIORITY","INTEGER","INTEGER"
 "PRODID","TEXT","TEXT"
 "RDATE","DATE-TIME-PERIOD","DATE-TIME"
 "RECURRENCE-ID","DATE-TIME","DATE-TIME"
 "RELATED-TO","TEXT","TEXT"
+"RELCALID","TEXT","TEXT"
 "REPEAT","INTEGER","INTEGER"
 "REQUEST-STATUS","REQUEST-STATUS","REQUEST-STATUS"
 "RESOURCES","TEXT","TEXT"
@@ -48,9 +57,13 @@
 "URL","URI","URI"
 "VERSION","TEXT","TEXT"
 "X","X","X"
+"SCOPE","TEXT","TEXT"
 "MAXRESULTS","INTEGER","INTEGER"
 "MAXRESULTSSIZE","INTEGER","INTEGER"
+"QUERY","QUERY","QUERY"
 "QUERYNAME","TEXT","TEXT"
+"EXPAND","INTEGER","INTEGER"
+"TARGET","CAL-ADDRESS","CAL-ADDRESS"
 "X-LIC-ERROR","TEXT","TEXT"
 "X-LIC-CLUSTERCOUNT","STRING","STRING"
 "X-LIC-MIMECONTENTTYPE","STRING","STRING"
@@ -59,50 +72,7 @@
 "X-LIC-MIMEOPTINFO","STRING","STRING"
 "X-LIC-MIMECID","STRING","STRING"
 "X-LIC-MIMEFILENAME","STRING","STRING"
+"CALMASTER","TEXT","TEXT"
 "X-LIC-CLASS","X-LIC-CLASS","X-LIC-CLASS"
 "ANY","NO","NO"
 "NO","NO","NO"
-"#CAP Properties",,
-,"FIXME","Should be BOOLEAN"
-"ALLOW-CONFLICT","TEXT","TEXT"
-"CALID","TEXT","TEXT"
-"CALMASTER","TEXT","TEXT"
-"CARID","TEXT","TEXT"
-"CMD","CMD","CMD"
-"CSID","URI","URI"
-"DECREED","TEXT","TEXT"
-"DEFAULT-CHARSET","TEXT","TEXT"
-"DEFAULT-LOCALE","TEXT","TEXT"
-"DEFAULT-TZID","TEXT","TEXT"
-"DEFAULT-VCARS","TEXT","TEXT"
-,"FIXME","Should be UPN-FILTER"
-"DENY","TEXT","TEXT"
-,"FIXME","Should be BOOLEAN"
-"EXPAND","INTEGER","INTEGER"
-,"FIXME","Should be UPN-FILTER"
-"GRANT","TEXT","TEXT"
-"MAXDATE","DATE-TIME","DATE-TIME"
-"MINDATE","DATE-TIME","DATE-TIME"
-"NAME","TEXT","TEXT"
-"OWNER","TEXT","TEXT"
-"PERMISSION","TEXT","TEXT"
-"QUERY","QUERY","QUERY"
-"QUERYID","TEXT","TEXT"
-"RELCALID","TEXT","TEXT"
-"RESTRICTION","QUERY","QUERY"
-"SCOPE","TEXT","TEXT"
-"TARGET","CAL-ADDRESS","CAL-ADDRESS"
-"#CAP Properties","These are only allowed in VREPLY",
-"CAP-VERSION","TEXT","TEXT"
-"CAR-LEVEL","CAR-LEVEL","CAR-LEVEL"
-"COMPONENTS","TEXT","TEXT"
-"STORES-EXPANDED","TEXT","TEXT"
-"DATE-MAX","DATE-TIME","DATE-TIME"
-"DATE-MIN","DATE-TIME","DATE-TIME"
-"ITIP-VERSION","TEXT","TEXT"
-"MAX-COMPONENT-SIZE","INTEGER","INTEGER"
-"MULTIPART","TEXT","TEXT"
-"QUERY-LEVEL","QUERY-LEVEL","QUERY-LEVEL"
-"RECUR-ACCEPTED","TEXT","TEXT"
-"RECUR-EXPAND","TEXT","TEXT"
-"RECUR-LIMIT","TEXT","TEXT"

calendar/libical/design-data/restrictions.csv

@@ -382,7 +382,7 @@ REPLY,VFREEBUSY,NONE,VJOURNAL,ZERO
 REPLY,VFREEBUSY,NONE,VTIMEZONE,ZERO
 PUBLISH,VTODO,NONE,NONE,ONEPLUS
 PUBLISH,VTODO,DTSTAMP,NONE,ONE
-PUBLISH,VTODO,DTSTART,NONE,ZEROORONE
+PUBLISH,VTODO,DTSTART,NONE,ONE
 PUBLISH,VTODO,ORGANIZER,NONE,ONE
 PUBLISH,VTODO,PRIORITY,NONE,ONE
 PUBLISH,VTODO,SEQUENCE,NONE,ZEROORONE
@@ -423,7 +423,7 @@ PUBLISH,VTODO,RELCALID,NONE,ZEROORONE
 REQUEST,VTODO,NONE,NONE,ONEPLUS
 REQUEST,VTODO,ATTENDEE,NONE,ONEPLUS
 REQUEST,VTODO,DTSTAMP,NONE,ONE
-REQUEST,VTODO,DTSTART,NONE,ZEROORONE
+REQUEST,VTODO,DTSTART,NONE,ONE
 REQUEST,VTODO,ORGANIZER,NONE,ONE
 REQUEST,VTODO,PRIORITY,NONE,ONE
 REQUEST,VTODO,SEQUENCE,NONE,ZEROORONE

calendar/libical/design-data/value-types.csv

@@ -29,7 +29,3 @@
 "GEO","(a)struct icalgeotype","tuple","unitary",
 "STRING","(a)const char*","string","unitary",
 "X","(m)const char*","string","unitary",
-"#CAP enumeration types",,,,
-"CMD","(a)enum icalproperty_cmd","string","unitary","ABORT;CONTINUE;CREATE;DELETE;GENERATE-UID;GET-CAPABILITY;IDENTIFY;MODIFY;MOVE;REPLY;SEARCH;SET-LOCALE"
-"QUERY-LEVEL","(a)enum icalproperty_querylevel","string","unitary","CAL-QL-1;CAL-QL-NONE"
-"CAR-LEVEL","(a)enum icalproperty_carlevel","string","unitary","CAR-NONE;CAR-MIN;CAR-FULL-1"

calendar/libical/scripts/Makefile.in

@@ -1,7 +1,8 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,58 +13,49 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+install_sh_DATA = $(install_sh) -c -m 644
-INSTALL_DATA = @INSTALL_DATA@
+install_sh_PROGRAM = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+subdir = scripts
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
-AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BDB_DIR = @BDB_DIR@
 BDB_DIR_INCLUDE = @BDB_DIR_INCLUDE@
@@ -71,40 +63,118 @@ BDB_DIR_LIB = @BDB_DIR_LIB@
 BDB_LIB = @BDB_LIB@
 BDB_VERSION = @BDB_VERSION@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
+DEV_FALSE = @DEV_FALSE@
+DEV_TRUE = @DEV_TRUE@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+HAVE_PTHREAD_FALSE = @HAVE_PTHREAD_FALSE@
+HAVE_PTHREAD_TRUE = @HAVE_PTHREAD_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JAR = @JAR@
+LDFLAGS = @LDFLAGS@
-JAVA = @JAVA@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JAVA_PLATFORM = @JAVA_PLATFORM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-OBJDUMP = @OBJDUMP@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
 PTHREAD_LIBS = @PTHREAD_LIBS@
-PY_CFLAGS = @PY_CFLAGS@
-PY_EXTRA_LIBS = @PY_EXTRA_LIBS@
-PY_LIBS = @PY_LIBS@
-PY_LIB_LOC = @PY_LIB_LOC@
 RANLIB = @RANLIB@
-RRCAP_CFLAGS = @RRCAP_CFLAGS@
+SED = @SED@
-RRCAP_LIBS = @RRCAP_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
 VERSION = @VERSION@
+WITH_BDB4_FALSE = @WITH_BDB4_FALSE@
+WITH_BDB4_TRUE = @WITH_BDB4_TRUE@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
-python_val = @python_val@
+libdir = @libdir@
-
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 EXTRA_DIST = \
 mkderivedcomponents.pl \
 mkderivedparameters.pl \
@@ -115,15 +185,38 @@ mkrestrictionrecords.pl \
 mkrestrictiontable.pl \
 readvaluesfile.pl 
 
-subdir = scripts
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
 all: all-am
 
 .SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scripts/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  scripts/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -133,33 +226,35 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  scripts/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && \
-	  CONFIG_HEADERS= CONFIG_LINKS= \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
 uninstall-info-am:
 tags: TAGS
 TAGS:
 
+ctags: CTAGS
+CTAGS:
 
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	    || exit 1; \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
@@ -169,9 +264,7 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -183,6 +276,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -190,7 +284,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -200,13 +294,15 @@ clean: clean-am
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-libtool
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -222,23 +318,32 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
+	dvi-am html html-am info info-am install install-am \
-	install-data-am install-exec install-exec-am install-info \
+	install-data install-data-am install-exec install-exec-am \
-	install-info-am install-man install-strip installcheck \
+	install-info install-info-am install-man install-strip \
-	installcheck-am installdirs maintainer-clean \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool uninstall uninstall-am uninstall-info-am
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

calendar/libical/scripts/mkderivedparameters.pl

@@ -118,7 +118,7 @@ if ($opt_c){
   }
 
   $count+=2;
-  print "static struct icalparameter_value_kind_map value_kind_map[$count] = {\n";
+  print "static const struct icalparameter_value_kind_map value_kind_map[$count] = {\n";
   print $out;
   print "    {ICAL_VALUE_X,ICAL_X_VALUE},\n";
   print "    {ICAL_VALUE_NONE,ICAL_NO_VALUE}\n};\n\n";
@@ -141,7 +141,7 @@ if ($opt_c){
 
   }
   $count+=1;
-  print "static struct icalparameter_kind_map parameter_map[$count] = { \n";
+  print "static const struct icalparameter_kind_map parameter_map[$count] = { \n";
   print $out;
   print "    { ICAL_NO_PARAMETER, \"\"}\n};\n\n";
   
@@ -171,7 +171,7 @@ if ($opt_c){
   }
 
   $count+=3;
-  print "static struct icalparameter_map icalparameter_map[] = {\n";
+  print "static const struct icalparameter_map icalparameter_map[] = {\n";
   print "{ICAL_ANY_PARAMETER,0,\"\"},\n";
   print $out;
   print "    {ICAL_NO_PARAMETER,0,\"\"}};\n\n";

calendar/libical/scripts/mkderivedproperties.pl

@@ -65,7 +65,7 @@ if($opt_c){
   my $count = scalar(@props);
   
 
-  print "static struct icalproperty_map property_map[$count] = {\n";
+  print "static const struct icalproperty_map property_map[$count] = {\n";
   
   foreach $prop (@props) {
     
@@ -124,7 +124,7 @@ if($opt_c){
   }
 
   $count++;
-  print "static struct icalproperty_enum_map enum_map[$count] = {\n";
+  print "static const struct icalproperty_enum_map enum_map[$count] = {\n";
   print $out;
   print "    {ICAL_NO_PROPERTY,0,\"\"}\n};\n\n";
   

calendar/libical/scripts/mkderivedvalues.pl

@@ -130,7 +130,7 @@ if($opt_c){
   # print out the value to string map
 
   my $count = scalar(keys %h) + 1;
-  print "static struct icalvalue_kind_map value_map[$count]={\n"; 
+  print "static const struct icalvalue_kind_map value_map[$count]={\n"; 
 
   foreach $value  (keys %h) {
 
@@ -206,8 +206,8 @@ void icalvalue_set_${lc}(icalvalue* value, $type v) {\
     impl->data.v_$union_data = $assign \n\
     icalvalue_reset_kind(impl);\n}\n";
 
-    print "$type icalvalue_get_${lc}(const icalvalue* value) {\n";
+    print "$type\ icalvalue_get_${lc}(const icalvalue* value)\ {\n";
-    if( $type =~ /^(int|const char\s?[*])$/) {
+    if ($type =~ m/(\*|int|float)$/) {
       print "    icalerror_check_arg_rz( (value!=0),\"value\");\n";
     } else {
       print "    icalerror_check_arg( (value!=0),\"value\");\n";

calendar/libical/scripts/mkrestrictiontable.pl

@@ -31,7 +31,7 @@ if ($opt_i) {
 }
 
 # First build the property restriction table 
-print "icalrestriction_property_record icalrestriction_property_records[] = {\n";
+print "static const icalrestriction_property_record icalrestriction_property_records[] = {\n";
 
 while(<F>)
 {
@@ -62,7 +62,7 @@ print "    {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_PROPERTY,ICAL_RESTRICTION
 
 print "};\n";
 
-print "icalrestriction_component_record icalrestriction_component_records[] = {\n";
+print "static const icalrestriction_component_record icalrestriction_component_records[] = {\n";
 
 
 # Go back through the entire file and build the component restriction table

calendar/libical/scripts/readvaluesfile.pl

@@ -13,7 +13,6 @@ sub read_values_file {
  
     s/#.*$//g;
     s/\"//g;
-    s/\r//g;
    
     next if ! $_;
 
@@ -70,7 +69,6 @@ sub read_properties_file {
  
     s/#.*$//g;
     s/\"//g;
-    s/\r//g;
    
     next if ! $_;
 
@@ -102,7 +100,6 @@ sub read_parameters_file {
  
     s/#.*$//g;
     s/\"//g;
-    s/\r//g;
    
     next if ! $_;
 

calendar/libical/src/Makefile.am

@@ -1,19 +1 @@
-if WITH_PYTHON
+SUBDIRS = libical libicalss
-PYTHON_DIR = python
-else
-PYTHON_DIR = 
-endif
-
-if WITH_JAVA
-JAVA_DIR = java
-else
-JAVA_DIR = 
-endif
-
-if WITH_CAP
-LIBICALCAP_DIR = libicalcap
-else
-LIBICALCAP_DIR = 
-endif
-
-SUBDIRS = libical libicalss $(LIBICALCAP_DIR) libicalvcal $(PYTHON_DIR) $(JAVA_DIR) test

calendar/libical/src/libical/.cvsignore

@@ -10,6 +10,13 @@ icalversion.h
 *.la
 ical.h
 icalyacc.output
+icalproperty.c
+icalproperty.h
+icalvalue.h
+icalvalue.c
+icalparameter.h
+icalparameter.c
+icalrestriction.c
 icalderivedparameter.c
 icalderivedparameter.h
 icalderivedproperty.c

calendar/libical/src/libical/Makefile.am

@@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: eric 
 #  
-#  $Id: Makefile.am,v 1.35 2002/11/05 14:59:21 acampi Exp $
+#  $Id: Makefile.am,v 1.38 2007/12/01 12:17:44 dothebart Exp $
 #
 #
 # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -26,13 +26,8 @@
 DESIGNDATA = $(top_srcdir)/design-data
 ICALSCRIPTS = $(top_srcdir)/scripts
 
-if WITH_CXX
-cxx_lib=libical_cxx.la
-cxx_headers=vcomponent.h icalparameter_cxx.h icalproperty_cxx.h icalvalue_cxx.h icptrholder.h
-else
 cxx_lib=
 cxx_headers=
-endif
 
 lib_LTLIBRARIES = libical.la $(cxx_lib)
 
@@ -40,7 +35,7 @@ noinst_LTLIBRARIES = libical-static.la
 libical_static_la_SOURCES = $(libical_la_SOURCES)
 libical_static_la_LDFLAGS = --all-static
 
-CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
+AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"
 
 # CFLAGS = -g
 
@@ -52,7 +47,7 @@ INCLUDES =			\
 	-I$(top_builddir)/src	\
 	-I$(srcdir)
 
-libical_la_LDFLAGS = -version-info 0:0:0
+libical_la_LDFLAGS = -version-info 30:0:30
 
 
 libical_la_SOURCES =		\
@@ -105,28 +100,13 @@ libical_la_SOURCES =		\
 	caldate.c \
 	astime.h 
 
-if WITH_CXX
-libical_cxx_la_SOURCES =	\
-	$(libical_la_SOURCES)	\
-	vcomponent.h		\
-	vcomponent.cpp		\
-	icalproperty_cxx.h	\
-	icalproperty_cxx.cpp	\
-	icalparameter_cxx.h	\
-	icalparameter_cxx.cpp	\
-	icalvalue_cxx.h		\
-	icalvalue_cxx.cpp       \
-	icptrholder.h
-endif
-
 libicalincludedir = $(includedir)
 
-libicalinclude_HEADERS = ical.h icalmemory.h icalerror.h $(cxx_headers)
+libicalinclude_HEADERS = ical.h icalmemory.h icalerror.h
 
 # ORDERING OF HEADERS IS SIGNIFICANT. Don't change this ordering. It
 # is required to make the combined header ical.h properly
 COMBINEDHEADERS =					\
-        $(top_builddir)/config.h                        \
 	$(top_builddir)/src/libical/icalversion.h	\
 	$(top_srcdir)/src/libical/icaltime.h		\
 	$(top_srcdir)/src/libical/icalduration.h	\
@@ -153,6 +133,11 @@ COMBINEDHEADERS =					\
 	$(top_srcdir)/src/libical/icalmime.h 		\
 	$(top_srcdir)/src/libical/icallangbind.h	
 
+# exporting the configure stuff is probably no good idea. 
+# others use standard defines not in our namespace too.
+#        $(top_builddir)/config.h                        \
+
+
 BUILT_COMBINEDHEADERS = 	\
 	icalderivedparameter.h	\
 	icalderivedproperty.h	\

calendar/libical/src/libical/icalarray.c

@@ -3,7 +3,7 @@
   FILE: icalarray.c
   CREATOR: Damon Chaplin 07 March 2001
   
-  $Id: icalarray.c,v 1.5 2002/06/28 09:30:15 acampi Exp $
+  $Id: icalarray.c,v 1.6 2007/04/30 13:57:47 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2001, Ximian, Inc.

calendar/libical/src/libical/icalarray.h

@@ -4,7 +4,7 @@
  CREATOR: Damon Chaplin 07 March 2001
 
 
- $Id: icalarray.h,v 1.3 2002/10/09 19:50:46 acampi Exp $
+ $Id: icalarray.h,v 1.4 2007/04/30 13:57:47 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2001, Ximian, Inc.

calendar/libical/src/libical/icalattach.c

@@ -3,7 +3,7 @@
   FILE: icalattach.c
   CREATOR: acampi 28 May 02
   
-  $Id: icalattach.c,v 1.2 2002/10/09 19:54:59 acampi Exp $
+  $Id: icalattach.c,v 1.3 2007/04/30 13:57:47 artcancro Exp $
   $Locker:  $
     
 

calendar/libical/src/libical/icalattachimpl.h

@@ -3,7 +3,7 @@
   FILE: icalattachimpl.h
   CREATOR: acampi 28 May 02
   
-  $Id: icalattachimpl.h,v 1.1 2002/05/28 14:08:00 acampi Exp $
+  $Id: icalattachimpl.h,v 1.2 2007/04/30 13:57:47 artcancro Exp $
 
 
  (C) COPYRIGHT 2000, Andrea Campi

calendar/libical/src/libical/icalderivedparameter.c.in

@@ -3,7 +3,7 @@
   FILE: icalderivedparameters.{c,h}
   CREATOR: eric 09 May 1999
   
-  $Id: icalderivedparameter.c.in,v 1.7 2004/05/10 22:05:23 acampi Exp $
+  $Id: icalderivedparameter.c.in,v 1.8 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
     
 
@@ -99,7 +99,7 @@ icalparameter_kind icalparameter_string_to_kind(const char* string)
 
     for (i=0; parameter_map[i].kind  != ICAL_NO_PARAMETER; i++) {
 
-	if (strcmp(parameter_map[i].name, string) == 0) {
+	if (strcasecmp(parameter_map[i].name, string) == 0) {
 	    return parameter_map[i].kind;
 	}
     }
@@ -150,7 +150,7 @@ int icalparameter_string_to_enum(const char* str)
     icalerror_check_arg_rz(str != 0,"str");
 
     for (i=0; icalparameter_map[i].kind != ICAL_NO_PARAMETER; i++){
-        if(strcmp(str,icalparameter_map[i].str) == 0) {
+        if(strcasecmp(str,icalparameter_map[i].str) == 0) {
             return icalparameter_map[i].enumeration;
         }
     }
@@ -174,7 +174,7 @@ icalparameter* icalparameter_new_from_value_string(icalparameter_kind kind,const
     for (i=0; icalparameter_map[i].kind != ICAL_NO_PARAMETER; i++){
         if(kind == icalparameter_map[i].kind) {
             found_kind = 1;
-            if(strcmp(val,icalparameter_map[i].str) == 0) {
+            if(strcasecmp(val,icalparameter_map[i].str) == 0) {
 
                 param->data = (int)icalparameter_map[i].enumeration;
                 return param;

calendar/libical/src/libical/icalderivedparameter.h.in

@@ -4,7 +4,7 @@
   CREATOR: eric 20 March 1999
 
 
-  $Id: icalderivedparameter.h.in,v 1.3 2002/05/27 20:55:36 ebusboom Exp $
+  $Id: icalderivedparameter.h.in,v 1.4 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
 
   

calendar/libical/src/libical/icalderivedproperty.c.in

@@ -4,7 +4,7 @@
   FILE: icalderivedproperty.c
   CREATOR: eric 15 Feb 2001
   
-  $Id: icalderivedproperty.c.in,v 1.13 2002/10/10 00:05:37 acampi Exp $
+  $Id: icalderivedproperty.c.in,v 1.14 2007/04/30 13:57:48 artcancro Exp $
 
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -107,7 +107,7 @@ icalproperty_kind icalproperty_string_to_kind(const char* string)
 
 
     for (i=0; property_map[i].kind  != ICAL_NO_PROPERTY; i++) {
-	if (strcmp(property_map[i].name, string) == 0) {
+	if (strcasecmp(property_map[i].name, string) == 0) {
 	    return property_map[i].kind;
 	}
     }
@@ -180,7 +180,7 @@ int icalproperty_kind_and_string_to_enum(const int kind, const char* str)
 	    return 0;
 
     for (; i != ICALPROPERTY_LAST_ENUM; i++) {
-	if ( strcmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) {
+	if ( strcasecmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) {
 	    return enum_map[i-ICALPROPERTY_FIRST_ENUM].prop_enum;
 	}
     }
@@ -200,7 +200,7 @@ int icalproperty_string_to_enum(const char* str)
     }
 
     for (i=ICALPROPERTY_FIRST_ENUM; i != ICALPROPERTY_LAST_ENUM; i++) {
-	if ( strcmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) {
+	if ( strcasecmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) {
 	    return enum_map[i-ICALPROPERTY_FIRST_ENUM].prop_enum;
 	}
     }
@@ -245,7 +245,7 @@ icalproperty_method icalproperty_string_to_method(const char* str)
     for (i=ICAL_METHOD_X-ICALPROPERTY_FIRST_ENUM; 
          i != ICAL_METHOD_NONE-ICALPROPERTY_FIRST_ENUM;
          i++) {
-	if ( strcmp(enum_map[i].str, str) == 0) {
+	if ( strcasecmp(enum_map[i].str, str) == 0) {
 	    return (icalproperty_method)enum_map[i].prop_enum;
 	}
     }
@@ -275,7 +275,7 @@ icalproperty_status icalenum_string_to_status(const char* str)
     for (i=ICAL_STATUS_X-ICALPROPERTY_FIRST_ENUM; 
          i != ICAL_STATUS_NONE-ICALPROPERTY_FIRST_ENUM;
          i++) {
-	if ( strcmp(enum_map[i].str, str) == 0) {
+	if ( strcasecmp(enum_map[i].str, str) == 0) {
 	    return (icalproperty_status)enum_map[i].prop_enum;
 	}
     }

calendar/libical/src/libical/icalderivedproperty.h.in

@@ -3,7 +3,7 @@
   FILE: icalderivedproperties.{c,h}
   CREATOR: eric 09 May 1999
   
-  $Id: icalderivedproperty.h.in,v 1.6 2002/05/27 20:55:36 ebusboom Exp $
+  $Id: icalderivedproperty.h.in,v 1.7 2007/04/30 13:57:48 artcancro Exp $
     
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
  ======================================================================*/

calendar/libical/src/libical/icalderivedvalue.c.in

@@ -3,7 +3,7 @@
   FILE: icalvalue.c
   CREATOR: eric 02 May 1999
   
-  $Id: icalderivedvalue.c.in,v 1.13 2005/01/24 11:48:01 acampi Exp $
+  $Id: icalderivedvalue.c.in,v 1.15 2007/04/30 13:57:48 artcancro Exp $
 
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -39,8 +39,13 @@
 #include "icalvalueimpl.h"
 
 #include <stdlib.h> /* for malloc */
+#include <stdio.h> /* for snprintf */
 #include <string.h> /* For memset, others */
+#include <stddef.h> /* For offsetof() macro */
 #include <errno.h>
+#include <time.h> /* for mktime */
+#include <stdlib.h> /* for atoi and atof */
+#include <limits.h> /* for SHRT_MAX */         
 
 struct icalvalue_impl*  icalvalue_new_impl(icalvalue_kind kind);
 
@@ -83,7 +88,7 @@ icalvalue_kind icalvalue_string_to_kind(const char* str)
     int i;
 
     for (i=0; value_map[i].kind != ICAL_NO_VALUE; i++) {
-	if (strcmp(value_map[i].name,str) == 0) {
+	if (strcasecmp(value_map[i].name,str) == 0) {
 	    return value_map[i].kind;
 	}
     }
@@ -257,7 +262,7 @@ icalvalue_get_datetimeperiod(const icalvalue* impl)
   icalerror_check_arg( (impl!=0),"value");
   icalerror_check_value_type(value, ICAL_DATETIMEPERIOD_VALUE);
   
-  if(impl->kind == ICAL_DATETIME_VALUE){
+  if( impl->kind == ICAL_DATETIME_VALUE || impl->kind == ICAL_DATE_VALUE ){
       dtp.period = icalperiodtype_null_period();
       dtp.time = impl->data.v_time;
   } else if(impl->kind == ICAL_PERIOD_VALUE) {

calendar/libical/src/libical/icalderivedvalue.h.in

@@ -4,7 +4,7 @@
   CREATOR: eric 20 March 1999
 
 
-  $Id: icalderivedvalue.h.in,v 1.9 2002/06/04 14:07:09 acampi Exp $
+  $Id: icalderivedvalue.h.in,v 1.10 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
 
   

calendar/libical/src/libical/icalduration.h

@@ -4,7 +4,7 @@
  CREATOR: eric 26 Jan 2001
 
 
- $Id: icalduration.h,v 1.3 2002/09/26 22:04:56 lindner Exp $
+ $Id: icalduration.h,v 1.4 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libical/icalenums.c

@@ -3,7 +3,7 @@
   FILE: icalenum.c
   CREATOR: eric 29 April 1999
   
-  $Id: icalenums.c,v 1.13 2002/06/11 12:22:25 acampi Exp $
+  $Id: icalenums.c,v 1.15 2007/05/25 02:57:04 artcancro Exp $
 
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -38,7 +38,7 @@
 
 /*** @brief Allowed request status values
  */
-static struct {
+static const struct {
 	 enum icalrequeststatus kind;
 	int major;
 	int minor;
@@ -112,7 +112,7 @@ char* icalenum_reqstat_code(icalrequeststatus stat)
 	if ( request_status_map[i].kind ==  stat) {
 	    major = request_status_map[i].major;
 	    minor = request_status_map[i].minor;
-	    sprintf(tmpbuf, "%i.%i", major, minor);
+	    snprintf(tmpbuf, sizeof(tmpbuf), "%i.%i", major, minor);
 	    return icalmemory_tmp_copy(tmpbuf);
 	}
     }

calendar/libical/src/libical/icalenums.h

@@ -56,7 +56,6 @@ typedef enum icalcomponent_kind {
     ICAL_X_COMPONENT,
     ICAL_VSCHEDULE_COMPONENT,
     ICAL_VQUERY_COMPONENT,
-    ICAL_VREPLY_COMPONENT,
     ICAL_VCAR_COMPONENT,
     ICAL_VCOMMAND_COMPONENT,
     ICAL_XLICINVALID_COMPONENT,

calendar/libical/src/libical/icalerror.c

@@ -3,7 +3,7 @@
   FILE: icalerror.c
   CREATOR: eric 16 May 1999
   
-  $Id: icalerror.c,v 1.17 2002/10/09 20:48:08 acampi Exp $
+  $Id: icalerror.c,v 1.20 2007/05/31 21:26:14 artcancro Exp $
   $Locker:  $
     
 
@@ -108,7 +108,7 @@ void icalerror_clear_errno() {
     icalerrno = ICAL_NO_ERROR;
 }
 
-#ifdef ICAL_ERRORS_ARE_FATAL
+#if ICAL_ERRORS_ARE_FATAL
 int icalerror_errors_are_fatal = 1;
 #else
 int icalerror_errors_are_fatal = 0;
@@ -141,7 +141,7 @@ struct icalerror_string_map {
     char name[160];
 };
 
-static struct icalerror_string_map string_map[] = 
+static const struct icalerror_string_map string_map[] = 
 {
     {"BADARG",ICAL_BADARG_ERROR,"BADARG: Bad argument to function"},
     { "NEWFAILED",ICAL_NEWFAILED_ERROR,"NEWFAILED: Failed to create a new object via a *_new() routine"},
@@ -187,7 +187,7 @@ icalerrorstate icalerror_supress(const char* error){
     return es;
 }
 
-char* icalerror_perror()
+const char* icalerror_perror()
 {
     return icalerror_strerror(icalerrno);
 }
@@ -233,7 +233,7 @@ icalerrorstate icalerror_get_error_state( icalerrorenum error)
 
 
 
-char* icalerror_strerror(icalerrorenum e) {
+const char* icalerror_strerror(icalerrorenum e) {
 
     int i;
 

calendar/libical/src/libical/icalerror.h

@@ -3,7 +3,7 @@
   FILE: icalerror.h
   CREATOR: eric 09 May 1999
   
-  $Id: icalerror.h,v 1.14 2002/07/21 14:58:17 lindner Exp $
+  $Id: icalerror.h,v 1.16 2007/05/25 02:57:04 artcancro Exp $
 
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -90,8 +90,8 @@ typedef enum icalerrorstate {
     ICAL_ERROR_UNKNOWN    /* Asked state for an unknown error type */
 } icalerrorstate ;
 
-char* icalerror_strerror(icalerrorenum e);
+const char* icalerror_strerror(icalerrorenum e);
-char* icalerror_perror();
+const char* icalerror_perror();
 void icalerror_set_error_state( icalerrorenum error, icalerrorstate);
 icalerrorstate icalerror_get_error_state( icalerrorenum error);
 

calendar/libical/src/libical/icallangbind.c

@@ -5,7 +5,7 @@
   
   DESCRIPTION:
   
-  $Id: icallangbind.c,v 1.22 2002/10/24 13:44:30 acampi Exp $
+  $Id: icallangbind.c,v 1.23 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
 
   (C) COPYRIGHT 1999 Eric Busboom 
@@ -40,8 +40,8 @@ void icallangbind_free_array(int* array){
     free(array);
 }
 
-int icallangbind_access_array(int* array, int index) {
+int icallangbind_access_array(int* array, int indx) {
-    return array[index];
+    return array[indx];
 }                    
 
 /** Iterators to fetch parameters given property */

calendar/libical/src/libical/icallangbind.h

@@ -5,7 +5,7 @@
   
   DESCRIPTION:
   
-  $Id: icallangbind.h,v 1.6 2002/10/24 13:44:30 acampi Exp $
+  $Id: icallangbind.h,v 1.7 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
 
   (C) COPYRIGHT 1999 Eric Busboom 
@@ -23,7 +23,7 @@
 
 int* icallangbind_new_array(int size);
 void icallangbind_free_array(int* array);
-int icallangbind_access_array(int* array, int index);
+int icallangbind_access_array(int* array, int indx);
 icalproperty* icallangbind_get_property(icalcomponent *c, int n, const char* prop);
 const char* icallangbind_get_property_val(icalproperty* p);
 const char* icallangbind_get_parameter(icalproperty *p, const char* parameter);

calendar/libical/src/libical/icalmemory.c

@@ -3,7 +3,7 @@
   FILE: icalmemory.c
   CREATOR: eric 30 June 1999
   
-  $Id: icalmemory.c,v 1.10 2002/08/09 14:28:56 lindner Exp $
+  $Id: icalmemory.c,v 1.11 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
     
  The contents of this file are subject to the Mozilla Public License
@@ -215,6 +215,12 @@ void icalmemory_free_ring()
    br = get_buffer_ring();
 
    icalmemory_free_ring_byval(br);
+#ifdef HAVE_PTHREAD
+  pthread_setspecific(ring_key, 0);
+#else
+  global_buffer_ring = 0;
+#endif
+
 }
 
 

calendar/libical/src/libical/icalmemory.h

@@ -4,7 +4,7 @@
  CREATOR: eric 30 June 1999
 
 
- $Id: icalmemory.h,v 1.4 2002/06/11 12:15:11 acampi Exp $
+ $Id: icalmemory.h,v 1.5 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  This program is free software; you can redistribute it and/or modify

calendar/libical/src/libical/icalmime.c

@@ -4,7 +4,7 @@
  CREATOR: eric 26 July 2000
 
 
- $Id: icalmime.c,v 1.8 2005/01/24 12:49:11 acampi Exp $
+ $Id: icalmime.c,v 1.11 2007/05/31 21:26:14 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -97,12 +97,14 @@ void* icalmime_textcalendar_end_part(void* part)
 
 void* icalmime_text_end_part(void* part)
 {
+    char *buf;
     struct text_part* impl = ( struct text_part*) part;
 
     icalmemory_add_tmp_buffer(impl->buf);
+    buf = impl->buf;
     free(impl);
 
-    return impl->buf;
+    return buf;
 }
 
 void icalmime_text_free_part(void *part)
@@ -138,7 +140,7 @@ void icalmime_attachment_free_part(void *part)
 
 
 
-struct sspm_action_map icalmime_local_action_map[] = 
+static const struct sspm_action_map icalmime_local_action_map[] = 
 {
     {SSPM_TEXT_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_text_new_part,icalmime_text_add_line,icalmime_textcalendar_end_part,icalmime_text_free_part},
     {SSPM_TEXT_MAJOR_TYPE,SSPM_ANY_MINOR_TYPE,icalmime_text_new_part,icalmime_text_add_line,icalmime_text_end_part,icalmime_text_free_part},
@@ -209,13 +211,9 @@ icalcomponent* icalmime_parse(char* (*get_string)(char *s, size_t size,
 	}
 
 	if(parts[i].header.error!=SSPM_NO_ERROR){
-	    char *str = "Unknown error";
+	    const char *str="Unknown error";
 	    char temp[256];
 
-	    if(parts[i].header.error==SSPM_MALFORMED_HEADER_ERROR){
-		str = "Malformed header, possibly due to input not in MIME format";
-	    }
-
 	    if(parts[i].header.error==SSPM_UNEXPECTED_BOUNDARY_ERROR){
 		str = "Got an unexpected boundary, possibly due to a MIME header for a MULTIPART part that is missing the Content-Type line";
 	    }
@@ -235,7 +233,7 @@ line between the header and the previous boundary\?";
 	    }
 
 	    if(parts[i].header.error_text != 0){
-		snprintf(temp,sizeof(temp),
+		snprintf(temp,256,
 			 "%s: %s",str,parts[i].header.error_text);
 	    } else {
 		strcpy(temp,str);

calendar/libical/src/libical/icalmime.h

@@ -4,7 +4,7 @@
  CREATOR: eric 26 July 2000
 
 
- $Id: icalmime.h,v 1.1.1.1 2001/01/02 07:33:02 ebusboom Exp $
+ $Id: icalmime.h,v 1.2 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libical/icalparameterimpl.h

@@ -3,7 +3,7 @@
   FILE: icalparameterimpl.h
   CREATOR: eric 09 May 1999
   
-  $Id: icalparameterimpl.h,v 1.2 2001/03/26 19:17:28 ebusboom Exp $
+  $Id: icalparameterimpl.h,v 1.3 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
     
 

calendar/libical/src/libical/icalparser.h

@@ -3,7 +3,7 @@
   FILE: icalparser.h
   CREATOR: eric 20 April 1999
   
-  $Id: icalparser.h,v 1.7 2002/06/28 08:55:23 acampi Exp $
+  $Id: icalparser.h,v 1.8 2007/04/30 13:57:48 artcancro Exp $
 
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libical/icalperiod.c

@@ -3,7 +3,7 @@
   FILE: icalperiod.c
   CREATOR: eric 02 June 2000
   
-  $Id: icalperiod.c,v 1.11 2002/10/30 21:22:03 acampi Exp $
+  $Id: icalperiod.c,v 1.12 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libical/icalperiod.h

@@ -4,7 +4,7 @@
  CREATOR: eric 26 Jan 2001
 
 
- $Id: icalperiod.h,v 1.4 2002/06/28 11:11:24 acampi Exp $
+ $Id: icalperiod.h,v 1.5 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libical/icalrestriction.c.in

@@ -30,7 +30,7 @@ in machine generated code below */
 
 struct icalrestriction_property_record;
 
-typedef char* (*restriction_func)(struct icalrestriction_property_record* rec,icalcomponent* comp,icalproperty* prop);
+typedef char* (*restriction_func)(const struct icalrestriction_property_record* rec,icalcomponent* comp,icalproperty* prop);
 
 
 typedef struct icalrestriction_property_record {
@@ -50,24 +50,24 @@ typedef struct icalrestriction_component_record {
 	restriction_func function;
 } icalrestriction_component_record;
 
-icalrestriction_property_record*
+static const icalrestriction_property_record*
 icalrestriction_get_property_restriction(icalproperty_method method,
 					 icalcomponent_kind component,
 					 icalproperty_kind property);
-icalrestriction_component_record*
+static const icalrestriction_component_record*
 icalrestriction_get_component_restriction(icalproperty_method method,
 					  icalcomponent_kind component,
 					  icalcomponent_kind subcomponent);
 
-icalrestriction_component_record icalrestriction_component_records[];
+static const icalrestriction_component_record icalrestriction_component_records[];
-icalrestriction_property_record icalrestriction_property_records[]; 
+static const icalrestriction_property_record icalrestriction_property_records[]; 
 
 icalrestriction_property_record null_prop_record =   {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_PROPERTY,ICAL_RESTRICTION_UNKNOWN,0};
 icalrestriction_component_record null_comp_record =   {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_COMPONENT,ICAL_RESTRICTION_UNKNOWN,0};
 
 
-/** The each row gives the result of comparing a restriction against a
+/** Each row gives the result of comparing a restriction against a count.
-   count. The columns in each row represent 0,1,2+. '-1' indicates
+   The columns in each row represent 0,1,2+. '-1' indicates
    'invalid, 'don't care' or 'needs more analysis' So, for
    ICAL_RESTRICTION_ONE, if there is 1 of a property with that
    restriction, it passes, but if there are 0 or 2+, it fails. */
@@ -84,7 +84,7 @@ char compare_map[ICAL_RESTRICTION_UNKNOWN+1][3] = {
     { 1, 1, 1} /*ICAL_RESTRICTION_UNKNOWN*/
 };
 
-char restr_string_map[ICAL_RESTRICTION_UNKNOWN+1][60] = {
+const char restr_string_map[ICAL_RESTRICTION_UNKNOWN+1][60] = {
     "unknown number",/*ICAL_RESTRICTION_NONE*/
     "0",/*ICAL_RESTRICTION_ZERO*/
     "1",/*ICAL_RESTRICTION_ONE*/
@@ -116,7 +116,7 @@ icalrestriction_compare(icalrestriction_kind restr, int count){
 /* Special case routines */
 
 char* icalrestriction_may_be_draft_final_canceled(
-    icalrestriction_property_record *rec,
+    const icalrestriction_property_record *rec,
     icalcomponent* comp, 
     icalproperty* prop)
 {
@@ -135,7 +135,7 @@ char* icalrestriction_may_be_draft_final_canceled(
 }
 
 char* icalrestriction_may_be_comp_need_process(
-    icalrestriction_property_record *rec,
+    const icalrestriction_property_record *rec,
     icalcomponent* comp, 
     icalproperty* prop)
 {
@@ -151,7 +151,7 @@ char* icalrestriction_may_be_comp_need_process(
 
     return 0;    
 }
-char* icalrestriction_may_be_tent_conf(icalrestriction_property_record *rec,
+char* icalrestriction_may_be_tent_conf(const icalrestriction_property_record *rec,
 				       icalcomponent* comp, 
 				       icalproperty* prop){
     icalproperty_status stat = icalproperty_get_status(prop);
@@ -166,7 +166,7 @@ char* icalrestriction_may_be_tent_conf(icalrestriction_property_record *rec,
     return 0;    
 }
 char* icalrestriction_may_be_tent_conf_cancel(
-    icalrestriction_property_record *rec,
+    const icalrestriction_property_record *rec,
     icalcomponent* comp, 
     icalproperty* prop)
 {
@@ -184,7 +184,7 @@ char* icalrestriction_may_be_tent_conf_cancel(
 }
 
 char* icalrestriction_must_be_cancel_if_present(
-    icalrestriction_property_record *rec,
+    const icalrestriction_property_record *rec,
     icalcomponent* comp, 
     icalproperty* prop)
 {
@@ -202,7 +202,7 @@ char* icalrestriction_must_be_cancel_if_present(
 }
 
 char* icalrestriction_must_be_canceled_no_attendee(
-    icalrestriction_property_record *rec,
+    const icalrestriction_property_record *rec,
     icalcomponent* comp, 
     icalproperty* prop)
 {
@@ -212,55 +212,55 @@ char* icalrestriction_must_be_canceled_no_attendee(
 
     return 0;    
 }
-char* icalrestriction_must_be_recurring(icalrestriction_property_record *rec,
+char* icalrestriction_must_be_recurring(const icalrestriction_property_record *rec,
 					icalcomponent* comp, 
 					icalproperty* prop){
     /* Hack */
     return 0;    
 }
-char* icalrestriction_must_have_duration(icalrestriction_property_record *rec,
+char* icalrestriction_must_have_duration(const icalrestriction_property_record *rec,
 					 icalcomponent* comp, 
 					 icalproperty* prop){
     
     if( !icalcomponent_get_first_property(comp,ICAL_DURATION_PROPERTY)){
 
-	return "Failed iTIP restrictions. This component must have a DURATION property";
+	return "Failed iTIP restrictions for DURATION property. This component must have a DURATION property";
 
     }
 
     return 0;    
 }
-char* icalrestriction_must_have_repeat(icalrestriction_property_record *rec,
+char* icalrestriction_must_have_repeat(const icalrestriction_property_record *rec,
 				       icalcomponent* comp, 
 				       icalproperty* prop){
     if( !icalcomponent_get_first_property(comp,ICAL_REPEAT_PROPERTY)){
 
-	return "Failed iTIP restrictions. This component must have a REPEAT property";
+	return "Failed iTIP restrictions for REPEAT property. This component must have a REPEAT property";
 
     }
 
     return 0;    
 }
-char* icalrestriction_must_if_tz_ref(icalrestriction_property_record *rec,
+char* icalrestriction_must_if_tz_ref(const icalrestriction_property_record *rec,
 				     icalcomponent* comp, 
 				     icalproperty* prop){
 
     /* Hack */
     return 0;    
 }
-char* icalrestriction_no_dtend(icalrestriction_property_record *rec,
+char* icalrestriction_no_dtend(const icalrestriction_property_record *rec,
 			       icalcomponent* comp, 
 			       icalproperty* prop){
 
-    if( icalcomponent_get_first_property(comp,ICAL_DTEND_PROPERTY)){
+    if( !icalcomponent_get_first_property(comp,ICAL_DTEND_PROPERTY)){
 
-	return "Failed iTIP restrictions. The component must not have both DURATION and DTEND";
+	return "Failed iTIP restrictions for DTEND property. The component must not have both DURATION and DTEND";
 
     }
 
     return 0;    
 }
-char* icalrestriction_no_duration(icalrestriction_property_record *rec,
+char* icalrestriction_no_duration(const icalrestriction_property_record *rec,
 				icalcomponent* comp, 
 				  icalproperty* prop){
 
@@ -268,7 +268,7 @@ char* icalrestriction_no_duration(icalrestriction_property_record *rec,
     return 0;    
 }                                     
 char* icalrestriction_must_be_email(
-    icalrestriction_property_record *rec,
+    const icalrestriction_property_record *rec,
     icalcomponent* comp, 
     icalproperty* prop)
 {
@@ -289,8 +289,8 @@ int icalrestriction_check_component(icalproperty_method method,
     icalproperty_kind kind;
     icalcomponent_kind comp_kind;
     icalrestriction_kind restr;
-    icalrestriction_property_record *prop_record;
+    const icalrestriction_property_record *prop_record;
-    char* funcr = 0;
+    const char* funcr = 0;
     icalproperty *prop;
 
     int count;
@@ -419,7 +419,7 @@ int icalrestriction_check(icalcomponent* outer_comp)
 
 }
 
-icalrestriction_property_record*
+static const icalrestriction_property_record*
 icalrestriction_get_property_restriction(icalproperty_method method,
 					 icalcomponent_kind component,
 					 icalproperty_kind property)
@@ -441,7 +441,7 @@ icalrestriction_get_property_restriction(icalproperty_method method,
 }
 
 
-icalrestriction_component_record*
+static const icalrestriction_component_record*
 icalrestriction_get_component_restriction(icalproperty_method method,
 					  icalcomponent_kind component,
 					  icalcomponent_kind subcomponent)

calendar/libical/src/libical/icalrestriction.h

@@ -3,7 +3,7 @@
   FILE: icalrestriction.h
   CREATOR: eric 24 April 1999
   
-  $Id: icalrestriction.h,v 1.1.1.1 2001/01/02 07:33:02 ebusboom Exp $
+  $Id: icalrestriction.h,v 1.2 2007/04/30 13:57:48 artcancro Exp $
 
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libical/icaltimezone.h

@@ -4,7 +4,7 @@
  CREATOR: Damon Chaplin 15 March 2001
 
 
- $Id: icaltimezone.h,v 1.10 2002/11/03 23:51:55 acampi Exp $
+ $Id: icaltimezone.h,v 1.12 2007/12/01 11:14:00 dothebart Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2001, Damon Chaplin
@@ -153,6 +153,7 @@ void set_zone_directory(char *path);
 
 /** Free memory dedicated to the zonefile directory */
 void free_zone_directory(void);
+void icaltimezone_release_zone_tab(void);
 
 /*
  * @par Debugging Output.

calendar/libical/src/libical/icaltypes.c

@@ -3,7 +3,7 @@
   FILE: icaltypes.c
   CREATOR: eric 16 May 1999
   
-  $Id: icaltypes.c,v 1.15 2002/10/30 23:59:57 acampi Exp $
+  $Id: icaltypes.c,v 1.16 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
     
 

calendar/libical/src/libical/icalvalueimpl.h

@@ -3,7 +3,7 @@
   FILE: icalvalue.c
   CREATOR: eric 02 May 1999
   
-  $Id: icalvalueimpl.h,v 1.5 2002/05/28 14:08:00 acampi Exp $
+  $Id: icalvalueimpl.h,v 1.6 2007/04/30 13:57:48 artcancro Exp $
 
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libical/sspm.c

@@ -3,7 +3,7 @@
   FILE: sspm.c Parse Mime
   CREATOR: eric 25 June 2000
   
-  $Id: sspm.c,v 1.9 2005/01/24 13:15:19 acampi Exp $
+  $Id: sspm.c,v 1.11 2007/08/21 02:45:54 artcancro Exp $
   $Locker:  $
     
  The contents of this file are subject to the Mozilla Public License
@@ -69,7 +69,7 @@ struct mime_impl{
 	size_t max_parts;
 	int part_no;
 	int level;
-	struct sspm_action_map *actions;
+	const struct sspm_action_map *actions;
 	char* (*get_string)(char *s, size_t size, void* data);
 	void* get_string_data;
 	char temp[TMP_BUF_SIZE];
@@ -424,19 +424,17 @@ static struct sspm_action_map get_action(struct mime_impl *impl,
 char* sspm_lowercase(char* str)
 {
     char* p = 0;
-    char* ret;
+    char* new = sspm_strdup(str);
 
     if(str ==0){
 	return 0;
     }
 
-    ret = sspm_strdup(str);
+    for(p = new; *p!=0; p++){
-
-    for(p = ret; *p!=0; p++){
 	*p = tolower(*p);
     }
 
-    return ret;
+    return new;
 }
 
 enum sspm_major_type sspm_find_major_content_type(char* type)
@@ -533,7 +531,7 @@ void sspm_build_header(struct sspm_header *header, char* line)
     val = sspm_strdup(sspm_value(line));
     prop = sspm_strdup(sspm_property_name(line));
 
-    if(strcmp(prop,"Content-Type") == 0){
+    if(strcasecmp(prop,"Content-Type") == 0){
 	
 	/* Create a new mime_header, fill in content-type
 	   and possibly boundary */
@@ -560,19 +558,19 @@ void sspm_build_header(struct sspm_header *header, char* line)
 	    header->boundary = sspm_strdup(boundary);
 	}
 	
-    } else if(strcmp(prop,"Content-Transfer-Encoding")==0){
+    } else if(strcasecmp(prop,"Content-Transfer-Encoding")==0){
 	char* encoding = sspm_value(line);
 	char* lencoding = sspm_lowercase(encoding);
 
-	if(strcmp(lencoding,"base64")==0){
+	if(strcasecmp(lencoding,"base64")==0){
 	    header->encoding = SSPM_BASE64_ENCODING;
-	} else 	if(strcmp(lencoding,"quoted-printable")==0){
+	} else 	if(strcasecmp(lencoding,"quoted-printable")==0){
 	    header->encoding = SSPM_QUOTED_PRINTABLE_ENCODING;
-	} else 	if(strcmp(lencoding,"binary")==0){
+	} else 	if(strcasecmp(lencoding,"binary")==0){
 	    header->encoding = SSPM_BINARY_ENCODING;
-	} else 	if(strcmp(lencoding,"7bit")==0){
+	} else 	if(strcasecmp(lencoding,"7bit")==0){
 	    header->encoding = SSPM_7BIT_ENCODING;
-	} else 	if(strcmp(lencoding,"8bit")==0){
+	} else 	if(strcasecmp(lencoding,"8bit")==0){
 	    header->encoding = SSPM_8BIT_ENCODING;
 	} else {
 	    header->encoding = SSPM_UNKNOWN_ENCODING;
@@ -583,7 +581,7 @@ void sspm_build_header(struct sspm_header *header, char* line)
 
 	header->def = 0;
 	
-    } else if(strcmp(prop,"Content-Id")==0){
+    } else if(strcasecmp(prop,"Content-Id")==0){
 	char* cid = sspm_value(line);
 	header->content_id = sspm_strdup(cid);
 	header->def = 0;
@@ -955,9 +953,9 @@ void sspm_read_header(struct mime_impl *impl,struct sspm_header *header)
 		
 		assert(strlen(buf) < BUF_SIZE);
 		
-		strncpy(header_lines[current_line],buf,BUF_SIZE-1);
+		strncpy(header_lines[current_line],buf,BUF_SIZE);
 		header_lines[current_line][BUF_SIZE-1] = '\0';
-		
+		      
 		break;
 	    }
 	    
@@ -991,8 +989,8 @@ void sspm_read_header(struct mime_impl *impl,struct sspm_header *header)
 		
 		assert( strlen(buf_start) + strlen(last_line) < BUF_SIZE);
 		
-		strncat(last_line,buf_start,BUF_SIZE-strlen(last_line)-1);
+		strncat(last_line,buf_start, BUF_SIZE-strlen(last_line)-1);
-		
+
 		break;
 	    }
 	    
@@ -1017,7 +1015,7 @@ void sspm_read_header(struct mime_impl *impl,struct sspm_header *header)
 /* Root routine for parsing mime entries*/
 int sspm_parse_mime(struct sspm_part *parts, 
 		    size_t max_parts,
-		    struct sspm_action_map *actions,
+		    const struct sspm_action_map *actions,
 		    char* (*get_string)(char *s, size_t size, void* data),
 		    void *get_string_data,
 		    struct sspm_header *first_header
@@ -1171,7 +1169,7 @@ char *decode_base64(char *dest,
 			     char *src,
 			     size_t *size)
 {
-    int cc = 0;
+    int cc;
     char buf[4] = {0,0,0,0};  
     int p = 0;
     int valid_data = 0;

calendar/libical/src/libical/sspm.h

@@ -3,7 +3,7 @@
   FILE: sspm.h Mime Parser
   CREATOR: eric 25 June 2000
   
-  $Id: sspm.h,v 1.2 2001/01/23 07:03:17 ebusboom Exp $
+  $Id: sspm.h,v 1.4 2007/08/21 02:45:54 artcancro Exp $
   $Locker:  $
     
  The contents of this file are subject to the Mozilla Public License
@@ -121,7 +121,7 @@ char* sspm_encoding_string(enum sspm_encoding type);
 
 int sspm_parse_mime(struct sspm_part *parts, 
 		    size_t max_parts,
-		    struct sspm_action_map *actions,
+		    const struct sspm_action_map *actions,
 		    char* (*get_string)(char *s, size_t size, void* data),
 		    void *get_string_data,
 		    struct sspm_header *first_header

calendar/libical/src/libicalss/Makefile.am

@@ -2,7 +2,7 @@
 #  FILE: Makefile.am
 #  CREATOR: eric 
 #  
-#  $Id: Makefile.am,v 1.21 2002/11/05 14:59:22 acampi Exp $
+#  $Id: Makefile.am,v 1.22 2007/04/30 13:57:48 artcancro Exp $
 #
 #
 # (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -46,13 +46,8 @@ BDB_SOURCEFILES=
 BDB_HEADERFILES=
 endif
 
-if WITH_CXX
-cxx_lib=libicalss_cxx.la
-cxx_headers=icalspanlist_cxx.h
-else
 cxx_lib=
 cxx_headers=
-endif
 
 lib_LTLIBRARIES = libicalss.la $(cxx_lib)
 
@@ -63,7 +58,7 @@ INCLUDES =			\
 	-I$(top_builddir)/libical \
 	$(BDB_INCLUDE)
 
-libicalss_la_LDFLAGS = -version-info 0:0:0
+libicalss_la_LDFLAGS = -version-info 27:6:27
 libicalss_la_LIBADD = $(BDB_LIBFILES)
 
 if DEV
@@ -129,20 +124,7 @@ icalss.h: $(COMBINEDHEADERS)
 	echo '};'                         >> icalss.h
 	echo '#endif'                     >> icalss.h
 
-
+libicalssinclude_HEADERS = icalss.h  icalcalendar.h icalclassify.h icalcluster.h icaldirset.h icaldirsetimpl.h icalfileset.h icalfilesetimpl.h icalgauge.h icalgaugeimpl.h icalmessage.h icalset.h icalspanlist.h icalssyacc.h $(libicalssinclude_BDBHEADERS)
-if WITH_CXX
-libicalss_cxx_la_SOURCES =	\
-	$(libicalss_la_SOURCES)	\
-	icalspanlist_cxx.h	\
-	icalspanlist_cxx.cpp
-
-# c++ needs ical.h auto-generated.
-icalspanlist_cxx.lo: icalss.h
-
-endif
-
-
-libicalssinclude_HEADERS = icalss.h  icalcalendar.h icalclassify.h icalcluster.h icaldirset.h icaldirsetimpl.h icalfileset.h icalfilesetimpl.h icalgauge.h icalgaugeimpl.h icalmessage.h icalset.h icalspanlist.h icalssyacc.h $(libicalssinclude_BDBHEADERS) $(cxx_headers)
 
 CONFIG_CLEAN_FILES = y.output
 

calendar/libical/src/libicalss/icalcalendar.c

@@ -2,7 +2,7 @@
   FILE: icalcalendar.c
   CREATOR: eric 23 December 1999
   
-  $Id: icalcalendar.c,v 1.6 2002/08/07 17:09:06 acampi Exp $
+  $Id: icalcalendar.c,v 1.7 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalcalendar.h

@@ -4,7 +4,7 @@
  CREATOR: eric 23 December 1999
 
 
- $Id: icalcalendar.h,v 1.2 2002/06/27 02:30:58 acampi Exp $
+ $Id: icalcalendar.h,v 1.3 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalclassify.c

@@ -3,7 +3,7 @@
     FILE: icalclassify.c
     CREATOR: ebusboom 23 aug 2000
   
-    $Id: icalclassify.c,v 1.14 2003/11/17 22:51:53 gray-john Exp $
+    $Id: icalclassify.c,v 1.17 2007/05/25 02:57:04 artcancro Exp $
     $Locker:  $
     
     (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -53,19 +53,18 @@ struct icalclassify_parts {
 char* icalclassify_lowercase(const char* str)
 {
     char* p = 0;
-    char* ret;
+    char *xnew;
 
     if(str ==0){
 	return 0;
     }
 
-    ret = icalmemory_strdup(str);
+    xnew = icalmemory_strdup(str);
-
+    for(p = xnew; *p!=0; p++){
-    for(p = ret; *p!=0; p++){
 	*p = tolower(*p);
     }
 
-    return ret;
+    return xnew;
 }
 
 /* Return a set of components that intersect in time with comp. For
@@ -148,9 +147,11 @@ icalproperty* icalclassify_find_attendee(icalcomponent *c,
 	p != 0;
 	p  = icalcomponent_get_next_property(inner,ICAL_ATTENDEE_PROPERTY))
     {
+	char* this_upn;
 	char* this_attendee
 	    = icalclassify_lowercase(icalproperty_get_attendee(p));
-	char* this_upn = strchr(this_attendee,':');
+	 if ( !this_attendee ) continue;
+	 this_upn = strchr(this_attendee,':');
 
         if(this_upn == 0){
             continue;
@@ -248,15 +249,16 @@ void icalssutil_get_parts(icalcomponent* c,
 	p  = icalcomponent_get_first_property(inner,ICAL_ATTENDEE_PROPERTY);
 
 	if(p!=0){
-
+	    char *attendee = 0;
 	    param = icalproperty_get_first_parameter(p,ICAL_PARTSTAT_PARAMETER);
 	    
 	    if(param != 0){
 		parts->reply_partstat = 
 		    icalparameter_get_partstat(param);
 	    }
-	    
+	    attendee = icalproperty_get_attendee(p);
-	    parts->reply_attendee = strdup(icalproperty_get_attendee(p));
+	    if ( attendee )
+		parts->reply_attendee = strdup( attendee );
 	}
 
     }    
@@ -644,7 +646,7 @@ int icalclassify_delinecounter(
     icalclassify_post
 }
 
-struct icalclassify_map {
+static const struct icalclassify_map {
 	icalproperty_method method;
 	int (*fn)(struct icalclassify_parts *comp,struct icalclassify_parts *match, const char* user);
 	icalproperty_xlicclass class;

calendar/libical/src/libicalss/icalclassify.h

@@ -4,7 +4,7 @@
  CREATOR: eric 21 Aug 2000
 
 
- $Id: icalclassify.h,v 1.4 2001/04/12 18:33:36 ebusboom Exp $
+ $Id: icalclassify.h,v 1.5 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalcluster.c

@@ -3,7 +3,7 @@
   FILE: icalcluster.c
   CREATOR: acampi 13 March 2002
   
-  $Id: icalcluster.c,v 1.3 2002/06/28 10:15:39 acampi Exp $
+  $Id: icalcluster.c,v 1.4 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2002, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalcluster.h

@@ -4,7 +4,7 @@
  CREATOR: eric 23 December 1999
 
 
- $Id: icalcluster.h,v 1.2 2002/06/27 02:30:58 acampi Exp $
+ $Id: icalcluster.h,v 1.3 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalclusterimpl.h

@@ -3,7 +3,7 @@
   FILE: icalfilesetimpl.h
   CREATOR: eric 23 December 1999
   
-  $Id: icalclusterimpl.h,v 1.1 2002/05/29 12:38:31 acampi Exp $
+  $Id: icalclusterimpl.h,v 1.2 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icaldirset.c

@@ -3,7 +3,7 @@
     FILE: icaldirset.c
     CREATOR: eric 28 November 1999
   
-    $Id: icaldirset.c,v 1.22 2005/01/24 14:00:39 acampi Exp $
+    $Id: icaldirset.c,v 1.23 2007/04/30 13:57:48 artcancro Exp $
     $Locker:  $
     
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -34,7 +34,7 @@
 
   icaldirset groups components in to clusters based on their DTSTAMP
   time -- all components that start in the same month are grouped
-  together in a single file. All files in a store are kept in a single
+  together in a single file. All files in a sotre are kept in a single
   directory. 
 
   The primary interfaces are icaldirset__get_first_component and

calendar/libical/src/libicalss/icaldirset.h

@@ -4,7 +4,7 @@
  CREATOR: eric 28 November 1999
 
 
- $Id: icaldirset.h,v 1.6 2002/06/27 02:30:58 acampi Exp $
+ $Id: icaldirset.h,v 1.7 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icaldirsetimpl.h

@@ -3,7 +3,7 @@
   FILE: icaldirsetimpl.h
   CREATOR: eric 21 Aug 2000
   
-  $Id: icaldirsetimpl.h,v 1.4 2002/06/27 02:30:58 acampi Exp $
+  $Id: icaldirsetimpl.h,v 1.5 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalfileset.c

@@ -3,7 +3,7 @@
   FILE: icalfileset.c
   CREATOR: eric 23 December 1999
   
-  $Id: icalfileset.c,v 1.32 2004/09/22 07:26:18 acampi Exp $
+  $Id: icalfileset.c,v 1.34 2007/05/31 21:26:15 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -59,7 +59,7 @@
 extern int errno;
 
 /** Default options used when NULL is passed to icalset_new() **/
-icalfileset_options icalfileset_options_default = {O_RDWR|O_CREAT, 0644, 0};
+icalfileset_options icalfileset_options_default = {O_RDWR|O_CREAT, 0644, 0, 0};
 
 int icalfileset_lock(icalfileset *set);
 int icalfileset_unlock(icalfileset *set);
@@ -117,7 +117,7 @@ icalset* icalfileset_init(icalset *set, const char* path, void* options_in)
 #ifndef WIN32
   fset->fd = open(fset->path, flags, mode);
 #else
-  fset->fd = open(fset->path, flags | O_BINARY, mode);
+  fset->fd = open(fset->path, flags, mode);
   /* fset->fd = sopen(fset->path,flags, _SH_DENYWR, _S_IREAD | _S_IWRITE); */
 #endif
     
@@ -180,13 +180,13 @@ icalcluster* icalfileset_produce_icalcluster(const char *path) {
 char* icalfileset_read_from_file(char *s, size_t size, void *d)
 {
     char* p = s;
-    int fd = (int)d;
+    icalfileset *set = d;
 
     /* Simulate fgets -- read single characters and stop at '\n' */
 
     for(p=s; p<s+size-1;p++){
 	
-	if(read(fd,p,1) != 1 || *p=='\n'){
+	if(read(set->fd,p,1) != 1 || *p=='\n'){
 	    p++;
 	    break;
 	} 
@@ -209,7 +209,7 @@ icalerrorenum icalfileset_read_file(icalfileset* set,mode_t mode)
   
     parser = icalparser_new();
 
-    icalparser_set_gen_data(parser,(void*)set->fd);
+    icalparser_set_gen_data(parser, set);
     set->cluster = icalparser_parse(parser,icalfileset_read_from_file);
     icalparser_free(parser);
 
@@ -333,10 +333,34 @@ int icalfileset_unlock(icalfileset *set)
 
     return (fcntl(set->fd, F_UNLCK, &lock)); 
 #else
-	return 0;
+    return 0;
 #endif
 }
 
+static char * shell_quote(const char *s)
+{
+    char *result;
+    char *p;
+    p = result = malloc(strlen(s)*5+1);
+    while(*s)
+    {
+	if (*s == '\'')
+	{
+	    *p++ = '\'';
+	    *p++ = '"';
+	    *p++ = *s++;
+	    *p++ = '"';
+	    *p++ = '\'';
+	}
+	else
+	{
+	    *p++ = *s++;
+	}
+    }
+    *p = '\0';
+    return result;
+}
+
 icalerrorenum icalfileset_commit(icalset* set)
 {
     char tmp[ICAL_PATH_MAX]; 
@@ -354,6 +378,21 @@ icalerrorenum icalfileset_commit(icalset* set)
 	return ICAL_NO_ERROR;
     }
     
+    if (fset->options.safe_saves == 1) {
+#ifndef WIN32
+	char *quoted_file = shell_quote(fset->path);
+	snprintf(tmp,ICAL_PATH_MAX,"cp '%s' '%s.bak'",fset->path, fset->path);
+	free(quoted_file);
+#else
+	snprintf(tmp,ICAL_PATH_MAX,"copy %s %s.bak", fset->path, fset->path);
+#endif
+
+	if(system(tmp) < 0){
+	    icalerror_set_errno(ICAL_FILE_ERROR);
+	    return ICAL_FILE_ERROR;
+	}
+    }
+
     if(lseek(fset->fd, 0, SEEK_SET) < 0){
 	icalerror_set_errno(ICAL_FILE_ERROR);
 	return ICAL_FILE_ERROR;

calendar/libical/src/libicalss/icalfileset.h

@@ -4,7 +4,7 @@
  CREATOR: eric 23 December 1999
 
 
- $Id: icalfileset.h,v 1.13 2002/12/05 13:45:20 acampi Exp $
+ $Id: icalfileset.h,v 1.14 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -41,6 +41,8 @@
 #define mode_t int
 #endif
 
+extern int icalfileset_safe_saves;
+
 typedef struct icalfileset_impl icalfileset;
 
 icalset* icalfileset_new(const char* path);
@@ -120,6 +122,7 @@ icalcomponent* icalfileset_get_component(icalset* cluster);
 typedef struct icalfileset_options {
   int          flags;		/**< flags for open() O_RDONLY, etc  */
   mode_t       mode;		/**< file mode */
+  int          safe_saves;	/**< to lock or not */
   icalcluster  *cluster;	/**< use this cluster to initialize data */
 } icalfileset_options;
 

calendar/libical/src/libicalss/icalfilesetimpl.h

@@ -3,7 +3,7 @@
   FILE: icalfilesetimpl.h
   CREATOR: eric 23 December 1999
   
-  $Id: icalfilesetimpl.h,v 1.5 2002/06/27 02:30:58 acampi Exp $
+  $Id: icalfilesetimpl.h,v 1.6 2007/04/30 13:57:48 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalgauge.c

@@ -4,7 +4,7 @@
  CREATOR: eric 23 December 1999
 
 
- $Id: icalgauge.c,v 1.13 2002/09/26 22:26:06 lindner Exp $
+ $Id: icalgauge.c,v 1.14 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalgauge.h

@@ -4,7 +4,7 @@
  CREATOR: eric 23 December 1999
 
 
- $Id: icalgauge.h,v 1.4 2002/06/27 02:30:59 acampi Exp $
+ $Id: icalgauge.h,v 1.5 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalgaugeimpl.h

@@ -4,7 +4,7 @@
  CREATOR: eric 09 Aug 2000
 
 
- $Id: icalgaugeimpl.h,v 1.6 2002/07/21 17:18:15 lindner Exp $
+ $Id: icalgaugeimpl.h,v 1.7 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalmessage.c

@@ -3,7 +3,7 @@
     FILE: icalmessage.c
     CREATOR: ebusboom 07 Nov 2000
   
-    $Id: icalmessage.c,v 1.7 2005/01/24 14:02:20 acampi Exp $
+    $Id: icalmessage.c,v 1.8 2007/04/30 13:57:48 artcancro Exp $
     $Locker:  $
     
     (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -115,7 +115,7 @@ icalcomponent *icalmessage_new_reply_base(icalcomponent* c,
 					    const char* msg)
 {
     icalproperty *attendee;
-    char tmp[1024];
+    char tmp[45];
 
     icalcomponent *reply = icalcomponent_vanew(
 	ICAL_VCALENDAR_COMPONENT,

calendar/libical/src/libicalss/icalmessage.h

@@ -4,7 +4,7 @@
  CREATOR: eric 07 Nov 2000
 
 
- $Id: icalmessage.h,v 1.1.1.1 2001/01/02 07:33:05 ebusboom Exp $
+ $Id: icalmessage.h,v 1.2 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalset.c

@@ -12,7 +12,7 @@
     icalheapset   Store components on the heap
     icalmysqlset  Store components in a mysql database. 
 
- $Id: icalset.c,v 1.16 2002/07/21 17:00:26 lindner Exp $
+ $Id: icalset.c,v 1.17 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalset.h

@@ -14,7 +14,7 @@
 **/
 
 /*
- $Id: icalset.h,v 1.13 2002/09/26 22:25:12 lindner Exp $
+ $Id: icalset.h,v 1.14 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalspanlist.c

@@ -3,7 +3,7 @@
     FILE: icalspanlist.c
     CREATOR: ebusboom 23 aug 2000
   
-    $Id: icalspanlist.c,v 1.13 2002/10/30 23:41:47 acampi Exp $
+    $Id: icalspanlist.c,v 1.14 2007/04/30 13:57:48 artcancro Exp $
     $Locker:  $
     
     (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalspanlist.h

@@ -4,7 +4,7 @@
  CREATOR: eric 21 Aug 2000
 
 
- $Id: icalspanlist.h,v 1.6 2002/06/28 10:15:39 acampi Exp $
+ $Id: icalspanlist.h,v 1.7 2007/04/30 13:57:48 artcancro Exp $
  $Locker:  $
 
  (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/libicalss/icalsslexer.l

@@ -6,7 +6,7 @@
   
   DESCRIPTION:
   
-  $Id: icalsslexer.l,v 1.7 2002/07/21 17:18:15 lindner Exp $
+  $Id: icalsslexer.l,v 1.9 2007/05/31 21:26:15 artcancro Exp $
   $Locker:  $
 
 (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -57,7 +57,9 @@ digit		[0-9]
 %array /* Make yytext an array. Slow, but handy. HACK */
 
 %option caseless
-%option reentrant-bison
+/* See http://lists.ximian.com/archives/public/evolution-hackers/2003-September/001304.html
+   if you run into problems with this option. */
+%option bison-bridge
 
 %s sql string_value
 
@@ -90,10 +92,11 @@ NULL			{ return SQLNULL; }
 ;			{ return EOL; }
 
 \'[\@\*A-Za-z0-9\-\.\:\ ]+\' {
-	int c = input(yy_globals);
+	/* int c = input(yy_globals);    removed this variable, does it work? */
+	int c = input();
 	unput(c);
 	if(c!='\''){
-		yylvalp->v_string= icalmemory_tmp_copy(yytext);
+		yylval_param->v_string= icalmemory_tmp_copy(yytext);
 		return STRING;
 	} else {
 		/*ssmore();*/
@@ -110,7 +113,8 @@ NULL			{ return SQLNULL; }
 
 %% 
 
-int yywrap(yyscan_t yy_globals)
+/* int yywrap(yyscan_t yy_globals) */
+int yywrap()
 {
      return 1;
 }

calendar/libical/src/libicalss/icalssyacc.c

@@ -39,7 +39,7 @@
   
   DESCRIPTION:
   
-  $Id: icalssyacc.c,v 1.7 2002/07/21 17:18:15 lindner Exp $
+  $Id: icalssyacc.c,v 1.9 2007/04/30 13:57:49 artcancro Exp $
   $Locker:  $
 
 (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
@@ -261,8 +261,8 @@ static const short yycheck[] =
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02111-1307, USA.  */
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.

calendar/libical/src/libicalss/icalssyacc.y

@@ -8,7 +8,7 @@
   
   DESCRIPTION:
   
-  $Id: icalssyacc.y,v 1.7 2002/07/21 17:18:15 lindner Exp $
+  $Id: icalssyacc.y,v 1.8 2007/04/30 13:57:49 artcancro Exp $
   $Locker:  $
 
 (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org

calendar/libical/src/test/Makefile.am

@@ -1,13 +1,7 @@
-if WITH_CXX
-cxx_inc=-DWITH_CXX
-cxx_libs=../libical/.libs/libical_cxx.a
-regression_cxx = regression-cxx.cpp
-else
 cxx_inc=
 cxx_libs=
 regression_cxx = 
 CXX=@CC@
-endif
 
 if WITH_BDB4
 bdb4_inc=-DWITH_BDB -I@BDB_DIR@/include
@@ -17,16 +11,14 @@ bdb4_inc=
 bdb4_libs=
 endif
 
-noinst_PROGRAMS = copycluster regression parser stow recur testmime testvcal process
+noinst_PROGRAMS = copycluster regression parser stow recur testmime process
 
-LDADD =  ../libicalss/.libs/libicalss.a ../libicalvcal/.libs/libicalvcal.a $(cxx_libs) ../libical/.libs/libical.a $(bdb4_libs)
+LDADD =  ../libicalss/.libs/libicalss.a $(cxx_libs) ../libical/.libs/libical.a $(bdb4_libs)
 
 LIBS = @PTHREAD_LIBS@
 
 INCLUDES = 				\
        -I. 				\
-       -I../libicalvcal 		\
-       -I$(srcdir)/../libicalvcal 	\
        -I$(srcdir) 			\
        -I../libical 			\
        -I$(srcdir)/../libical 		\
@@ -48,7 +40,6 @@ regression_SOURCES = 		\
 
 parser_SOURCES = icaltestparser.c
 stow_SOURCES = stow.c
-testvcal_SOURCES = testvcal.c
 recur_SOURCES = recur.c 
 testmime_SOURCES = testmime.c
 process_SOURCES = process.c

calendar/libical/src/test/Makefile.in

@@ -1,7 +1,8 @@
-# Makefile.in generated automatically by automake 1.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,57 +14,117 @@
 
 @SET_MAKE@
 
-SHELL = @SHELL@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
-
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
+install_sh_DATA = $(install_sh) -c -m 644
-INSTALL_DATA = @INSTALL_DATA@
+install_sh_PROGRAM = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-build_alias = @build_alias@
 build_triplet = @build@
-host_alias = @host_alias@
 host_triplet = @host@
-target_alias = @target_alias@
 target_triplet = @target@
+noinst_PROGRAMS = copycluster$(EXEEXT) regression$(EXEEXT) \
+	parser$(EXEEXT) stow$(EXEEXT) recur$(EXEEXT) testmime$(EXEEXT) \
+	process$(EXEEXT)
+subdir = src/test
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+PROGRAMS = $(noinst_PROGRAMS)
+am_copycluster_OBJECTS = copycluster.$(OBJEXT)
+copycluster_OBJECTS = $(am_copycluster_OBJECTS)
+copycluster_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+copycluster_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
+	$(am__DEPENDENCIES_1) ../libical/.libs/libical.a \
+	$(am__DEPENDENCIES_1)
+am_parser_OBJECTS = icaltestparser.$(OBJEXT)
+parser_OBJECTS = $(am_parser_OBJECTS)
+parser_LDADD = $(LDADD)
+parser_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
+	$(am__DEPENDENCIES_1) ../libical/.libs/libical.a \
+	$(am__DEPENDENCIES_1)
+am_process_OBJECTS = process.$(OBJEXT)
+process_OBJECTS = $(am_process_OBJECTS)
+process_LDADD = $(LDADD)
+process_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
+	$(am__DEPENDENCIES_1) ../libical/.libs/libical.a \
+	$(am__DEPENDENCIES_1)
+am_recur_OBJECTS = recur.$(OBJEXT)
+recur_OBJECTS = $(am_recur_OBJECTS)
+recur_LDADD = $(LDADD)
+recur_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
+	$(am__DEPENDENCIES_1) ../libical/.libs/libical.a \
+	$(am__DEPENDENCIES_1)
+am__objects_1 =
+am_regression_OBJECTS = regression.$(OBJEXT) \
+	regression-component.$(OBJEXT) regression-classify.$(OBJEXT) \
+	regression-utils.$(OBJEXT) regression-recur.$(OBJEXT) \
+	regression-storage.$(OBJEXT) $(am__objects_1)
+regression_OBJECTS = $(am_regression_OBJECTS)
+regression_LDADD = $(LDADD)
+regression_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
+	$(am__DEPENDENCIES_1) ../libical/.libs/libical.a \
+	$(am__DEPENDENCIES_1)
+am_stow_OBJECTS = stow.$(OBJEXT)
+stow_OBJECTS = $(am_stow_OBJECTS)
+stow_LDADD = $(LDADD)
+stow_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
+	$(am__DEPENDENCIES_1) ../libical/.libs/libical.a \
+	$(am__DEPENDENCIES_1)
+am_testmime_OBJECTS = testmime.$(OBJEXT)
+testmime_OBJECTS = $(am_testmime_OBJECTS)
+testmime_LDADD = $(LDADD)
+testmime_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
+	$(am__DEPENDENCIES_1) ../libical/.libs/libical.a \
+	$(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) $(process_SOURCES) \
+	$(recur_SOURCES) $(regression_SOURCES) $(stow_SOURCES) \
+	$(testmime_SOURCES)
+DIST_SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) \
+	$(process_SOURCES) $(recur_SOURCES) $(regression_SOURCES) \
+	$(stow_SOURCES) $(testmime_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
-AS = @AS@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BDB_DIR = @BDB_DIR@
 BDB_DIR_INCLUDE = @BDB_DIR_INCLUDE@
@@ -71,63 +132,128 @@ BDB_DIR_LIB = @BDB_DIR_LIB@
 BDB_LIB = @BDB_LIB@
 BDB_VERSION = @BDB_VERSION@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CC@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
+DEV_FALSE = @DEV_FALSE@
+DEV_TRUE = @DEV_TRUE@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+HAVE_PTHREAD_FALSE = @HAVE_PTHREAD_FALSE@
+HAVE_PTHREAD_TRUE = @HAVE_PTHREAD_TRUE@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-JAR = @JAR@
+LDFLAGS = @LDFLAGS@
-JAVA = @JAVA@
-JAVAC = @JAVAC@
-JAVAH = @JAVAH@
-JAVA_PLATFORM = @JAVA_PLATFORM@
 LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBOBJS = @LIBOBJS@
+LIBS = @PTHREAD_LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-OBJDUMP = @OBJDUMP@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
 PTHREAD_LIBS = @PTHREAD_LIBS@
-PY_CFLAGS = @PY_CFLAGS@
-PY_EXTRA_LIBS = @PY_EXTRA_LIBS@
-PY_LIBS = @PY_LIBS@
-PY_LIB_LOC = @PY_LIB_LOC@
 RANLIB = @RANLIB@
-RRCAP_CFLAGS = @RRCAP_CFLAGS@
+SED = @SED@
-RRCAP_LIBS = @RRCAP_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
 VERSION = @VERSION@
+WITH_BDB4_FALSE = @WITH_BDB4_FALSE@
+WITH_BDB4_TRUE = @WITH_BDB4_TRUE@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
 install_sh = @install_sh@
-python_val = @python_val@
+libdir = @libdir@
-CXX = @CXX@
+libexecdir = @libexecdir@
-@WITH_CXX_FALSE@CXX = @CC@
+localedir = @localedir@
-
+localstatedir = @localstatedir@
-@WITH_CXX_TRUE@cxx_inc = -DWITH_CXX
+mandir = @mandir@
-@WITH_CXX_FALSE@cxx_inc = 
+mkdir_p = @mkdir_p@
-@WITH_CXX_TRUE@cxx_libs = ../libical/.libs/libical_cxx.a
+oldincludedir = @oldincludedir@
-@WITH_CXX_FALSE@cxx_libs = 
+pdfdir = @pdfdir@
-@WITH_CXX_TRUE@regression_cxx = regression-cxx.cpp
+prefix = @prefix@
-@WITH_CXX_FALSE@regression_cxx = 
+program_transform_name = @program_transform_name@
-
+psdir = @psdir@
-@WITH_BDB4_TRUE@bdb4_inc = -DWITH_BDB -I@BDB_DIR@/include
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+cxx_inc = 
+cxx_libs = 
+regression_cxx = 
 @WITH_BDB4_FALSE@bdb4_inc = 
-@WITH_BDB4_TRUE@bdb4_libs = @BDB_DIR_LIB@/@BDB_LIB@
+@WITH_BDB4_TRUE@bdb4_inc = -DWITH_BDB -I@BDB_DIR@/include
 @WITH_BDB4_FALSE@bdb4_libs = 
-
+@WITH_BDB4_TRUE@bdb4_libs = @BDB_DIR_LIB@/@BDB_LIB@
-noinst_PROGRAMS = copycluster regression parser stow recur testmime testvcal process
+LDADD = ../libicalss/.libs/libicalss.a $(cxx_libs) ../libical/.libs/libical.a $(bdb4_libs)
-
-LDADD = ../libicalss/.libs/libicalss.a ../libicalvcal/.libs/libicalvcal.a $(cxx_libs) ../libical/.libs/libical.a $(bdb4_libs)
-
-LIBS = @PTHREAD_LIBS@
-
 INCLUDES = \
        -I. 				\
-       -I../libicalvcal 		\
-       -I$(srcdir)/../libicalvcal 	\
        -I$(srcdir) 			\
        -I../libical 			\
        -I$(srcdir)/../libical 		\
@@ -135,7 +261,6 @@ INCLUDES = \
        -I$(srcdir)/../libicalss         \
 	$(cxx_inc) $(bdb4_inc)
 
-
 TESTS = regression
 copycluster_SOURCES = copycluster.c
 regression_SOURCES = \
@@ -148,272 +273,51 @@ regression_SOURCES = \
 	regression-storage.c	\
 	$(regression_cxx)
 
-
 parser_SOURCES = icaltestparser.c
 stow_SOURCES = stow.c
-testvcal_SOURCES = testvcal.c
 recur_SOURCES = recur.c 
 testmime_SOURCES = testmime.c
 process_SOURCES = process.c
-subdir = src/test
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-noinst_PROGRAMS = copycluster$(EXEEXT) regression$(EXEEXT) \
-	parser$(EXEEXT) stow$(EXEEXT) recur$(EXEEXT) testmime$(EXEEXT) \
-	testvcal$(EXEEXT) process$(EXEEXT)
-PROGRAMS = $(noinst_PROGRAMS)
-
-am_copycluster_OBJECTS = copycluster.$(OBJEXT)
-copycluster_OBJECTS = $(am_copycluster_OBJECTS)
-copycluster_LDADD = $(LDADD)
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@copycluster_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@copycluster_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@copycluster_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@copycluster_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-copycluster_LDFLAGS =
-am_parser_OBJECTS = icaltestparser.$(OBJEXT)
-parser_OBJECTS = $(am_parser_OBJECTS)
-parser_LDADD = $(LDADD)
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@parser_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@parser_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@parser_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@parser_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-parser_LDFLAGS =
-am_process_OBJECTS = process.$(OBJEXT)
-process_OBJECTS = $(am_process_OBJECTS)
-process_LDADD = $(LDADD)
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@process_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@process_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@process_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@process_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-process_LDFLAGS =
-am_recur_OBJECTS = recur.$(OBJEXT)
-recur_OBJECTS = $(am_recur_OBJECTS)
-recur_LDADD = $(LDADD)
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@recur_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@recur_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@recur_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@recur_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-recur_LDFLAGS =
-@WITH_CXX_TRUE@am_regression_OBJECTS = regression.$(OBJEXT) \
-@WITH_CXX_TRUE@	regression-component.$(OBJEXT) \
-@WITH_CXX_TRUE@	regression-classify.$(OBJEXT) \
-@WITH_CXX_TRUE@	regression-utils.$(OBJEXT) \
-@WITH_CXX_TRUE@	regression-recur.$(OBJEXT) \
-@WITH_CXX_TRUE@	regression-storage.$(OBJEXT) \
-@WITH_CXX_TRUE@	regression-cxx.$(OBJEXT)
-@WITH_CXX_FALSE@am_regression_OBJECTS = regression.$(OBJEXT) \
-@WITH_CXX_FALSE@	regression-component.$(OBJEXT) \
-@WITH_CXX_FALSE@	regression-classify.$(OBJEXT) \
-@WITH_CXX_FALSE@	regression-utils.$(OBJEXT) \
-@WITH_CXX_FALSE@	regression-recur.$(OBJEXT) \
-@WITH_CXX_FALSE@	regression-storage.$(OBJEXT)
-regression_OBJECTS = $(am_regression_OBJECTS)
-regression_LDADD = $(LDADD)
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@regression_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@regression_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@regression_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@regression_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-regression_LDFLAGS =
-am_stow_OBJECTS = stow.$(OBJEXT)
-stow_OBJECTS = $(am_stow_OBJECTS)
-stow_LDADD = $(LDADD)
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@stow_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@stow_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@stow_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@stow_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-stow_LDFLAGS =
-am_testmime_OBJECTS = testmime.$(OBJEXT)
-testmime_OBJECTS = $(am_testmime_OBJECTS)
-testmime_LDADD = $(LDADD)
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@testmime_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@testmime_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@testmime_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@testmime_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-testmime_LDFLAGS =
-am_testvcal_OBJECTS = testvcal.$(OBJEXT)
-testvcal_OBJECTS = $(am_testvcal_OBJECTS)
-testvcal_LDADD = $(LDADD)
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@testvcal_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_FALSE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@testvcal_DEPENDENCIES = \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_FALSE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@testvcal_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical_cxx.a \
-@WITH_BDB4_TRUE@@WITH_CXX_TRUE@	../libical/.libs/libical.a
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@testvcal_DEPENDENCIES = \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalss/.libs/libicalss.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libicalvcal/.libs/libicalvcal.a \
-@WITH_BDB4_TRUE@@WITH_CXX_FALSE@	../libical/.libs/libical.a
-testvcal_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/copycluster.Po \
-@AMDEP_TRUE@	$(DEPDIR)/icaltestparser.Po $(DEPDIR)/process.Po \
-@AMDEP_TRUE@	$(DEPDIR)/recur.Po $(DEPDIR)/regression-classify.Po \
-@AMDEP_TRUE@	$(DEPDIR)/regression-component.Po \
-@AMDEP_TRUE@	$(DEPDIR)/regression-cxx.Po \
-@AMDEP_TRUE@	$(DEPDIR)/regression-recur.Po \
-@AMDEP_TRUE@	$(DEPDIR)/regression-storage.Po \
-@AMDEP_TRUE@	$(DEPDIR)/regression-utils.Po \
-@AMDEP_TRUE@	$(DEPDIR)/regression.Po $(DEPDIR)/stow.Po \
-@AMDEP_TRUE@	$(DEPDIR)/testmime.Po $(DEPDIR)/testvcal.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CXXFLAGS = @CXXFLAGS@
-DIST_SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) \
-	$(process_SOURCES) $(recur_SOURCES) $(regression_SOURCES) \
-	$(stow_SOURCES) $(testmime_SOURCES) $(testvcal_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(copycluster_SOURCES) $(parser_SOURCES) $(process_SOURCES) $(recur_SOURCES) $(regression_SOURCES) $(stow_SOURCES) $(testmime_SOURCES) $(testvcal_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
+.SUFFIXES: .c .lo .o .obj
-
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-mostlyclean-libtool:
+	@for dep in $?; do \
-	-rm -f *.lo
+	  case '$(am__configure_deps)' in \
-
+	    *$$dep*) \
-clean-libtool:
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-	-rm -rf .libs _libs
+		&& exit 0; \
-
+	      exit 1;; \
-distclean-libtool:
+	  esac; \
-	-rm -f libtool
+	done; \
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/test/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  src/test/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+.PRECIOUS: Makefile
-	cd $(top_builddir) && \
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	  CONFIG_HEADERS= CONFIG_LINKS= \
+	@case '$?' in \
-	  CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstPROGRAMS:
-	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  echo " rm -f $$p $$f"; \
+	  rm -f $$p $$f ; \
+	done
 copycluster$(EXEEXT): $(copycluster_OBJECTS) $(copycluster_DEPENDENCIES) 
 	@rm -f copycluster$(EXEEXT)
 	$(LINK) $(copycluster_LDFLAGS) $(copycluster_OBJECTS) $(copycluster_LDADD) $(LIBS)
@@ -428,114 +332,114 @@ recur$(EXEEXT): $(recur_OBJECTS) $(recur_DEPENDENCIES)
 	$(LINK) $(recur_LDFLAGS) $(recur_OBJECTS) $(recur_LDADD) $(LIBS)
 regression$(EXEEXT): $(regression_OBJECTS) $(regression_DEPENDENCIES) 
 	@rm -f regression$(EXEEXT)
-	$(CXXLINK) $(regression_LDFLAGS) $(regression_OBJECTS) $(regression_LDADD) $(LIBS)
+	$(LINK) $(regression_LDFLAGS) $(regression_OBJECTS) $(regression_LDADD) $(LIBS)
 stow$(EXEEXT): $(stow_OBJECTS) $(stow_DEPENDENCIES) 
 	@rm -f stow$(EXEEXT)
 	$(LINK) $(stow_LDFLAGS) $(stow_OBJECTS) $(stow_LDADD) $(LIBS)
 testmime$(EXEEXT): $(testmime_OBJECTS) $(testmime_DEPENDENCIES) 
 	@rm -f testmime$(EXEEXT)
 	$(LINK) $(testmime_LDFLAGS) $(testmime_OBJECTS) $(testmime_LDADD) $(LIBS)
-testvcal$(EXEEXT): $(testvcal_OBJECTS) $(testvcal_DEPENDENCIES) 
-	@rm -f testvcal$(EXEEXT)
-	$(LINK) $(testvcal_LDFLAGS) $(testvcal_OBJECTS) $(testvcal_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/copycluster.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copycluster.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/icaltestparser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icaltestparser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/process.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/recur.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recur.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-classify.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-classify.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-component.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-component.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-cxx.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-recur.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-recur.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-storage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-storage.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression-utils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression-utils.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regression.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regression.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/stow.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testmime.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testmime.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testvcal.Po@am__quote@
-
-distclean-depend:
-	-rm -rf $(DEPDIR)
 
 .c.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-	$(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-	$(COMPILE) -c `cygpath -w $<`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-	$(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-CCDEPMODE = @CCDEPMODE@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-.cpp.o:
+mostlyclean-libtool:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+	-rm -f *.lo
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
 
-.cpp.obj:
+clean-libtool:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+	-rm -rf .libs _libs
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(CXXCOMPILE) -c -o $@ `cygpath -w $<`
 
-.cpp.lo:
+distclean-libtool:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+	-rm -f libtool
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
-CXXDEPMODE = @CXXDEPMODE@
 uninstall-info-am:
 
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique $(LISP)
+	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
 
 GTAGS:
-	here=`CDPATH=: && cd $(top_builddir) && pwd` \
+	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 check-TESTS: $(TESTS)
-	@failed=0; all=0; xfail=0; xpass=0; \
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list='$(TESTS)'; \
 	if test -n "$$list"; then \
@@ -547,26 +451,29 @@ check-TESTS: $(TESTS)
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
 	      *" $$tst "*) \
-	        xpass=`expr $$xpass + 1`; \
+		xpass=`expr $$xpass + 1`; \
-	        failed=`expr $$failed + 1`; \
+		failed=`expr $$failed + 1`; \
-	        echo "XPASS: $$tst"; \
+		echo "XPASS: $$tst"; \
 	      ;; \
 	      *) \
-	        echo "PASS: $$tst"; \
+		echo "PASS: $$tst"; \
 	      ;; \
 	      esac; \
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
 	      *" $$tst "*) \
-	        xfail=`expr $$xfail + 1`; \
+		xfail=`expr $$xfail + 1`; \
-	        echo "XFAIL: $$tst"; \
+		echo "XFAIL: $$tst"; \
 	      ;; \
 	      *) \
-	        failed=`expr $$failed + 1`; \
+		failed=`expr $$failed + 1`; \
-	        echo "FAIL: $$tst"; \
+		echo "FAIL: $$tst"; \
 	      ;; \
 	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      echo "SKIP: $$tst"; \
 	    fi; \
 	  done; \
 	  if test "$$failed" -eq 0; then \
@@ -582,28 +489,49 @@ check-TESTS: $(TESTS)
 	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
 	    fi; \
 	  fi; \
-	  dashes=`echo "$$banner" | sed s/./=/g`; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    skipped="($$skip tests were not run)"; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  echo "$$dashes"; \
 	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
 	  echo "$$dashes"; \
 	  test "$$failed" -eq 0; \
-	fi
+	else :; fi
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    $(mkinstalldirs) "$(distdir)/$$dir"; \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
 	  fi; \
 	  if test -d $$d/$$file; then \
-	    cp -pR $$d/$$file $(distdir) \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	    || exit 1; \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || cp -p $$d/$$file $(distdir)/$$file \
@@ -614,9 +542,7 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile $(PROGRAMS)
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -628,6 +554,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -635,7 +562,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -646,14 +573,17 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
 	mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -rf ./$(DEPDIR)
-distclean-am: clean-am distclean-compile distclean-depend \
+	-rm -f Makefile
-	distclean-generic distclean-libtool distclean-tags
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -669,7 +599,8 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
@@ -677,17 +608,26 @@ mostlyclean: mostlyclean-am
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am check check-TESTS check-am clean clean-generic \
+.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-libtool clean-noinstPROGRAMS distclean distclean-compile \
+	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
-	distclean-depend distclean-generic distclean-libtool \
+	distclean distclean-compile distclean-generic \
-	distclean-tags distdir dvi dvi-am info info-am install \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	install-am install-data install-data-am install-exec \
+	html-am info info-am install install-am install-data \
-	install-exec-am install-info install-info-am install-man \
+	install-data-am install-exec install-exec-am install-info \
-	install-strip installcheck installcheck-am installdirs \
+	install-info-am install-man install-strip installcheck \
-	maintainer-clean maintainer-clean-generic mostlyclean \
+	installcheck-am installdirs maintainer-clean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

calendar/libical/src/test/copycluster.c

@@ -3,7 +3,7 @@
   FILE: copycluster.c
   CREATOR: eric 15 January 2000
   
-  $Id: copycluster.c,v 1.15 2002/07/16 10:04:08 acampi Exp $
+  $Id: copycluster.c,v 1.16 2007/04/30 13:57:49 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000 Eric Busboom

calendar/libical/src/test/icaltestparser.c

@@ -3,7 +3,7 @@
   FILE: icaltestparser.c
   CREATOR: eric 20 June 1999
   
-  $Id: icaltestparser.c,v 1.2 2001/01/16 06:55:09 ebusboom Exp $
+  $Id: icaltestparser.c,v 1.3 2007/04/30 13:57:49 artcancro Exp $
   $Locker:  $
     
  The contents of this file are subject to the Mozilla Public License

calendar/libical/src/test/process.c

@@ -3,7 +3,7 @@
   FILE: process.c
   CREATOR: eric 11 February 2000
   
-  $Id: process.c,v 1.7 2002/06/28 10:45:12 acampi Exp $
+  $Id: process.c,v 1.8 2007/04/30 13:57:49 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000 Eric Busboom

calendar/libical/src/test/regression-classify.c

@@ -3,7 +3,7 @@
   FILE: regression-classify.c
   CREATOR: eric 11 February 2000
   
-  $Id: regression-classify.c,v 1.3 2002/08/07 17:18:13 acampi Exp $
+  $Id: regression-classify.c,v 1.4 2007/04/30 13:57:49 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000 Eric Busboom

calendar/libical/src/test/regression-component.c

@@ -316,7 +316,7 @@ void create_new_component_with_va_args()
 		    icalproperty_new_tzoffsetfrom(-4.0),
 		    icalproperty_new_tzoffsetto(-5.0),
 		    icalproperty_new_tzname("EST"),
-		    0
+		    NULL
 		    ),
 		icalcomponent_vanew(
 		    ICAL_XSTANDARD_COMPONENT,
@@ -325,9 +325,9 @@ void create_new_component_with_va_args()
 		    icalproperty_new_tzoffsetfrom(-5.0),
 		    icalproperty_new_tzoffsetto(-4.0),
 		    icalproperty_new_tzname("EST"),
-		    0
+		    NULL
 		    ),
-		0
+		NULL
 		),
 	    icalcomponent_vanew(
 		ICAL_VEVENT_COMPONENT,
@@ -336,14 +336,14 @@ void create_new_component_with_va_args()
 		icalproperty_vanew_organizer(
 		    "mrbig@host.com",
 		    icalparameter_new_role(ICAL_ROLE_CHAIR),
-		    0
+		    NULL
 		    ),
 		icalproperty_vanew_attendee(
 		    "employee-A@host.com",
 		    icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT),
 		    icalparameter_new_rsvp(ICAL_RSVP_TRUE),
 		    icalparameter_new_cutype(ICAL_CUTYPE_GROUP),
-		    0
+		    NULL
 		    ),
 		icalproperty_new_description("Project XYZ Review Meeting"),
 		icalproperty_new_categories("MEETING"),
@@ -353,17 +353,17 @@ void create_new_component_with_va_args()
 		icalproperty_vanew_dtstart(
 		    atime,
 		    icalparameter_new_tzid("America/New_York"),
-		    0
+		    NULL
 		    ),
 		icalproperty_vanew_dtend(
 		    atime,
 		    icalparameter_new_tzid("America/New_York"),
-		    0
+		    NULL
 		    ),
 		icalproperty_new_location("1CP Conference Room 4350"),
-		0
+		NULL
 		),
-	    0
+	    NULL
 	    );
 
     ok("creating a complex vcalendar", (calendar != NULL));

calendar/libical/src/test/regression-storage.c

@@ -5,7 +5,7 @@
   
   DESCRIPTION:
   
-  $Id: regression-storage.c,v 1.3 2002/08/07 17:19:55 acampi Exp $
+  $Id: regression-storage.c,v 1.4 2007/04/30 13:57:49 artcancro Exp $
   $Locker:  $
 
   (C) COPYRIGHT 1999 Eric Busboom 

calendar/libical/src/test/stow.c

@@ -3,7 +3,7 @@
   FILE: stow.c
   CREATOR: eric 29 April 2000
   
-  $Id: stow.c,v 1.8 2003/11/17 22:51:53 gray-john Exp $
+  $Id: stow.c,v 1.9 2007/04/30 13:57:49 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000 Eric Busboom
@@ -121,19 +121,17 @@ enum file_type test_file(char *path)
 char* lowercase(const char* str)
 {
     char* p = 0;
-    char* ret;
+    char* new = strdup(str);
 
     if(str ==0){
 	return 0;
     }
 
-    ret = strdup(str);
+    for(p = new; *p!=0; p++){
-
-    for(p = ret; *p!=0; p++){
 	*p = tolower(*p);
     }
 
-    return ret;
+    return new;
 }
 
 #if 0

calendar/libical/src/test/testmime.c

@@ -3,7 +3,7 @@
   FILE: 
   CREATOR: eric 25 June 2000
   
-  $Id: testmime.c,v 1.3 2002/06/28 10:45:12 acampi Exp $
+  $Id: testmime.c,v 1.4 2007/04/30 13:57:49 artcancro Exp $
   $Locker:  $
     
  The contents of this file are subject to the Mozilla Public License

calendar/libical/src/test/testvcal.c

@@ -3,7 +3,7 @@
   FILE: vcal.c
   CREATOR: eric 26 May 2000
   
-  $Id: testvcal.c,v 1.2 2001/04/02 17:16:47 ebusboom Exp $
+  $Id: testvcal.c,v 1.3 2007/04/30 13:57:49 artcancro Exp $
   $Locker:  $
     
  (C) COPYRIGHT 2000 Eric Busboom

calendar/libical/test-data/recur.txt

@@ -19,7 +19,7 @@ DTSTART
  :20020402T114500 
 DTEND 
  :20020402T124500 
-X-EXPECT-NUMEVENTS: 7 
+X-EXPECT-NUMEVENTS: 6 
 END:VEVENT 
 
 
@@ -44,7 +44,7 @@ DTSTART
  :19970512T090000
 RRULE
  :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=MO;BYWEEKNO=20
-X-EXPECT-NUMEVENTS: 11
+X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 
@@ -156,7 +156,7 @@ DTSTART
  ;TZID=America/Los_Angeles
  :19980101T090000
 RRULE
- :FREQ=DAILY;UNTIL=20000131T170000Z;INTERVAL=1;BYMONTH=1
+ :FREQ=DAILY;UNTIL=20000131T090000Z;INTERVAL=1;BYMONTH=1
 X-EXPECT-NUMEVENTS: 93
 END:VEVENT
 
@@ -267,7 +267,7 @@ DTSTART
  :19970902T090000
 RRULE
  :FREQ=WEEKLY;INTERVAL=2;UNTIL=19971224T000000Z;BYDAY=MO,WE,FR;WKST=SU
-X-EXPECT-NUMEVENTS: 25
+X-EXPECT-NUMEVENTS: 24
 END:VEVENT
 
 BEGIN:VEVENT
@@ -435,7 +435,7 @@ DTSTART
  :19970512T090000
 RRULE
  :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=MO;BYWEEKNO=20
-X-EXPECT-NUMEVENTS: 11
+X-EXPECT-NUMEVENTS: 10
 END:VEVENT
 
 
@@ -522,7 +522,8 @@ BEGIN:VEVENT
 DESCRIPTION
  :Every 3 hours from 9:00 AM to 5:00 PM on a specific day:
 DTSTART
- :19970902T090000Z
+ ;TZID=America/Los_Angeles
+ :19970902T090000
 RRULE
  :FREQ=HOURLY;UNTIL=19970902T170000Z;INTERVAL=3
 X-EXPECT-NUMEVENTS: 3

calendar/libical/zoneinfo/Africa/Abidjan.ics

@@ -1,22 +1,14 @@
 BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010626_2/Africa/Abidjan
+TZID:/citadel.org/20070227_1/Africa/Abidjan
 X-LIC-LOCATION:Africa/Abidjan
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
-TZOFFSETTO:-001608
-TZNAME:LMT
-DTSTART:00010101T000000
-RDATE:00010101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-001608
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19120101T000000
+DTSTART:19700101T000000
-RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

calendar/libical/zoneinfo/Africa/Accra.ics

@@ -1,48 +1,14 @@
 BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010626_2/Africa/Accra
+TZID:/citadel.org/20070227_1/Africa/Accra
 X-LIC-LOCATION:Africa/Accra
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
-TZOFFSETTO:-000052
-TZNAME:LMT
-DTSTART:00010101T000000
-RDATE:00010101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-000052
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19180101T000000
+DTSTART:19700101T000000
-RDATE:19180101T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0020
-TZNAME:GHST
-DTSTART:19360901T000000
-RDATE:19360901T000000
-RDATE:19370901T000000
-RDATE:19380901T000000
-RDATE:19390901T000000
-RDATE:19400901T000000
-RDATE:19410901T000000
-RDATE:19420901T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0020
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19361231T000000
-RDATE:19361231T000000
-RDATE:19371231T000000
-RDATE:19381231T000000
-RDATE:19391231T000000
-RDATE:19401231T000000
-RDATE:19411231T000000
-RDATE:19421231T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

calendar/libical/zoneinfo/Africa/Addis_Ababa.ics

@@ -1,29 +1,14 @@
 BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010626_2/Africa/Addis_Ababa
+TZID:/citadel.org/20070227_1/Africa/Addis_Ababa
 X-LIC-LOCATION:Africa/Addis_Ababa
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+TZOFFSETFROM:+0300
-TZOFFSETTO:+023448
-TZNAME:LMT
-DTSTART:00010101T000000
-RDATE:00010101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+023448
-TZOFFSETTO:+023520
-TZNAME:ADMT
-DTSTART:18700101T000000
-RDATE:18700101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+023520
 TZOFFSETTO:+0300
 TZNAME:EAT
-DTSTART:19360505T000000
+DTSTART:19700101T000000
-RDATE:19360505T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

calendar/libical/zoneinfo/Africa/Algiers.ics

@@ -1,97 +1,14 @@
 BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010626_2/Africa/Algiers
+TZID:/citadel.org/20070227_1/Africa/Algiers
 X-LIC-LOCATION:Africa/Algiers
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+001212
-TZNAME:LMT
-DTSTART:00010101T000000
-RDATE:00010101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+001212
-TZOFFSETTO:+000921
-TZNAME:PMT
-DTSTART:18910315T000100
-RDATE:18910315T000100
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+000921
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19110311T000000
-RDATE:19110311T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:WEST
-DTSTART:19160614T230000
-RDATE:19160614T230000
-RDATE:19170324T230000
-RDATE:19180309T230000
-RDATE:19190301T230000
-RDATE:19200214T230000
-RDATE:19210314T230000
-RDATE:19390911T230000
-RDATE:19710425T230000
-RDATE:19770506T000000
-RDATE:19800425T000000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0000
-TZNAME:WET
-DTSTART:19161002T000000
-RDATE:19161002T000000
-RDATE:19171008T000000
-RDATE:19181007T000000
-RDATE:19191006T000000
-RDATE:19201024T000000
-RDATE:19210622T000000
-RDATE:19391119T010000
-RDATE:19461007T000000
-RDATE:19630414T000000
-RDATE:19710927T000000
-RDATE:19791026T000000
-RDATE:19801031T020000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19400225T020000
-RDATE:19400225T020000
-RDATE:19560129T000000
-RDATE:19810501T000000
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19440403T020000
-RDATE:19440403T020000
-RDATE:19450402T020000
-RDATE:19780324T010000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19441008T020000
-RDATE:19441008T020000
-RDATE:19450916T010000
-RDATE:19780922T030000
-END:STANDARD
-BEGIN:STANDARD
 TZOFFSETFROM:+0100
 TZOFFSETTO:+0100
 TZNAME:CET
-DTSTART:19771021T000000
+DTSTART:19700101T000000
-RDATE:19771021T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

calendar/libical/zoneinfo/Africa/Asmara.ics

@@ -0,0 +1,14 @@
+BEGIN:VCALENDAR
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:/citadel.org/20070227_1/Africa/Asmara
+X-LIC-LOCATION:Africa/Asmara
+BEGIN:STANDARD
+TZOFFSETFROM:+0300
+TZOFFSETTO:+0300
+TZNAME:EAT
+DTSTART:19700101T000000
+END:STANDARD
+END:VTIMEZONE
+END:VCALENDAR

calendar/libical/zoneinfo/Africa/Bamako.ics

@@ -1,36 +1,14 @@
 BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010626_2/Africa/Bamako
+TZID:/citadel.org/20070227_1/Africa/Bamako
 X-LIC-LOCATION:Africa/Bamako
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
-TZOFFSETTO:-0032
-TZNAME:LMT
-DTSTART:00010101T000000
-RDATE:00010101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0032
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19120101T000000
+DTSTART:19700101T000000
-RDATE:19120101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0000
-TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19340226T000000
-RDATE:19340226T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
-TZOFFSETTO:+0000
-TZNAME:GMT
-DTSTART:19600620T000000
-RDATE:19600620T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

calendar/libical/zoneinfo/Africa/Bangui.ics

@@ -1,22 +1,14 @@
 BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010626_2/Africa/Bangui
+TZID:/citadel.org/20070227_1/Africa/Bangui
 X-LIC-LOCATION:Africa/Bangui
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+TZOFFSETFROM:+0100
-TZOFFSETTO:+011420
-TZNAME:LMT
-DTSTART:00010101T000000
-RDATE:00010101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+011420
 TZOFFSETTO:+0100
 TZNAME:WAT
-DTSTART:19120101T000000
+DTSTART:19700101T000000
-RDATE:19120101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

calendar/libical/zoneinfo/Africa/Banjul.ics

@@ -1,36 +1,14 @@
 BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010626_2/Africa/Banjul
+TZID:/citadel.org/20070227_1/Africa/Banjul
 X-LIC-LOCATION:Africa/Banjul
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
-TZOFFSETTO:-010636
-TZNAME:LMT
-DTSTART:00010101T000000
-RDATE:00010101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-010636
-TZOFFSETTO:-010636
-TZNAME:BMT
-DTSTART:19120101T000000
-RDATE:19120101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-010636
-TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19350101T000000
-RDATE:19350101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19640101T000000
+DTSTART:19700101T000000
-RDATE:19640101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

calendar/libical/zoneinfo/Africa/Bissau.ics

@@ -1,29 +1,14 @@
 BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010626_2/Africa/Bissau
+TZID:/citadel.org/20070227_1/Africa/Bissau
 X-LIC-LOCATION:Africa/Bissau
 BEGIN:STANDARD
 TZOFFSETFROM:+0000
-TZOFFSETTO:-010220
-TZNAME:LMT
-DTSTART:00010101T000000
-RDATE:00010101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-010220
-TZOFFSETTO:-0100
-TZNAME:WAT
-DTSTART:19110526T000000
-RDATE:19110526T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:-0100
 TZOFFSETTO:+0000
 TZNAME:GMT
-DTSTART:19750101T000000
+DTSTART:19700101T000000
-RDATE:19750101T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR

calendar/libical/zoneinfo/Africa/Blantyre.ics

@@ -1,22 +1,14 @@
 BEGIN:VCALENDAR
-PRODID:-//Ximian//NONSGML Evolution Olson-VTIMEZONE Converter//EN
+PRODID:-//citadel.org//NONSGML Citadel calendar//EN
 VERSION:2.0
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20010626_2/Africa/Blantyre
+TZID:/citadel.org/20070227_1/Africa/Blantyre
 X-LIC-LOCATION:Africa/Blantyre
 BEGIN:STANDARD
-TZOFFSETFROM:+0000
+TZOFFSETFROM:+0200
-TZOFFSETTO:+0220
-TZNAME:LMT
-DTSTART:00010101T000000
-RDATE:00010101T000000
-END:STANDARD
-BEGIN:STANDARD
-TZOFFSETFROM:+0220
 TZOFFSETTO:+0200
 TZNAME:CAT
-DTSTART:19030301T000000
+DTSTART:19700101T000000
-RDATE:19030301T000000
 END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR