Merge pull request Exiv2#940 from Exiv2/v0.27.2

v0.27.2
nomacs · Jul 28, 2019 · 8f08570 · 8f08570
2 parents 735fabf + 220e578
commit 8f08570
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required( VERSION 3.3.2 )
 
 project(exiv2
-    VERSION 0.27.2.3
+    VERSION 0.27.2
     LANGUAGES CXX C
 )
 

diff --git a/cmake/packaging.cmake b/cmake/packaging.cmake
@@ -100,6 +100,7 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/contrib/"              DESTINATION "con
 set( DOCS
      README.md
      README-CONAN.md
+     README-SAMPLES.md
      license.txt
      exiv2.png
 )

diff --git a/releasenotes/CYGWIN/ReadMe.txt b/releasenotes/CYGWIN/ReadMe.txt
@@ -1,4 +1,4 @@
-CYGWIN Exiv2 v0.27.2-RC3 Bundle
+CYGWIN Exiv2 v0.27.2 Bundle
 -------------------------------
 
 Structure of the bundle:
@@ -19,6 +19,7 @@ exiv2.png                                     Exiv2 Logo
 license.txt                                   GPLv2.0 Software License
 README.md                                     Developer Manual
 README-CONAN.md                               Developer Manual Appendix
+README-SAMPLES.md                             Developer Sample Code Manual
 releasenotes.txt                              Late breaking news
 
 To run exiv2 from the bundle

diff --git a/releasenotes/Darwin/ReadMe.txt b/releasenotes/Darwin/ReadMe.txt
@@ -1,11 +1,15 @@
-MacOS-X (Darwin) Exiv2 v0.27.2-RC3 Bundle
+MacOS-X (Darwin) Exiv2 v0.27.2 Bundle
 -----------------------------------------
 
 Structure of the bundle
 -----------------------
 
 bin/exiv2                                     exiv2 and sample applications
+<<<<<<< HEAD
 lib/libexiv2.0.27.2.3.dylib & libexiv2-xmp.a  libraries
+=======
+lib/libexiv2.0.27.2.dylib & libexiv2-xmp.a    libraries
+>>>>>>> Documentation Changes
 lib/pkgconfig/exiv2.pc                        pkg-config file
 lib/cmake/exiv2                               CMake support/consume files
 include/exiv2/                                include files
@@ -19,6 +23,7 @@ exiv2.png                                     Exiv2 Logo
 license.txt                                   GPLv2.0 Software License
 README.md                                     Developer Manual
 README-CONAN.md                               Developer Manual Appendix
+README-SAMPLES.md                             Developer Sample Code Manual
 releasenotes.txt                              Late breaking news
 
 To run exiv2 from the bundle
@@ -48,4 +53,4 @@ $ g++ -std=c++98 samples/exifprint.cpp -o exifprint $(pkg-config exiv2 --libs --
 $ ./exifprint
 
 Method 3: Use the CMake support/consume files
-See file: README.md Section: 2.6 "Consuming Exiv2 with CMake"
+See file: README.md Section: 2.6 "Consuming Exiv2 with CMake"
diff --git a/releasenotes/Linux/ReadMe.txt b/releasenotes/Linux/ReadMe.txt
@@ -19,6 +19,7 @@ license.txt                                   GPLv2.0 Software License
 releasenotes.txt                              Late breaking news
 README.md                                     Developer Manual
 README-CONAN.md                               Developer Manual Appendix
+README-SAMPLES.md                             Developer Sample Code Manual
 exiv2.png                                     Exiv2 Logo
 
 To run exiv2 from the bundle

diff --git a/releasenotes/MinGW/ReadMe.txt b/releasenotes/MinGW/ReadMe.txt
@@ -1,4 +1,4 @@
-MinGW/msys2 Exiv2 v0.27.2-RC3 Bundle
+MinGW/msys2 Exiv2 v0.27.2 Bundle
 ------------------------------------
 
 Structure of the bundle:
@@ -20,6 +20,7 @@ exiv2.png                                     Exiv2 Logo
 license.txt                                   GPLv2.0 Software License
 README.md                                     Developer Manual
 README-CONAN.md                               Developer Manual Appendix
+README-SAMPLES.md                             Developer Sample Code Manual
 releasenotes.txt                              Late breaking news
 
 To run exiv2 from the bundle

diff --git a/releasenotes/Unix/ReadMe.txt b/releasenotes/Unix/ReadMe.txt
@@ -1,11 +1,15 @@
-Unix Exiv2 v0.27.2-RC3 Bundle (FreeBSD and NetBSD)
+Unix Exiv2 v0.27.2 Bundle (FreeBSD and NetBSD)
 --------------------------------------------------
 
 Structure of the bundle:
 ------------------------
 
 bin/exiv2                                     exiv2 and sample applications
+<<<<<<< HEAD
 lib/libexiv2.so.0.27.2.3 & libexiv2-xmp.a     libraries
+=======
+lib/libexiv2.so.0.27.2 & libexiv2-xmp.a       libraries
+>>>>>>> Documentation Changes
 lib/pkgconfig/exiv2.pc                        pkg-config file
 lib/cmake/exiv2                               CMake support/consume files
 include/exiv2/                                include files
@@ -19,6 +23,7 @@ license.txt                                   GPLv2.0 Software License
 releasenotes.txt                              Late breaking news
 README.md                                     Developer Manual
 README-CONAN.md                               Developer Manual Appendix
+README-SAMPLES.md                             Developer Sample Code Manual
 exiv2.png                                     Exiv2 Logo
 
 To run exiv2 from the bundle

diff --git a/releasenotes/msvc/ReadMe.txt b/releasenotes/msvc/ReadMe.txt
@@ -1,4 +1,4 @@
-Visual Studio 2017 Release DLL v0.27.3-RC2 Bundle
+Visual Studio 2017 Release DLL v0.27.2 Bundle
 -------------------------------------------------
 
 Structure of the bundle:
@@ -17,6 +17,7 @@ license.txt                                   GPLv2.0 Software License
 releasenotes.txt                              Late breaking news
 README.md                                     Developer Manual
 README-CONAN.md                               Developer Manual Appendix
+README-SAMPLES.md                             Developer Sample Code Manual
 exiv2.png                                     Exiv2 Logo
 
 +----------------------------------------------------------------------------+

diff --git a/releasenotes/releasenotes.txt b/releasenotes/releasenotes.txt
@@ -1,7 +1,7 @@
-Exiv2 v0.27.2.3 = Exiv2 v0.27.2 RC3
+Exiv2 v0.27.2
 -----------------------------------
 
-Third Release Candidate for quarterly "dot" release of Exiv2 v0.27.2
+Exiv2 v0.27 Second Dot Release
 
 Thank You to Kevin for security contributions to this release.
 Thank You to Ting-Wei for Unix contributions to this release.
@@ -18,8 +18,8 @@ Headline Features of Exiv2 v0.27.2
 4) Updated Catalan Localisation
 5) Monitoring API changes for v0.27 dot releases
 6) Using mergify to sync select PRs between 0.27-maintenance and 0.28
-7) Prelinary Dutch Localisation
-8) Prelinary Support for Unix (FreeBSD and NetBSD)
+7) Preliminary Dutch Localisation
+8) Preliminary Support for Unix (FreeBSD and NetBSD)
 
 Issues fixed since v0.27.1
 --------------------------
@@ -28,7 +28,7 @@ https://github.com/Exiv2/exiv2/milestone/4?closed=1
 
 Robin Mills
 robin@clanmills.com
-2019-07-19
+2019-07-22
 
 Headline Features of Exiv2 v0.27.1
 ----------------------------------