[Liblas-commits] hg: increment versions in preparation for release

[liblas-commits at liblas.org]

details:   http://hg.liblas.orghg/rev/b0ed35f7bd07
changeset: 2708:b0ed35f7bd07
user:      Howard Butler <hobu.inc at gmail.com>
date:      Fri Jan 07 14:36:23 2011 -0600
description:
increment versions in preparation for release

diffstat:

 CMakeLists.txt                    |  4 ++--
 include/liblas/capi/las_version.h |  6 +++---
 python/setup.py                   |  2 +-
 src/header.cpp                    |  2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diffs (74 lines):

diff -r 6b84d63dc8e7 -r b0ed35f7bd07 CMakeLists.txt
--- a/CMakeLists.txt	Fri Jan 07 14:31:25 2011 -0600
+++ b/CMakeLists.txt	Fri Jan 07 14:36:23 2011 -0600
@@ -11,10 +11,11 @@
 
 SET(LIBLAS_VERSION_MAJOR "1")
 SET(LIBLAS_VERSION_MINOR "6")
-SET(LIBLAS_VERSION_PATCH "0b3")
+SET(LIBLAS_VERSION_PATCH "0b4")
 set(VERSION "${LIBLAS_VERSION_MAJOR}.${LIBLAS_VERSION_MINOR}.${LIBLAS_VERSION_PATCH}")
 SET(LIBLAS_LIB_SOVERSION "2.0.0")
 SET(LIBLAS_C_LIB_SOVERSION "2.0.0")
+SET(OSGEO4W_UPSTREAM_RELEASE "2")
 
 if(WIN32)
   # Name of C++ library
@@ -399,7 +400,6 @@
 SET(CPACK_PACKAGE_VERSION_MAJOR ${LIBLAS_VERSION_MAJOR})
 SET(CPACK_PACKAGE_VERSION_MINOR ${LIBLAS_VERSION_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH ${LIBLAS_VERSION_MINOR})
-SET(OSGEO4W_UPSTREAM_RELEASE "2")
 
 SET(CPACK_SOURCE_GENERATOR "TGZ;ZIP;TBZ2")
 SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
diff -r 6b84d63dc8e7 -r b0ed35f7bd07 include/liblas/capi/las_version.h
--- a/include/liblas/capi/las_version.h	Fri Jan 07 14:31:25 2011 -0600
+++ b/include/liblas/capi/las_version.h	Fri Jan 07 14:36:23 2011 -0600
@@ -45,7 +45,7 @@
 #ifndef LIBLAS_VERSION_MAJOR
 #define LIBLAS_VERSION_MAJOR    1
 #define LIBLAS_VERSION_MINOR    6
-#define LIBLAS_VERSION_REV      0b3
+#define LIBLAS_VERSION_REV      0b4
 #define LIBLAS_VERSION_BUILD    0
 #endif
 
@@ -54,11 +54,11 @@
 #endif
 
 #ifndef LIBLAS_RELEASE_DATE
-#define LIBLAS_RELEASE_DATE     20101215
+#define LIBLAS_RELEASE_DATE     20100107
 #endif
 
 #ifndef LIBLAS_RELEASE_NAME
-#define LIBLAS_RELEASE_NAME     "1.6.0b3"
+#define LIBLAS_RELEASE_NAME     "1.6.0b4"
 #endif
 
 #endif /* LAS_VERSION_H_INCLUDED */
diff -r 6b84d63dc8e7 -r b0ed35f7bd07 python/setup.py
--- a/python/setup.py	Fri Jan 07 14:31:25 2011 -0600
+++ b/python/setup.py	Fri Jan 07 14:36:23 2011 -0600
@@ -18,7 +18,7 @@
 
 import os
 
-version = '1.6.0b3'
+version = '1.6.0b4'
 
 scripts =['scripts/oci2las.py']
         
diff -r 6b84d63dc8e7 -r b0ed35f7bd07 src/header.cpp
--- a/src/header.cpp	Fri Jan 07 14:31:25 2011 -0600
+++ b/src/header.cpp	Fri Jan 07 14:36:23 2011 -0600
@@ -65,7 +65,7 @@
 
 char const* const Header::FileSignature = "LASF";
 char const* const Header::SystemIdentifier = "libLAS";
-char const* const Header::SoftwareIdentifier = "libLAS 1.6.0b2";
+char const* const Header::SoftwareIdentifier = "libLAS 1.6.0b4";
 
 
 Header::Header() : m_schema(ePointFormat3)