# HG changeset patch
# User carl
# Date 1184116718 25200
# Node ID c039743577719a436ca33d903ba2eb189660e5ff
# Parent  b88ceb81dba2f1ddd182d3e0cff0fa59a5f696de
mege changes from Joe Nahmias


diff -r b88ceb81dba2 -r c03974357771 package
--- a/package	Tue Jul 10 17:17:28 2007 -0700
+++ b/package	Tue Jul 10 18:18:38 2007 -0700
@@ -56,23 +56,23 @@
     tail -10 $distlog
 fi
 chown --recursive carl:carl *
-args="--recursive -z -e ssh --times --perms --links --relative --owner --group --numeric-ids --delete"
-echo rsync $args $web ns1:/
-rsync $args $web ns1:/
-
-if [ -f /usr/local/bin/pst2ldif ]; then
-    pushd /home/ldap
-        pst=outlook.pst
-        #rm -f pst2ldif.log my.log
-        /usr/local/bin/pst2ldif -b 'o=ams-cc.com, c=US' -c 'newPerson' $pst >ams.ldif2
-        #./readpstlog pst2ldif.log | less >my.log
-        #hexdump -C $pst >pst.dump
-
-        grep '^dn:' ams.ldif2 | sort >aaa
-        grep '^dn:' ams.ldif  | sort >bbb
-        echo 'differences from nightly ldap'
-        diff aaa bbb
-        echo 'end differences'
-        rm -f aaa bbb
-    popd
-fi
+#args="--recursive -z -e ssh --times --perms --links --relative --owner --group --numeric-ids --delete"
+#echo rsync $args $web ns1:/
+#rsync $args $web ns1:/
+#
+#if [ -f /usr/local/bin/pst2ldif ]; then
+#    pushd /home/ldap
+#        pst=outlook.pst
+#        #rm -f pst2ldif.log my.log
+#        /usr/local/bin/pst2ldif -b 'o=ams-cc.com, c=US' -c 'newPerson' $pst >ams.ldif2
+#        #./readpstlog pst2ldif.log | less >my.log
+#        #hexdump -C $pst >pst.dump
+#
+#        grep '^dn:' ams.ldif2 | sort >aaa
+#        grep '^dn:' ams.ldif  | sort >bbb
+#        echo 'differences from nightly ldap'
+#        diff aaa bbb
+#        echo 'end differences'
+#        rm -f aaa bbb
+#    popd
+#fi
diff -r b88ceb81dba2 -r c03974357771 xml/libpst.in
--- a/xml/libpst.in	Tue Jul 10 17:17:28 2007 -0700
+++ b/xml/libpst.in	Tue Jul 10 18:18:38 2007 -0700
@@ -1167,6 +1167,7 @@
 8205  Appointment shows as
 8208  Appointment Location
 8214  Label for appointment
+8215  All day appointment flag
 8234  TimeZone of times
 8235  Appointment Start Time
 8236  Appointment End Time