From f02ff51449240102c27a97173dc495e8e7789046 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <yobibe@gmail.com>
Date: Fri, 22 May 2020 12:19:15 +0200
Subject: [PATCH] Prepare 1.8.0 version

---
 CMakeLists.txt        |  4 ++--
 ChangeLog             | 12 +++++++++++-
 NEWS.md               |  6 ++++++
 configure.ac          |  2 +-
 libnfc/CMakeLists.txt |  2 +-
 libnfc/Makefile.am    |  2 +-
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a2b3e6..48db870 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ endif ()
 project (libnfc C)
 
 SET(VERSION_MAJOR "1")
-SET(VERSION_MINOR "7")
-SET(VERSION_PATCH "2")
+SET(VERSION_MINOR "8")
+SET(VERSION_PATCH "0")
 
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
diff --git a/ChangeLog b/ChangeLog
index 0f3eb1b..70f5b2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,14 @@
-May 21, 2020 - 1.7.2
+May 22, 2020 - 1.8.0
+--------------------
+
+Fixes:
+ - Restore nfc_modulation_type enum order to keep compatibility with libnfc 1.7.1
+
+Changes:
+ - Bump revision due to changes in API introduced in v1.7.2
+ - Bump library version to 6.0.0
+
+May 21, 2020 - 1.7.2 (avoid using it, incompatible with 1.7.1)
 --------------------
 
 Fixes:
diff --git a/NEWS.md b/NEWS.md
index 93b395f..2e38d06 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,9 @@
+New in 1.8.0:
+
+API Changes:
+ - Restore nfc_modulation_type enum order to keep compatibility with libnfc 1.7.1
+ - Bump library version to 6.0.0
+
 New in 1.7.2:
 
 Drivers:
diff --git a/configure.ac b/configure.ac
index 67acc47..280a6d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # General init
 
 # /!\ Don't forget to update 'CMakeLists.txt' too /!\
-AC_INIT([libnfc],[1.7.2],[nfc-tools@googlegroups.com])
+AC_INIT([libnfc],[1.8.0],[nfc-tools@googlegroups.com])
 
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/libnfc/CMakeLists.txt b/libnfc/CMakeLists.txt
index 79bab5d..514f60d 100644
--- a/libnfc/CMakeLists.txt
+++ b/libnfc/CMakeLists.txt
@@ -83,7 +83,7 @@ IF(LIBRT_FOUND)
   TARGET_LINK_LIBRARIES(nfc ${LIBRT_LIBRARIES})
 ENDIF(LIBRT_FOUND)
 
-SET_TARGET_PROPERTIES(nfc PROPERTIES SOVERSION 5 VERSION 5.0.1)
+SET_TARGET_PROPERTIES(nfc PROPERTIES SOVERSION 6 VERSION 6.0.0)
 
 IF(WIN32)
   # Libraries that are windows specific
diff --git a/libnfc/Makefile.am b/libnfc/Makefile.am
index 8ab4191..3da2ab8 100644
--- a/libnfc/Makefile.am
+++ b/libnfc/Makefile.am
@@ -22,7 +22,7 @@ libnfc_la_SOURCES = \
 		    nfc-internal.h \
 		    target-subr.h
 
-libnfc_la_LDFLAGS = -no-undefined -version-info 5:1:0 -export-symbols-regex '^nfc_|^iso14443a_|^iso14443b_|^str_nfc_|pn53x_transceive|pn532_SAMConfiguration|pn53x_read_register|pn53x_write_register'
+libnfc_la_LDFLAGS = -no-undefined -version-info 6:0:0 -export-symbols-regex '^nfc_|^iso14443a_|^iso14443b_|^str_nfc_|pn53x_transceive|pn532_SAMConfiguration|pn53x_read_register|pn53x_write_register'
 libnfc_la_CFLAGS = @DRIVERS_CFLAGS@
 libnfc_la_LIBADD = \
 	$(top_builddir)/libnfc/chips/libnfcchips.la \