Merge remote-tracking branch 'cgal/master'

albert-github · Sep 25, 2024 · e210184 · e210184
2 parents 58cf16d + 418b00e
commit e210184
Show file tree

Hide file tree

Showing 19 changed files with 47 additions and 584 deletions.
diff --git a/Documentation/doc/biblio/cgal_manual.bib b/Documentation/doc/biblio/cgal_manual.bib
@@ -1545,17 +1545,6 @@ @book{ cgal:l-lscsd-96
   ,update       = "97.04 kettner"
 }
 
-@article{cgal:l-lsqp-82,
-  title={Least squares quantization in PCM},
-  author={Lloyd, Stuart},
-  journal={IEEE transactions on information theory},
-  volume={28},
-  number={2},
-  pages={129--137},
-  year={1982},
-  publisher={IEEE}
-}
-
 @InProceedings{ cgal:lprm-lscm-02,
    author    = {Bruno L{\'e}vy and Sylvain Petitjean and Nicolas Ray
                 and J{\'e}rome Maillot},
@@ -2778,7 +2767,7 @@ @incollection{msri52:liu-snoeyink-05
  editor = "Jacob E. Goodman, J\'anos Pach and Emo Welzl",
  year = {2005},
  pages = {439-458},
- URL = {http://library.slmath.org/books/Book52/files/23liu.pdf},
+ URL = {https://library.slmath.org/books/Book52/files/23liu.pdf},
  publisher = {MSRI Publications}
 }
 

diff --git a/Installation/include/CGAL/version.h b/Installation/include/CGAL/version.h
@@ -17,12 +17,12 @@
 #define CGAL_VERSION_H
 
 #ifndef SWIG
-#define CGAL_VERSION 6.0-beta2
+#define CGAL_VERSION 6.0
 #define CGAL_GIT_HASH abcdef
 #endif
-#define CGAL_VERSION_NR 1060000920
+#define CGAL_VERSION_NR 1060001000
 #define CGAL_SVN_REVISION 99999
-#define CGAL_RELEASE_DATE 20240701
+#define CGAL_RELEASE_DATE 20240925
 
 #include <CGAL/version_macros.h>
 

diff --git a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
@@ -2,7 +2,7 @@ set(CGAL_MAJOR_VERSION 6)
 set(CGAL_MINOR_VERSION 0)
 set(CGAL_BUGFIX_VERSION 0)
 include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake)
-set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.0-beta2")
+set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.0")
 set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}")
 
 if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0)

diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/.autocgal_with_cmake_rc b/Maintenance/infrastructure/cgal.geometryfactory.com/.autocgal_with_cmake_rc
diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/.autocgalrc b/Maintenance/infrastructure/cgal.geometryfactory.com/.autocgalrc
diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/.cgal_create_new_release_rc b/Maintenance/infrastructure/cgal.geometryfactory.com/.cgal_create_new_release_rc
diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/.cgalmanualrc b/Maintenance/infrastructure/cgal.geometryfactory.com/.cgalmanualrc
diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_diff_results b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_diff_results
diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_release.py b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_release.py
diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/collect_data_directories b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/collect_data_directories
diff --git a/...tenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py b/...tenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py