From 29edddcf94bea1c689a073abd840b122bd379714 Mon Sep 17 00:00:00 2001
From: Robin Stuart <robin@zint.org.uk>
Date: Mon, 2 May 2011 07:24:09 +0100
Subject: [PATCH] Update version to 2.4.2

Update version number to 2.4.2 and remove reference to broken website.
---
 CMakeLists.txt              | 2 +-
 README                      | 3 +++
 backend/Makefile            | 4 ++--
 frontend/Makefile           | 2 +-
 frontend_qt4/mainwindow.cpp | 7 ++++---
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index caef3819..4379cfed 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 4)
-set (ZINT_VERSION_RELEASE 1)
+set (ZINT_VERSION_RELEASE 2)
 set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" )
 
 add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall)
diff --git a/README b/README
index 97db8d61..c060a0c5 100644
--- a/README
+++ b/README
@@ -56,6 +56,9 @@ files from the command line. Add option to change font size in PNG images.
 Tidy up information for creating Debian packages and for compiling on MS
 Visual Studio. Correct bug preventing compilation without PNG support.
 
+Version 2.4.2:
+Fix bugs in batch processing - this now works from the command line.
+
 CONTACT ME
 ----------
 The home of libzint is:
diff --git a/backend/Makefile b/backend/Makefile
index e4e61252..604f0a97 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -6,7 +6,7 @@
 # make clean		cleans up a previous compilation and any object or editor files
 #
 
-ZINT_VERSION:=-DZINT_VERSION=\"2.4.1\"
+ZINT_VERSION:=-DZINT_VERSION=\"2.4.2\"
 
 
 CC := gcc
@@ -25,7 +25,7 @@ ONEDIM_OBJ:= code.o code128.o 2of5.o upcean.o telepen.o medical.o plessey.o rss.
 POSTAL:= postal.c auspost.c imail.c
 POSTAL_OBJ:= postal.o auspost.o imail.o
 TWODIM:= code16k.c dmatrix.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c
-TWODIM_OBJ:= code16k.o dmatrix.o dm200.o pdf417.o qr.o maxicode.o composite.o aztec.o code49.o code1.o gridmtx.o
+TWODIM_OBJ:= code16k.o dmatrix.o pdf417.o qr.o maxicode.o composite.o aztec.o code49.o code1.o gridmtx.o
 LIBS:= `libpng12-config --I_opts --L_opts --ldflags` -lz -lm
  
 libzint: code.c code128.c 2of5.c upcean.c medical.c telepen.c plessey.c postal.c auspost.c imail.c code16k.c dmatrix.c reedsol.c pdf417.c maxicode.c rss.c common.c render.c png.c library.c ps.c qr.c large.c composite.c aztec.c gs1.c svg.c code49.c code1.c gridmtx.c
diff --git a/frontend/Makefile b/frontend/Makefile
index 31c293bc..2d338c9b 100644
--- a/frontend/Makefile
+++ b/frontend/Makefile
@@ -6,7 +6,7 @@
 # make clean		cleans up a previous compilation and any object or editor files
 #
 
-ZINT_VERSION:=-DZINT_VERSION=\"2.3.2\"
+ZINT_VERSION:=-DZINT_VERSION=\"2.4.2\"
 
 CC := gcc
 INCLUDE := -I/usr/include
diff --git a/frontend_qt4/mainwindow.cpp b/frontend_qt4/mainwindow.cpp
index ec9508cf..a3a0bd51 100644
--- a/frontend_qt4/mainwindow.cpp
+++ b/frontend_qt4/mainwindow.cpp
@@ -163,10 +163,11 @@ bool MainWindow::save()
 void MainWindow::about()
 {
 	QMessageBox::about(this, tr("About Zint"),
-			   tr("<h2>Zint Barcode Studio 2.4.1</h2>"
+			   tr("<h2>Zint Barcode Studio 2.4.2</h2>"
 					   "<p>A free barcode generator"
-					   "<p>Visit the Zint Project Homepage at www.zint.org.uk for more information."
-					   "<p>Copyright &copy; 2010 Robin Stuart.<br>"
+					   "<p>Instruction manual is available from Sourceforge:"
+					   "<p>http://www.sourceforge.net/projects/zint"
+					   "<p>Copyright &copy; 2011 Robin Stuart.<br>"
 					   "Qt4 code by BogDan Vatra, MS Windows port by \"tgotic\".<br>"
 					   "With thanks to Norbert Szab&oacute;, and Robert Elliott."
 					   "<p>Released under the GNU General Public License ver. 3 or later.<br>"