Merge branch 'private/testing+ndef'

Conflicts:
	NEWS
	configure.ac
	tests/Makefile.am

diff --cc NEWS
index 9c591f8a52d5672d1717690e34511096785712c3,92c49352a4d6aa7fe1c07520e826cfa6e65f2630..55b2c1e28d4d3a2e59e82f8948fa61c9b8a2cc5a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,32 +1,36 @@@
  Yubikey-personalize NEWS -- History of user-visible changes.     -*- outline -*-
  
- * Version 1.6.5 (unreleased)
+ * Version 1.7.0 (unreleased)
+ 
+ ** Add support for new features in YubiKey 2.3:
+ ALLOW_UPDATE flag that allows updating of configuration in slots.
+ Update command (-u) to do update of existing config.
+ Swap command (-x) to swap contents of two updatable slots
+ DORMANT flag that's settable/removable if ALLOW_UPDATE is set
+ USE_NUMERIC_KEYPAD flag for sending the OATH OTP using keypad scan codes instead
+ FAST_TRIG flag for faster triggering of slot one if slot two is empty
+ 
+ ** Change the library around some to make the 2.3 features available.
+ Use ykp_alloc() instead of ykp_create_config().
+ Use ykp_configure_version() instead of ykp_configure_for() to set the version.
+ Use ykp_configure_command() instead of ykp_configure_for() to set slot.
+ Use yk_write_command() instead of yk_write_config().
+ 
+ The new commands doesn't set any default configuration at all.
+ 
+ ** Add library support for the YubiKey NEO beta
+ ykp_construct_ndef_uri() for preparing a URI to write.
+ ykp_construct_ndef_text() for preparing a text to write.
+ yk_write_ndef() to write the constructed NDEF.
+ 
+ ** Add support for the YubiKey NEO beta
+ Writing NDEF URI with -n http://example.com/foo/
+ Writing NDEF Text record with -t example
  
 +** Windows: Bump yubico-c dependency to version 1.9.
 +
 +** Windows: Build fixes related to self checks.
 +
  * Version 1.6.4 (released 2012-05-24)
  
  ** Implement option -ooath-id to easily set OATH token identifier.

diff --cc tests/Makefile.am
index 031df21d5c091a1d736a4a4280be99812e404388,677cd4728afb8838befda3a4c514771fb40c9a00..1a1b866c85aa318389fac19a24a5c2e10d147ba5
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -27,11 -27,11 +27,11 @@@
  
  # Self tests.
  
 -AM_LDFLAGS = -no-install -static
 +AM_LDFLAGS = -no-install
  AM_CFLAGS=-I$(srcdir)/.. -I$(srcdir)/../ykcore
 -LDADD = ../libykpers-1.la
 +LDADD = ../libykpers-1.la $(LTLIBYUBIKEY)
  
- ctests = selftest test_args_to_config test_key_generation
 -ctests = selftest$(EXEEXT) test_args_to_config$(EXEEXT) test_key_generation$(EXEEXT) test_ndef_construction$(EXEEXT)
++ctests = selftest test_args_to_config test_key_generation test_ndef_construction
  check_PROGRAMS = $(ctests)
  TESTS = $(ctests)