Index: trunk/build.properties
===================================================================
--- trunk/build.properties (revision 1951)
+++ trunk/build.properties (revision 2625)
@@ -7,5 +7,5 @@
 
 # Version we are building
-org.bedework.version=3.5
+org.bedework.version=3.6
 
 # Name of generated jar files
Index: trunk/build.xml
===================================================================
--- trunk/build.xml (revision 2407)
+++ trunk/build.xml (revision 2625)
@@ -28,7 +28,4 @@
   <property name="org.bedework.project.bwtools"
             location="${org.bedework.projects}/bwtools" />
-
-  <property name="org.bedework.project.bwtzsvr"
-            location="${org.bedework.projects}/bwtzsvr" />
 
   <property name="org.bedework.project.caldav"
@@ -200,5 +197,5 @@
        ================================================================= -->
 
-  <target name="build" depends="init.build,build.rpiutil,build.bwtzsvr,
+  <target name="build" depends="init.build,build.rpiutil,
                                 build.access,build.davutil,
                                 build.webdav,build.caldav,
@@ -213,5 +210,5 @@
   </target>
 
-  <target name="clean" depends="init,clean.rpiutil,clean.bwtzsvr,
+  <target name="clean" depends="init,clean.rpiutil,
                                 clean.access,clean.davutil,
                                 clean.calendarapi,clean.dumprestore,
@@ -225,5 +222,5 @@
   </target>
 
-  <target name="quickstart-clean" depends="init,clean.rpiutil,clean.bwtzsvr,
+  <target name="quickstart-clean" depends="init,clean.rpiutil,
                                            clean.access,clean.davutil,
                                            clean.calendarapi,clean.dumprestore,
@@ -434,25 +431,4 @@
   <target name="clean.build.bwtools" depends="clean.bwtools,build.bwtools"
           description="builds the bwtools project"/>
-
-  <!-- .................................................................
-                          bwtzsvr
-       .................................................................. -->
-  <target name="build.bwtzsvr" depends="init"
-          description="builds the bwtzsvr project">
-    <ant antfile="${org.bedework.project.bwtzsvr}/build.xml" inheritall="false"
-           target="build-all"  >
-      <property name="org.bedework.libcache.dir"
-                location="${org.bedework.project.bedework}/libcache"/>
-    </ant>
-  </target>
-
-  <target name="clean.bwtzsvr" depends="init"
-          description="clean the bwtzsvr project">
-    <ant antfile="${org.bedework.project.bwtzsvr}/build.xml" inheritall="false"
-           target="deep-clean" />
-  </target>
-
-  <target name="clean.build.bwtzsvr" depends="clean.bwtzsvr,build.bwtzsvr"
-          description="builds the bwtzsvr project"/>
 
   <!-- .................................................................
Index: trunk/build/quickstart/linux/bw
===================================================================
--- trunk/build/quickstart/linux/bw (revision 2591)
+++ trunk/build/quickstart/linux/bw (revision 2625)
@@ -45,4 +45,5 @@
   echo "     -monitor     Target is for the bedework monitor application"
   echo "     -naming      Target is for the abstract naming api"
+  echo "     -tzsvr       Target is for the timezones server build"
   echo "     The default is a calendar build"
   echo ""
@@ -218,4 +219,5 @@
 naming=
 monitor=
+tzsvr=
 
 action=
@@ -303,4 +305,9 @@
       shift
       ;;
+    -tzsvr)
+      tzsvr="yes"
+      pkgdefault=
+      shift
+      ;;
     -*)
       usage
@@ -337,4 +344,8 @@
 echo "BWCONFIG=$BWCONFIG"
 
+if [ "$caldav" != "" ] ; then
+  cd $QUICKSTART_HOME/bedework/projects/caldav
+fi
+
 if [ "$carddav" != "" ] ; then
   cd $QUICKSTART_HOME/bedework-carddav
@@ -349,11 +360,11 @@
 fi
 
+if [ "$tzsvr" != "" ] ; then
+  cd $QUICKSTART_HOME/bwtzsvr
+fi
+
 if [ "$webdav" != "" ] ; then
   cd $QUICKSTART_HOME/bedework/projects/webdav
 fi
 
-if [ "$caldav" != "" ] ; then
-  cd $QUICKSTART_HOME/bedework/projects/caldav
-fi
-
 $JAVA_HOME/bin/java -classpath $CLASSPATH $ant_xmllogfile $offline -Dant.home=$ANT_HOME org.apache.tools.ant.launch.Launcher $BWCONFIG $ant_listener $ant_logger $*
Index: trunk/deployutil/build.xml
===================================================================
--- trunk/deployutil/build.xml (revision 2624)
+++ trunk/deployutil/build.xml (revision 2625)
@@ -12,5 +12,5 @@
 
   <target name="init">
-     <delete dir="${lib.dir}" />
+    <delete dir="${lib.dir}" />
     <mkdir dir="${lib.dir}" />