--- a/CMakeLists.txt	Fri Aug 17 15:04:28 2007 -0400
+++ b/CMakeLists.txt	Fri Aug 17 15:08:27 2007 -0400
@@ -29,7 +29,7 @@
 add_definitions				(${cgal_cxxflags})
 find_library				(cgal_LIBRARY				NAMES CGAL
 														PATHS ${cgal_libpath})
-find_library				(core_LIBRARY				NAMES core++
+find_library				(core_LIBRARY				NAMES CGALcore++
 														PATHS ${cgal_libpath})
 find_library				(mpfr_LIBRARY				NAMES mpfr)
 find_library				(gmp_LIBRARY				NAMES gmp)

--- a/FindCGAL.Makefile	Fri Aug 17 15:04:28 2007 -0400
+++ b/FindCGAL.Makefile	Fri Aug 17 15:08:27 2007 -0400
@@ -3,7 +3,7 @@
 all: libpath libpaths ldflags cxxflags
 
 libpath:
-	@echo "$(CGAL_LIB_DIR)/$(CGAL_OS_COMPILER)"
+	@echo "$(CGAL_LIB_DIR)"
 
 libpaths:
 	@echo "$(CGAL_LIBPATHFLAGS)"

--- a/README	Fri Aug 17 15:04:28 2007 -0400
+++ b/README	Fri Aug 17 15:08:27 2007 -0400
@@ -1,5 +1,5 @@
 Dependencies
-  CGAL-3.2 -    for alpha-shapes and kinetic data structures
+  CGAL-3.3 -    for alpha-shapes and kinetic data structures
   DSR-PDB -     for reading in PDB files
   cmake -       for controlling the build process
   boost -       great set of C++ libraries

--- a/examples/alphashapes/alpharadius.cpp	Fri Aug 17 15:04:28 2007 -0400
+++ b/examples/alphashapes/alpharadius.cpp	Fri Aug 17 15:08:27 2007 -0400
@@ -17,7 +17,7 @@
 	void set_distance(const Point& p)
 	{
 		AlphaSimplex3D::VertexContainer::const_iterator cur = vertices().begin();
-		CGAL::Vector_3<K> v = ((*cur)->point() - p);
+		K::Vector_3 v = ((*cur)->point() - p);
 		RealValue min_distance = v*v;
 	
 		while (cur != vertices().end())

--- a/examples/ar-vineyard/ar-simplex3d.hpp	Fri Aug 17 15:04:28 2007 -0400
+++ b/examples/ar-vineyard/ar-simplex3d.hpp	Fri Aug 17 15:08:27 2007 -0400
@@ -98,7 +98,7 @@
 	if (phi_const_ < v2_iter->second) v2_iter->second = phi_const_;
 
 	
-	s_ = CGAL::squared_distance(z, CGAL::Segment_3<K>(p1,p2).supporting_line());
+	s_ = CGAL::squared_distance(z, K::Segment_3(p1,p2).supporting_line());
 	Point origin;
 	Point cc = origin + ((p1 - origin) + (p2 - origin))/2;		// CGAL is funny
 	v_ = CGAL::squared_distance(z, cc) - s_;
@@ -161,7 +161,7 @@
 	}
 
 	Point cc = CGAL::circumcenter(p1, p2, p3);
-	v_ = CGAL::squared_distance<K>(z, CGAL::Plane_3<K>(p1,p2,p3));
+	v_ = CGAL::squared_distance(z, K::Plane_3(p1,p2,p3));
 	s_ = CGAL::squared_distance(z, cc) - v_;
 }
 

--- a/examples/ar-vineyard/ar-vineyard.hpp	Fri Aug 17 15:04:28 2007 -0400
+++ b/examples/ar-vineyard/ar-vineyard.hpp	Fri Aug 17 15:08:27 2007 -0400
@@ -82,7 +82,7 @@
 	typedef Traits::Kinetic_kernel::Point_1 								Point_1;
 	typedef Simulator::Time													Time;
 	
-	Traits tr;
+	Traits tr(0,1);
 	Simulator::Handle sp = tr.simulator_handle();
 	ActivePointsTable::Handle apt = tr.active_points_1_table_handle();
 	Sort sort(tr, SortVisitor(this));
@@ -177,7 +177,7 @@
 
 void 
 ARVineyardBase::MembershipFunctionChangeEvent::
-process(Simulator::Time t) const
+process() const
 {
 	apt_->set(key_, function_);
 	std::cout << "Updated for phi's dominance" << std::endl;

--- a/examples/grid/grid2Dvineyard.h	Fri Aug 17 15:04:28 2007 -0400
+++ b/examples/grid/grid2Dvineyard.h	Fri Aug 17 15:08:27 2007 -0400
@@ -12,7 +12,7 @@
 #include "grid2D.h"
 #include "topology/lowerstarfiltration.h"
 
-#include <CGAL/Kinetic/Inexact_simulation_traits_1.h>
+#include <CGAL/Kinetic/Inexact_simulation_traits.h>
 #include <CGAL/Kinetic/Sort.h>
 #include <CGAL/Kinetic/Sort_visitor_base.h>
 
@@ -44,7 +44,7 @@
 		typedef					Vineyard::Evaluator									Evaluator;
 
 		class					SortVisitor;
-		typedef 				CGAL::Kinetic::Inexact_simulation_traits_1 			Traits;
+		typedef 				CGAL::Kinetic::Inexact_simulation_traits 			Traits;
 		typedef					CGAL::Kinetic::Sort<Traits, SortVisitor>			Sort;
 		typedef 				Traits::Simulator 									Simulator;
 		typedef 				Traits::Active_points_1_table						ActivePointsTable;

--- a/examples/grid/grid2Dvineyard.hpp	Fri Aug 17 15:04:28 2007 -0400
+++ b/examples/grid/grid2Dvineyard.hpp	Fri Aug 17 15:08:27 2007 -0400
@@ -38,11 +38,10 @@
 	AssertMsg(filtration_->is_paired(), "Simplices must be paired for a vineyard to be computed");
 	
 	typedef Traits::Kinetic_kernel::Point_1 								Point;
-	typedef Traits::NT 														NT;
 	typedef Traits::Kinetic_kernel::Function_kernel::Construct_function 	CF; 
 	typedef Traits::Kinetic_kernel::Motion_function 						F; 
 	
-	Traits tr;
+	Traits tr(0,1);
 	Simulator::Handle sp = tr.simulator_handle();
 	ActivePointsTable::Handle apt = tr.active_points_1_table_handle();
 	Sort sort(tr, SortVisitor(this));