mirrors/zint
2
0
Fork 0
mirror of https://github.com/zint/zint synced 2024-11-16 20:57:25 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

2019-09-19 HaO Set Version to 2.6.6

Browse Source
This commit is contained in:
Harald Oehlmann 2019-09-18 11:58:57 +02:00
parent 5c9d127ad1
commit 6751a816a6
12 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set (ZINT_VERSION_MAJOR 2) set (ZINT_VERSION_MAJOR 2)
set (ZINT_VERSION_MINOR 6) set (ZINT_VERSION_MINOR 6)
set (ZINT_VERSION_RELEASE 5) set (ZINT_VERSION_RELEASE 6)
set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" ) set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" )
add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall) add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall)

1
README
View File

@ -80,6 +80,7 @@ Ticket 155: PDF numeric compaction
Ticket 164: crash due to call of svg_plot withnull vector Ticket 164: crash due to call of svg_plot withnull vector
Ticket 119: Crash on bullseye raster drawing Ticket 119: Crash on bullseye raster drawing
qtzint: Micro-QR version option choice corrected (+1 missing). qtzint: Micro-QR version option choice corrected (+1 missing).
Datamatrix: code corruption when ECI was encoded and base256 encoding was automatically chosen.
CONTACT US CONTACT US
---------- ----------

2
backend/zint.h
View File

@ -136,7 +136,7 @@ extern "C" {
#define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MAJOR 2
#define ZINT_VERSION_MINOR 6 #define ZINT_VERSION_MINOR 6
#define ZINT_VERSION_RELEASE 5 #define ZINT_VERSION_RELEASE 6
/* Tbarcode 7 codes */ /* Tbarcode 7 codes */
#define BARCODE_CODE11 1 #define BARCODE_CODE11 1

4
backend_qt/backend_qt.pro
View File

@ -19,7 +19,7 @@ TARGET = QtZint
INCLUDEPATH += ../backend INCLUDEPATH += ../backend
#EDIT THIS !!!! #EDIT THIS !!!!
DEFINES += ZINT_VERSION="\\\"2.6.5\\\"" DEFINES += ZINT_VERSION="\\\"2.6.6\\\""
!contains(DEFINES, NO_PNG) { !contains(DEFINES, NO_PNG) {
INCLUDEPATH += ../../lpng INCLUDEPATH += ../../lpng
@ -120,7 +120,7 @@ SOURCES += ../backend/2of5.c \
../backend/png.c \ ../backend/png.c \
qzint.cpp qzint.cpp
VERSION = 2.6.5 VERSION = 2.6.6
#DESTDIR = . #DESTDIR = .

2
backend_tcl/configure.in
View File

@ -14,7 +14,7 @@
# so you can encode the package version directly into the source files. # so you can encode the package version directly into the source files.
#----------------------------------------------------------------------- #-----------------------------------------------------------------------
AC_INIT([zint], [2.6.5]) AC_INIT([zint], [2.6.6])
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars. # Call TEA_INIT as the first TEA_ macro to set up initial vars.

2
backend_tcl/lib/zint/pkgIndex.tcl
View File

@ -1,2 +1,2 @@
package ifneeded zint 2.6.5\ package ifneeded zint 2.6.6\
[list load [file join $dir zint[info sharedlibextension]]] [list load [file join $dir zint[info sharedlibextension]]]

5
backend_tcl/zint.c
View File

@ -60,7 +60,8 @@
2019-09-01 2.6.5 HaO 2019-09-01 2.6.5 HaO
- Framework 2.6.5 update - Framework 2.6.5 update
- Add option -gssep - Add option -gssep
2019-09-18 2.6.6 HaO
- Framework 2.6.6 update
*/ */
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@ -100,7 +101,7 @@
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* > File option defines */ /* > File option defines */
#define VERSION "2.6.5" #define VERSION "2.6.6"
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* >>>>> Hepler defines */ /* >>>>> Hepler defines */

4
frontend_qt/mainwindow.cpp
View File

@ -265,7 +265,7 @@ bool MainWindow::save()
void MainWindow::about() void MainWindow::about()
{ {
QMessageBox::about(this, tr("About Zint"), QMessageBox::about(this, tr("About Zint"),
tr("<h2>Zint Barcode Studio 2.6.5</h2>" tr("<h2>Zint Barcode Studio 2.6.6</h2>"
"<p>A free barcode generator" "<p>A free barcode generator"
"<p>Instruction manual is available at the project homepage:<br>" "<p>Instruction manual is available at the project homepage:<br>"
"<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>" "<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>"
@ -283,7 +283,7 @@ void MainWindow::about()
"ISO/IEC 15438:2015, ISO/IEC 16022:2006, ISO/IEC 16023:2000,<br>" "ISO/IEC 15438:2015, ISO/IEC 16022:2006, ISO/IEC 16023:2000,<br>"
"ISO/IEC 16388:2007, ISO/IEC 18004:2015, ISO/IEC 24723:2010,<br>" "ISO/IEC 16388:2007, ISO/IEC 18004:2015, ISO/IEC 24723:2010,<br>"
"ISO/IEC 24724:2011, ISO/IEC 24728:2006, ISO/IEC 24778:2008,<br>" "ISO/IEC 24724:2011, ISO/IEC 24728:2006, ISO/IEC 24778:2008,<br>"
"ISO/IEC 29158:2019, ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000,<br>" "ISO/IEC 21471:2019, ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000,<br>"
"ANSI/AIM BC12-1998, AIMD014 (v 1.63), USPS-B-3200" "ANSI/AIM BC12-1998, AIMD014 (v 1.63), USPS-B-3200"
"</small></td></tr></table>" "</small></td></tr></table>"

10
win32/zint_cmdline_vc6/zint.rc
View File

@ -31,8 +31,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,6,3,0 FILEVERSION 2,6,6,0
PRODUCTVERSION 2,6,3,0 PRODUCTVERSION 2,6,6,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -50,15 +50,15 @@ BEGIN
VALUE "Comments", "\0" VALUE "Comments", "\0"
VALUE "CompanyName", "\0" VALUE "CompanyName", "\0"
VALUE "FileDescription", "zint barcode generator\0" VALUE "FileDescription", "zint barcode generator\0"
VALUE "FileVersion", "2.6.5.0\0" VALUE "FileVersion", "2.6.6.0\0"
VALUE "InternalName", "zint.exe\0" VALUE "InternalName", "zint.exe\0"
VALUE "LegalCopyright", "Copyright © 2018 Robin Stuart\0" VALUE "LegalCopyright", "Copyright © 2019 Robin Stuart\0"
VALUE "LegalTrademarks", "\0" VALUE "LegalTrademarks", "\0"
VALUE "License", "GNU General Public License version 3\0" VALUE "License", "GNU General Public License version 3\0"
VALUE "OriginalFilename", "zint.exe\0" VALUE "OriginalFilename", "zint.exe\0"
VALUE "PrivateBuild", "\0" VALUE "PrivateBuild", "\0"
VALUE "ProductName", "zint\0" VALUE "ProductName", "zint\0"
VALUE "ProductVersion", "2.6.5.0\0" VALUE "ProductVersion", "2.6.6.0\0"
VALUE "SpecialBuild", "\0" VALUE "SpecialBuild", "\0"
VALUE "WWW", "http://www.sourceforge.net/projects/zint\0" VALUE "WWW", "http://www.sourceforge.net/projects/zint\0"
END END

2
win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp
View File

@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.6.5\"" /c # ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.6.6\"" /c
# ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD BASE RSC /l 0x407 /d "NDEBUG"
# ADD RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe

2
zint.nsi
View File

@ -10,7 +10,7 @@
;****************************************************************************** ;******************************************************************************
!define PRODUCT_NAME "Zint" !define PRODUCT_NAME "Zint"
!define PRODUCT_EXE "qtZint.exe" !define PRODUCT_EXE "qtZint.exe"
!define PRODUCT_VERSION "2.6.4.0" !define PRODUCT_VERSION "2.6.6.0"
!define PRODUCT_WEB_SITE "http://www.zint.org.uk" !define PRODUCT_WEB_SITE "http://www.zint.org.uk"
!define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra" !define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}"

5
zint.spec
View File

@ -1,5 +1,5 @@
Name: zint Name: zint
Version: 2.6.5 Version: 2.6.6
Release: 2%{?dist} Release: 2%{?dist}
Summary: A barcode generator and library Summary: A barcode generator and library
License: GPLv3+ License: GPLv3+
@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Sep 18 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.6.6
- Version -> 2.6.6
* Mon Sep 1 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.6.5 * Mon Sep 1 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.6.5
- Version -> 2.6.5 - Version -> 2.6.5