Prepare release version 2.2.4 (#123)

diff --git a/expat/CMake.README b/expat/CMake.README
index 6ac3eb446c80e2f0ab7ed0dc0516525f81065bdd..281eb52c4bac91d5e378da24c85de6e635b1ad9f 100644 (file)
--- a/expat/CMake.README
+++ b/expat/CMake.README
@@ -3,25 +3,25 @@
 The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual \r
 Studio) and should work on all other platform cmake supports.\r
 \r
-Assuming ~/expat-2.2.3 is the source directory of expat, add a subdirectory\r
+Assuming ~/expat-2.2.4 is the source directory of expat, add a subdirectory\r
 build and change into that directory:\r
-~/expat-2.2.3$ mkdir build && cd build\r
-~/expat-2.2.3/build$\r
+~/expat-2.2.4$ mkdir build && cd build\r
+~/expat-2.2.4/build$\r
 \r
 From that directory, call cmake first, then call make, make test and \r
 make install in the usual way:\r
-~/expat-2.2.3/build$ cmake ..\r
+~/expat-2.2.4/build$ cmake ..\r
 -- The C compiler identification is GNU\r
 -- The CXX compiler identification is GNU\r
 ....\r
 -- Configuring done\r
 -- Generating done\r
--- Build files have been written to: /home/patrick/expat-2.2.3/build\r
+-- Build files have been written to: /home/patrick/expat-2.2.4/build\r
 \r
 If you want to specify the install location for your files, append \r
 -DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call.\r
 \r
-~/expat-2.2.3/build$ make && make test && make install\r
+~/expat-2.2.4/build$ make && make test && make install\r
 Scanning dependencies of target expat\r
 [  5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o\r
 [ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o\r

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index b7f11bc0db2711df44cd5435d2405ef91d53e99f..1026938a27772124d28c0550ba7b20e6230c6c5d 100644 (file)
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -6,7 +6,7 @@ project(expat)
 cmake_minimum_required(VERSION 2.6)\r
 set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org")\r
 set(PACKAGE_NAME "expat")\r
-set(PACKAGE_VERSION "2.2.3")\r
+set(PACKAGE_VERSION "2.2.4")\r
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")\r
 set(PACKAGE_TARNAME "${PACKAGE_NAME}")\r
 \r

diff --git a/expat/Changes b/expat/Changes
index b42140aa7c2244cded104a336cb805a6a877133b..9b62893041d3f9465cd00bc2e34ac201af55ee36 100644 (file)
--- a/expat/Changes
+++ b/expat/Changes
@@ -2,7 +2,7 @@ NOTE: We are looking for help with a few things:
       https://github.com/libexpat/libexpat/labels/help%20wanted
       If you can help, please get in touch.  Thanks!
 
-Release 2.?.? ?????????????????
+Release 2.2.4 Sat Auguest 19 2017
         Bug fixes:
             #115  Fix copying of partial characters for UTF-8 input
 

diff --git a/expat/README.md b/expat/README.md
index cf4bec93ed866656fabb73b8da1e6c70bf21a16b..7bb55127cbaa6518f1b20818b966a5bcb61d263b 100644 (file)
--- a/expat/README.md
+++ b/expat/README.md
@@ -1,4 +1,4 @@
-# Expat, Release 2.2.3
+# Expat, Release 2.2.4
 
 This is Expat, a C library for parsing XML, started by
 [James Clark](https://en.wikipedia.org/wiki/James_Clark_(programmer)) in 1997.

diff --git a/expat/expat.spec b/expat/expat.spec
index d30b990a224fb617129c7731b9785f5c9a721bcc..cb7453e45d7593f45792104dc70c86061b8bf56b 100644 (file)
--- a/expat/expat.spec
+++ b/expat/expat.spec
@@ -1,4 +1,4 @@
-%define version 2.2.3
+%define version 2.2.4
 %define release 1
 
 Summary: Expat is an XML 1.0 parser written in C.
@@ -42,6 +42,10 @@ install -D xmlwf/xmlwf $RPM_BUILD_ROOT/usr/bin/xmlwf
 /usr/share/man/man1/xmlwf.1.gz
 
 %changelog
+* Sat Aug 19 2017 Sebastian Pipping <sebastian@pipping.org>
+[Release 2.2.4-1]
+- Update for the 2.2.4 release.
+
 * Wed Aug 2 2017 Sebastian Pipping <sebastian@pipping.org>
 [Release 2.2.3-1]
 - Update for the 2.2.3 release.

diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index d9e0d640f643b900aa3c44245880f2a3c7dd4e07..d0735bb5c61676935657a83251431eb13503ead5 100644 (file)
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -1076,7 +1076,7 @@ XML_GetFeatureList(void);
 */
 #define XML_MAJOR_VERSION 2
 #define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 3
+#define XML_MICRO_VERSION 4
 
 #ifdef __cplusplus
 }

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index e570d4ed0680ba5c251a172f43536e7e87699e5f..0df68830f05e3a9c6e5f2e97af2d5ec6681a6e6f 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1,4 +1,4 @@
-/* 101bfd65d1ff3d1511cf6671e6aae65f82cd97df6f4da137d46d510731830ad9 (2.2.3+)
+/* 8c6b2be7c6281da65ce05218fc15c339f02a811706340824ab596aa86e1fd51a (2.2.4+)
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 09aa99f068558aaf17321c87cb33922397ee29b9..4ad5c8ba9b285451fd35f6184b067c5686fc5c4b 100644 (file)
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -7764,7 +7764,7 @@ START_TEST(test_misc_version)
         fail("Version mismatch");
 
 #if ! defined(XML_UNICODE)
-    if (strcmp(version_text, "expat_2.2.3"))  /* needs bump on releases */
+    if (strcmp(version_text, "expat_2.2.4"))  /* needs bump on releases */
         fail("XML_*_VERSION in expat.h out of sync?\n");
 #endif  /* ! defined(XML_UNICODE) */
 }

diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss
index 04968e7d41b7cb4c3d2416430fd36b7f6bd3df2c..73f3080bb841207b7b1babd30cfbace7544a4a82 100644 (file)
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -7,17 +7,17 @@
 [Setup]
 AppName=Expat
 AppId=expat
-AppVersion=2.2.3
-AppVerName=Expat 2.2.3
+AppVersion=2.2.4
+AppVerName=Expat 2.2.4
 AppCopyright=Copyright � 1998-2017 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
 AppPublisher=The Expat Developers
 AppPublisherURL=http://www.libexpat.org/
 AppSupportURL=http://www.libexpat.org/
 AppUpdatesURL=http://www.libexpat.org/
-UninstallDisplayName=Expat XML Parser 2.2.3
-VersionInfoVersion=2.2.3
+UninstallDisplayName=Expat XML Parser 2.2.4
+VersionInfoVersion=2.2.4
 
-DefaultDirName={pf}\Expat 2.2.3
+DefaultDirName={pf}\Expat 2.2.4
 UninstallFilesDir={app}\Uninstall
 
 Compression=lzma