summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathis Rosenhauer <rosenhauer@dkrz.de>2014-10-23 13:19:32 +0200
committerMathis Rosenhauer <rosenhauer@dkrz.de>2014-10-23 15:25:35 +0200
commit5431e0eedf530262311697ee8f61e0db57116023 (patch)
tree31849db4fe477ee9951db698b291a7e8d3ecb188
parent3bacd054b7be902a9a8f4a944efbfdb60dbaf70e (diff)
downloadlibaec-5431e0eedf530262311697ee8f61e0db57116023.tar.gz
libaec-5431e0eedf530262311697ee8f61e0db57116023.tar.bz2
libaec-5431e0eedf530262311697ee8f61e0db57116023.zip
Version bump.
-rw-r--r--CMakeLists.txt3
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
5 files changed, 13 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d99e70c..1f0bff3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ INCLUDE(cmake/macros.cmake)
PROJECT(libaec)
SET(libaec_VERSION_MAJOR 0)
SET(libaec_VERSION_MINOR 3)
+SET(libaec_VERSION_PATCH 1)
SET(CMAKE_BUILD_TYPE Release)
ENABLE_TESTING()
@@ -48,9 +49,9 @@ SET(CPACK_PACKAGE_NAME "libaec")
SET(CPACK_PACKAGE_VENDOR "dkrz.de")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY
"libaec - Adaptive Entropy Coding library")
-SET(CPACK_PACKAGE_VERSION "0.3")
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET(CPACK_PACKAGE_VERSION_MINOR "3")
+SET(CPACK_PACKAGE_VERSION_PATCH "1")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "libaec")
SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README")
diff --git a/ChangeLog b/ChangeLog
index c2fb214..eef1806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-23 Mathis Rosenhauer <rosenhauer@dkrz.de>
+
+ v0.3.1
+
+ Allow incomplete scanlines in SZ mode.
+
2014-08-06 Mathis Rosenhauer <rosenhauer@dkrz.de>
v0.3
diff --git a/configure.ac b/configure.ac
index 983571e..015e00c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.64])
-AC_INIT([libaec], [0.3], [rosenhauer@dkrz.de])
+AC_INIT([libaec], [0.3.1], [rosenhauer@dkrz.de])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([config])
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3d90b94..b1cd462 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,11 @@
SET(libaec_SRCS encode.c encode_accessors.c decode.c)
ADD_LIBRARY(aec ${LIB_TYPE} ${libaec_SRCS})
SET_TARGET_PROPERTIES(aec PROPERTIES
- SOVERSION 0.0.1
+ SOVERSION 0.0.2
)
ADD_LIBRARY(sz ${LIB_TYPE} sz_compat.c)
SET_TARGET_PROPERTIES(sz PROPERTIES
- SOVERSION 2.0.1
+ SOVERSION 2.0.2
)
TARGET_LINK_LIBRARIES(sz aec)
diff --git a/src/Makefile.am b/src/Makefile.am
index c8966dc..d520219 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
lib_LTLIBRARIES = libaec.la libsz.la
libaec_la_SOURCES = encode.c encode_accessors.c decode.c \
encode.h encode_accessors.h decode.h
-libaec_la_LDFLAGS = -version-info 0:1:0
+libaec_la_LDFLAGS = -version-info 0:2:0
libsz_la_SOURCES = sz_compat.c
libsz_la_LIBADD = libaec.la
-libsz_la_LDFLAGS = -version-info 2:1:0
+libsz_la_LDFLAGS = -version-info 2:2:0
include_HEADERS = libaec.h szlib.h