From d24ba5edc04b6050430b486692427ce4f26a0477 Mon Sep 17 00:00:00 2001 From: gitlost Date: Tue, 25 Feb 2025 15:29:08 +0000 Subject: [PATCH] Bump to version 2.15.0.9 (dev) --- CMakeLists.txt | 2 +- ChangeLog | 6 ++++++ backend/Makefile.mingw | 2 +- backend/libzint.rc | 4 ++-- backend/zint.h | 2 +- backend/zintconfig.h | 2 +- backend_qt/backend_qt.pro | 4 ++-- backend_qt/backend_vc8.pro | 2 +- backend_tcl/zint_tcl.vcxproj | 4 ++-- docs/manual.html | 4 ++-- docs/manual.pmd | 2 +- docs/manual.txt | 4 ++-- docs/zint.1 | 2 +- docs/zint.1.pmd | 2 +- frontend/Makefile.mingw | 2 +- frontend/zint.rc | 4 ++-- frontend_qt/res/qtZint.rc | 4 ++-- win32/libzint.vcxproj | 4 ++-- win32/vs2008/libzint.vcproj | 4 ++-- win32/vs2008/zint.vcproj | 4 ++-- win32/vs2015/libzint.vcxproj | 12 ++++++------ win32/vs2015/zint.vcxproj | 12 ++++++------ win32/vs2017/libzint.vcxproj | 4 ++-- win32/vs2017/zint.vcxproj | 4 ++-- win32/vs2019/libzint.vcxproj | 4 ++-- win32/vs2019/zint.vcxproj | 4 ++-- win32/zint.vcxproj | 4 ++-- win32/zint_cmdline_vc6/zint.rc | 4 ++-- win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp | 4 ++-- zint.nsi | 2 +- 30 files changed, 62 insertions(+), 56 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 456b31a6..ead17dcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(ZINT_VERSION_MAJOR 2) set(ZINT_VERSION_MINOR 15) set(ZINT_VERSION_RELEASE 0) -set(ZINT_VERSION_BUILD 0) # Set to 0 before release, set to 9 after release +set(ZINT_VERSION_BUILD 9) # Set to 0 before release, set to 9 after release set(ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}.${ZINT_VERSION_BUILD}") add_definitions(-DZINT_VERSION=\"${ZINT_VERSION}\") diff --git a/ChangeLog b/ChangeLog index 1d515971..56aa14e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Version 2.15.0.9 (dev) not released yet (2025-02-25) +==================================================== + +No changes yet + + Version 2.15.0 (2025-02-25) =========================== diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index d4cef76f..6814865a 100644 --- a/backend/Makefile.mingw +++ b/backend/Makefile.mingw @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.15.0\" +ZINT_VERSION:=-DZINT_VERSION=\"2.15.0.9\" CC:= gcc diff --git a/backend/libzint.rc b/backend/libzint.rc index 932abb09..b4648318 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,15,0,0 -#define VER_FILEVERSION_STR "2.15.0.0\0" +#define VER_FILEVERSION 2,15,0,9 +#define VER_FILEVERSION_STR "2.15.0.9\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/backend/zint.h b/backend/zint.h index bfc59cd1..3cd78428 100644 --- a/backend/zint.h +++ b/backend/zint.h @@ -31,7 +31,7 @@ /* SPDX-License-Identifier: BSD-3-Clause */ /* - * Version: 2.15.0 (see "zintconfig.h") + * Version: 2.15.0.9 (dev) (see "zintconfig.h") * * For documentation, see "../docs/manual.txt" or "../docs/manual.html" or online at * https://zint.org.uk/manual/ diff --git a/backend/zintconfig.h b/backend/zintconfig.h index 0d1e3d62..f03a95a3 100644 --- a/backend/zintconfig.h +++ b/backend/zintconfig.h @@ -37,7 +37,7 @@ #define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MINOR 15 #define ZINT_VERSION_RELEASE 0 -#define ZINT_VERSION_BUILD 0 +#define ZINT_VERSION_BUILD 9 /* vim: set ts=4 sw=4 et : */ #endif /* ZINTCONFIG_H */ diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index 58ed1116..2e78cfc8 100644 --- a/backend_qt/backend_qt.pro +++ b/backend_qt/backend_qt.pro @@ -17,7 +17,7 @@ TARGET = QtZint INCLUDEPATH += ../backend #EDIT THIS !!!! -DEFINES += ZINT_VERSION="\\\"2.15.0\\\"" +DEFINES += ZINT_VERSION="\\\"2.15.0.9\\\"" !contains(DEFINES, ZINT_NO_PNG) { INCLUDEPATH += ../../lpng @@ -126,7 +126,7 @@ SOURCES += ../backend/2of5.c \ ../backend/dllversion.c \ qzint.cpp -VERSION = 2.15.0 +VERSION = 2.15.0.9 #DESTDIR = . diff --git a/backend_qt/backend_vc8.pro b/backend_qt/backend_vc8.pro index 328e8cfa..ce56e559 100644 --- a/backend_qt/backend_vc8.pro +++ b/backend_qt/backend_vc8.pro @@ -4,7 +4,7 @@ win32 { } TARGET = QtZint2 -VERSION = 2.15.0 +VERSION = 2.15.0.9 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 diff --git a/backend_tcl/zint_tcl.vcxproj b/backend_tcl/zint_tcl.vcxproj index 96f70ee1..7ca49732 100644 --- a/backend_tcl/zint_tcl.vcxproj +++ b/backend_tcl/zint_tcl.vcxproj @@ -61,7 +61,7 @@ Level3 ProgramDatabase ..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.15.0";PACKAGE_VERSION="2.15.0";%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.15.0.9";PACKAGE_VERSION="2.15.0";%(PreprocessorDefinitions) .\Debug\ true .\Debug\zint_tcl.pch @@ -107,7 +107,7 @@ true Level3 ..\backend;C:\Tcl\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.15.0";PACKAGE_VERSION="2.15.0";%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;ZINT_TCL_EXPORTS;USE_TCL_STUBS;USE_TK_STUBS;ZINT_NO_PNG;ZINT_VERSION="2.15.0.9";PACKAGE_VERSION="2.15.0";%(PreprocessorDefinitions) .\Release\ true .\Release\zint_tcl.pch diff --git a/docs/manual.html b/docs/manual.html index 54e78378..516c8dfd 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -4,7 +4,7 @@ - + Zint Barcode Generator and Zint Barcode Studio User Manual