From 06bfed11b943d752220c265d411699b5007f50f1 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Thu, 31 Jan 2013 21:58:29 +0100 Subject: [PATCH 1/7] Various typos --- ChangeLog | 2 +- README | 18 +++++++++++++----- README-Windows.txt | 2 ++ debian/control | 2 +- debian/copyright | 2 +- libnfc/additional-pages.dox | 2 +- utils/mifare.c | 2 +- windows/mm/libnfc.mm | 2 +- 8 files changed, 21 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5e005c..7075bcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,7 +16,7 @@ Changes: - nfc_emulate_target() now takes timeout parameter Special thanks to: - - Alex Lian (Windows support refesh) + - Alex Lian (Windows support refresh) Jan 20, 2013 - 1.7.0-rc2 (release candidate) -------------------------------------------- diff --git a/README b/README index 67be619..5f44476 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ General Information libnfc is a library which allows userspace application access to NFC devices. The official web site is: - http://www.libnfc.org/ + http://www.nfc-tools.org/ The official forum site is: http://www.libnfc.org/community/ @@ -23,7 +23,7 @@ Important note: this file covers POSIX systems, for Windows please read README-W Requirements ============ -Some NFC drivers depends on third party software: +Some NFC drivers depend on third party software: * pn53x_usb & acr122_usb: @@ -33,7 +33,7 @@ Some NFC drivers depends on third party software: - pcsc-lite http://pcsclite.alioth.debian.org/ -The regression test suite depend on the cutter framework: +The regression test suite depends on the cutter framework: http://cutter.sf.net Installation @@ -69,7 +69,14 @@ Please make sure to include: And anything else you think is relevant. -* How to reproduce the bug. +* A trace with debug activated. + + Reproduce the bug with debug, e.g. if it was: + $ nfc-list -v + run it as: + $ LIBNFC_LOG_LEVEL=3 nfc-list -v + +* How to reproduce the bug. Please include a short test program that exhibits the behavior. As a last resort, you can also provide a pointer to a larger piece @@ -85,7 +92,8 @@ Patches ======= Patches can be posted to http://code.google.com/p/libnfc/issues/list or -can be sent directly to libnfc's developers: http://www.libnfc.org/contact +can be sent directly to libnfc's developers: +http://nfc-tools.org/index.php?title=Contact If the patch fixes a bug, it is usually a good idea to include all the information described in "How to Report Bugs". diff --git a/README-Windows.txt b/README-Windows.txt index 5f049d1..3a322c0 100644 --- a/README-Windows.txt +++ b/README-Windows.txt @@ -1,6 +1,8 @@ *- * Public platform independent Near Field Communication (NFC) library +* Windows-specific parts: * Copyright (C) 2010, Glenn Ergeerts +* Copyright (C) 2013, Alex Lian -* Requirements diff --git a/debian/control b/debian/control index 37bb20a..9c3f8a8 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: extra Maintainer: Nobuhiro Iwamatsu Build-Depends: debhelper (>= 8), dh-autoreconf, libtool, pkg-config, libusb-dev Standards-Version: 3.9.4 -Homepage: http://www.libnfc.org/ +Homepage: http://www.nfc-tools.org/ Vcs-Git: https://code.googlecode.com/p/libnfc/ Vcs-Browser: http://code.google.com/p/libnfc/source/browse/ diff --git a/debian/copyright b/debian/copyright index 1e9b121..b1d6826 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: libnfc -Source: http://www.libnfc.org/ +Source: http://libnfc.googlecode.com/ Files: * Copyright: 2009, Roel Verdult , Romuald Conty diff --git a/libnfc/additional-pages.dox b/libnfc/additional-pages.dox index 37f1268..1fc57f9 100644 --- a/libnfc/additional-pages.dox +++ b/libnfc/additional-pages.dox @@ -4,7 +4,7 @@ * @section intro_sec Introduction * This is the developer manual for \b libnfc. * libnfc is an open source library that allows you to communicate with NFC devices. For more info, see the - * libnfc homepage. + * libnfc homepage. * * @section quick_start_sec Quick start * If you are looking for libnfc's public API, you should start with the Modules page which links to the different categories of libnfc's functionality. diff --git a/utils/mifare.c b/utils/mifare.c index 6c84724..d1d7809 100644 --- a/utils/mifare.c +++ b/utils/mifare.c @@ -47,7 +47,7 @@ * @note There are three different types of information (Authenticate, Data and Value). * * First an authentication must take place using Key A or B. It requires a 48 bit Key (6 bytes) and the UID. - * They are both used to initialize the internal cipher-state of the PN53X chip (http://libnfc.org/hardware/pn53x-chip). + * They are both used to initialize the internal cipher-state of the PN53X chip. * After a successful authentication it will be possible to execute other commands (e.g. Read/Write). * The MIFARE Classic Specification (http://www.nxp.com/acrobat/other/identification/M001053_MF1ICS50_rev5_3.pdf) explains more about this process. */ diff --git a/windows/mm/libnfc.mm b/windows/mm/libnfc.mm index 6d388c4..abd84ab 100644 --- a/windows/mm/libnfc.mm +++ b/windows/mm/libnfc.mm @@ -21,7 +21,7 @@ ; #define? COMPANY_PRODUCT_ICON ..\win32\libnfc.ico ;; override from company.mmh #define? UISAMPLE_DIALOG_FILE_dlgbmp nfcleft.bmp ;; override uisample.mmh -#define? UISAMPLE_BLINE_TEXT www.libnfc.org +#define? UISAMPLE_BLINE_TEXT www.nfc-tools.org #define? COMPANY_WANT_TO_INSTALL_DOCUMENTATION N ;--- Include MAKEMSI support (with my customisations and MSI branding) ------ From e81aaf53903c95aa1637c9b4968485f25326ea1e Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 1 Feb 2013 08:42:09 +0900 Subject: [PATCH 2/7] Add symbols file for libnfc4 Signed-off-by: Nobuhiro Iwamatsu --- debian/libnfc4.symbols | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 debian/libnfc4.symbols diff --git a/debian/libnfc4.symbols b/debian/libnfc4.symbols new file mode 100644 index 0000000..7c2303f --- /dev/null +++ b/debian/libnfc4.symbols @@ -0,0 +1,54 @@ +libnfc.so.4 libnfc4 #MINVER# + iso14443a_crc@Base 1.7.0~rc2 + iso14443a_crc_append@Base 1.7.0~rc2 + iso14443a_locate_historical_bytes@Base 1.7.0~rc2 + nfc_abort_command@Base 1.7.0~rc2 + nfc_close@Base 1.7.0~rc2 + nfc_context_free@Base 1.7.0~rc2 + nfc_context_new@Base 1.7.0~rc2 + nfc_device_free@Base 1.7.0~rc2 + nfc_device_get_connstring@Base 1.7.0~rc2 + nfc_device_get_information_about@Base 1.7.0~rc2 + nfc_device_get_last_error@Base 1.7.0~rc2 + nfc_device_get_name@Base 1.7.0~rc2 + nfc_device_get_supported_baud_rate@Base 1.7.0~rc2 + nfc_device_get_supported_modulation@Base 1.7.0~rc2 + nfc_device_new@Base 1.7.0~rc2 + nfc_device_set_property_bool@Base 1.7.0~rc2 + nfc_device_set_property_int@Base 1.7.0~rc2 + nfc_drivers@Base 1.7.0~rc2 + nfc_emulate_target@Base 1.7.0~rc2 + nfc_exit@Base 1.7.0~rc2 + nfc_idle@Base 1.7.0~rc2 + nfc_init@Base 1.7.0~rc2 + nfc_initiator_deselect_target@Base 1.7.0~rc2 + nfc_initiator_init@Base 1.7.0~rc2 + nfc_initiator_init_secure_element@Base 1.7.0~rc2 + nfc_initiator_list_passive_targets@Base 1.7.0~rc2 + nfc_initiator_poll_dep_target@Base 1.7.0~rc2 + nfc_initiator_poll_target@Base 1.7.0~rc2 + nfc_initiator_select_dep_target@Base 1.7.0~rc2 + nfc_initiator_select_passive_target@Base 1.7.0~rc2 + nfc_initiator_target_is_present@Base 1.7.0~rc2 + nfc_initiator_transceive_bits@Base 1.7.0~rc2 + nfc_initiator_transceive_bits_timed@Base 1.7.0~rc2 + nfc_initiator_transceive_bytes@Base 1.7.0~rc2 + nfc_initiator_transceive_bytes_timed@Base 1.7.0~rc2 + nfc_list_devices@Base 1.7.0~rc2 + nfc_open@Base 1.7.0~rc2 + nfc_perror@Base 1.7.0~rc2 + nfc_strerror@Base 1.7.0~rc2 + nfc_strerror_r@Base 1.7.0~rc2 + nfc_target_init@Base 1.7.0~rc2 + nfc_target_receive_bits@Base 1.7.0~rc2 + nfc_target_receive_bytes@Base 1.7.0~rc2 + nfc_target_send_bits@Base 1.7.0~rc2 + nfc_target_send_bytes@Base 1.7.0~rc2 + nfc_version@Base 1.7.0~rc2 + pn532_SAMConfiguration@Base 1.7.0~rc2 + pn53x_read_register@Base 1.7.0~rc2 + pn53x_transceive@Base 1.7.0~rc2 + pn53x_write_register@Base 1.7.0~rc2 + str_nfc_baud_rate@Base 1.7.0~rc2 + str_nfc_modulation_type@Base 1.7.0~rc2 + str_nfc_target@Base 1.7.0~rc2 From 3f6024cd64a4121fe7b93fd75b790b66f5d04e30 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 1 Feb 2013 08:53:10 +0900 Subject: [PATCH 3/7] Update package description Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 49 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/debian/control b/debian/control index 9c3f8a8..5d0456d 100644 --- a/debian/control +++ b/debian/control @@ -14,9 +14,14 @@ Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Near Field Communication (NFC) library - libnfc is a Free Software library for Near Field Communication. - Supported NFC hardware devices are, theorically, all hardware - based on the NXP PN531, PN532 or PN533 NFC controller chip. + libnfc is a library for Near Field Communication. It abstracts the + low-level details of communicating with the devices away behind an + easy-to-use high-level API. + It supports most hardware based on the NXP PN531, PN532 or PN533 + controller chips. + . + This package contains the runtime library files needed to run software + using libnfc. Package: libnfc-dev Section: libdevel @@ -24,24 +29,42 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libnfc4 (= ${binary:Version}), libusb-dev -Description: Near Field Communication library (development files) - libnfc is a free software library for near-field communication. +Description: Near Field Communication (NFC) library (development files) + libnfc is a library for Near Field Communication. It abstracts the + low-level details of communicating with the devices away behind an + easy-to-use high-level API. It supports most hardware based on the NXP PN531, PN532 or PN533 controller chips. + . + This package contains the header and development files needed to build + programs and packages using libnfc. Package: libnfc-bin Section: utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libnfc4 (>= ${binary:Version}) -Description: Near Field Communication binaries - Some binaries are provided with libnfc useful for development - purposes (nfc-list, nfc-mfclassic, nfc-mfultralight, etc.). +Description: Near Field Communication (NFC) binaries + libnfc is a library for Near Field Communication. It abstracts the + low-level details of communicating with the devices away behind an + easy-to-use high-level API. + It supports most hardware based on the NXP PN531, PN532 or PN533 + controller chips. + . + This package contains some utils that come along with libnfc, for + development or debugging purposes (including nfc-list, nfc-mfclassic, + nfc-mfultralight, etc). Package: libnfc-examples Section: utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libnfc4 (>= ${binary:Version}) -Description: Near Field Communication examples +Description: Near Field Communication (NFC) examples + libnfc is a library for Near Field Communication. It abstracts the + low-level details of communicating with the devices away behind an + easy-to-use high-level API. + It supports most hardware based on the NXP PN531, PN532 or PN533 + controller chips. + . Some examples are provided with libnfc for debugging and/or educational purposes (nfc-anticol, nfc-emulate, etc.). @@ -49,6 +72,12 @@ Package: libnfc-pn53x-examples Section: utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libnfc4 (>= ${binary:Version}) -Description: Near Field Communication examples for PN53x chips only +Description: Near Field Communication (NFC) examples for PN53x chips only + libnfc is a library for Near Field Communication. It abstracts the + low-level details of communicating with the devices away behind an + easy-to-use high-level API. + It supports most hardware based on the NXP PN531, PN532 or PN533 + controller chips. + . Some PN53x-only examples are provided with libnfc for debugging and/or educational purposes (pn53x-sam, pn53x-tamashell, etc.). From cf2c6ef9669fe2e4290adcae5fb4196508b6e2e8 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 1 Feb 2013 09:01:29 +0900 Subject: [PATCH 4/7] Add support libnfc4-dbg package Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 15 +++++++++++++++ debian/rules | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/debian/control b/debian/control index 5d0456d..763d815 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,21 @@ Description: Near Field Communication (NFC) library (development files) This package contains the header and development files needed to build programs and packages using libnfc. +Package: libnfc4-dbg +Section: debug +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends}, libnfc4 (= ${binary:Version}) +Description: Near Field Communication (NFC) library (debugging information) + libnfc is a library for Near Field Communication. It abstracts the + low-level details of communicating with the devices away behind an + easy-to-use high-level API. + It supports most hardware based on the NXP PN531, PN532 or PN533 + controller chips. + . + This package contains the debugging information. + Package: libnfc-bin Section: utils Architecture: any diff --git a/debian/rules b/debian/rules index fbdd8f3..fad10c8 100755 --- a/debian/rules +++ b/debian/rules @@ -27,3 +27,7 @@ override_dh_auto_configure: %: dh $@ --with autoreconf + +override_dh_strip: + dh_strip -plibnfc4 --dbg-package=libnfc4-dbg + dh_strip --remaining-packages From 15be4b885c052f3dacd76c2457c98c169862f740 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 1 Feb 2013 09:27:47 +0900 Subject: [PATCH 5/7] install nfc-emulate-forum-tag2.1 to libnfc-examples Signed-off-by: Nobuhiro Iwamatsu --- debian/libnfc-examples.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/libnfc-examples.install b/debian/libnfc-examples.install index f78621e..936bce1 100644 --- a/debian/libnfc-examples.install +++ b/debian/libnfc-examples.install @@ -10,6 +10,7 @@ debian/tmp/usr/bin/nfc-relay debian/tmp/usr/share/man/man1/nfc-anticol.1 debian/tmp/usr/share/man/man1/nfc-dep-initiator.1 debian/tmp/usr/share/man/man1/nfc-dep-target.1 +debian/tmp/usr/share/man/man1/nfc-emulate-forum-tag2.1 debian/tmp/usr/share/man/man1/nfc-emulate-tag.1 debian/tmp/usr/share/man/man1/nfc-emulate-uid.1 debian/tmp/usr/share/man/man1/nfc-mfsetuid.1 From 40fadb8d2c5af40b4c1d420ea65198f0341dd8c3 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 1 Feb 2013 09:06:33 +0900 Subject: [PATCH 6/7] Update to 1.7.0~rc3 Signed-off-by: Nobuhiro Iwamatsu --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f79ff43..a83d45a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -libnfc (1.7.0~rc2-1) unstable; urgency=low +libnfc (1.7.0~rc3-1) unstable; urgency=low * Upload to Debian. (Closes: #672795) - -- Nobuhiro Iwamatsu Mon, 21 Jan 2013 14:19:24 +0900 + -- Nobuhiro Iwamatsu Fri, 01 Feb 2013 09:01:53 +0900 libnfc (1.7.0~rc2-0) unstable; urgency=low From 50f5c610a1f92d35f655f1e6279bb7be5d82140c Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 1 Feb 2013 09:42:00 +0900 Subject: [PATCH 7/7] Add man of nfc-emulate-forum-tag2 to the installation Signed-off-by: Nobuhiro Iwamatsu --- examples/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/Makefile.am b/examples/Makefile.am index d822df0..c767532 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -96,6 +96,7 @@ dist_man_MANS = \ nfc-mfsetuid.1 \ pn53x-diagnose.1 \ pn53x-sam.1 \ - pn53x-tamashell.1 + pn53x-tamashell.1 \ + nfc-emulate-forum-tag2.1 EXTRA_DIST = CMakeLists.txt