diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f8d3c5..42d9ed2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ PROJECT(libnfc C) CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(VERSION_MAJOR "1") SET(VERSION_MINOR "4") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") diff --git a/ChangeLog b/ChangeLog index 9d34def..70bd46f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +Feb 21, 2010 - 1.4.2 +-------------------- + +Fixes: + - libnfc: fgets instead of getline, bring MacOSX / BSD without glibc alive + - libnfc: add missing CMake files to generated tarball needed by windows users (Thanks to Glenn) + - drivers/pn532_uart: fix pn532 wakeup response handling + - buses/uart: prevent from retrieving more than buffer length (potential buffer overflow) + - buses/uart: intent to speed up interface + - nfc-emulate-uid: use a correct UID + - nfc-mfclassic: fixes a segfault when using only 1 argument + +Improvements: + - libnfc: silent some compilation warnings + - drivers/pn533_usb: support new device: ASK / LoGO. (Thanks to ASK for sending one sample) + - chips/pn53x: set register directly if mask cover whole value. + - pn53x-tamashell: accepts script as arg, this makes shebang possible + - pn53x-tamashell: add pause command & doc + - documentation: add a README-Windows.txt file + - documentation: add more pcsc-lite related instruction in README + + Feb 1, 2010 - 1.4.1 ------------------- diff --git a/configure.ac b/configure.ac index 6c8b950..b6563f9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # General init # /!\ Don't forget to update 'windows/Makefile' too /!\ -AC_INIT(libnfc, 1.4.1, info@libnfc.org) +AC_INIT(libnfc, 1.4.2, info@libnfc.org) AC_CONFIG_MACRO_DIR([m4]) diff --git a/debian/changelog b/debian/changelog index a93754d..80e63f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libnfc (1.4.2-0) unstable; urgency=low + + * New upstream release. + + -- Romuald Conty Tue, 21 Feb 2011 11:42:42 +0100 + libnfc (1.4.1-0) unstable; urgency=low * New upstream release. diff --git a/libnfc/Makefile.am b/libnfc/Makefile.am index 0ac8c1c..7e129ec 100644 --- a/libnfc/Makefile.am +++ b/libnfc/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = $(all_includes) $(LIBNFC_CFLAGS) noinst_HEADERS = chips.h buses.h drivers.h mirror-subr.h lib_LTLIBRARIES = libnfc.la libnfc_la_SOURCES = nfc.c iso14443-subr.c mirror-subr.c -libnfc_la_LDFLAGS = -no-undefined -version-info=1:0:1 +libnfc_la_LDFLAGS = -no-undefined -version-info 1:0:0 libnfc_la_CFLAGS = @DRIVERS_CFLAGS@ libnfc_la_LIBADD = \ $(top_builddir)/libnfc/chips/libnfcchips.la \