Merge commit 'martin-s/martin'

2 files changed, 23 insertions, 11 deletions

diff --git a/.gitignore b/.gitignore
index 73b722c..62b6ec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ autom4te.cache/*
 m4/*
 swig/*
 *.swp
+*.patch
 aclocal.m4
 config.h
 config.log
@@ -32,20 +33,17 @@ libtool
 py-compile
 stamp-h1
 src/.libs
-src/ifuse
-src/iphoneclient
-src/lckd-client
-src/libiphone-initconf
-src/plutil
 docs/*
-libiphone-1.0.pc
+libimobiledevice-1.0.pc
 dev/.libs/*
 dev/afccheck
-dev/iphoneclient
-dev/iphonesyslog
+dev/ideviceclient
+dev/idevicesyslog
 dev/lckd-client
 dev/msyncclient
+dev/ideviceenterrecovery
 tools/.libs/*
-tools/iphone_id
-tools/iphoneinfo
-tools/iphonesyslog
+tools/idevice_id
+tools/ideviceinfo
+tools/idevicesyslog
+tools/idevicebackup
diff --git a/NEWS b/NEWS
index 7bc96e3..e0ae9f8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Version 0.9.7 (RC1)
+~~~~~~~~~~~~~~~~~~~
+
+* Project is now called libimobiledevice due to legal reasons
+* Changes:
+  - Project renamed to libimobiledevice
+  - Add soname versioning for future releases
+  - Fix regression causing never paired devices to not work by adding
+    auto-pairing for devices in lockdownd_client_new_with_handshake
+  - Add file_relay service implementation and dev test tool
+  - Minor device link service fixes 
+  - New idevicebackup tool with support for full and incremental backups
+  - Add mobilebackup service implementation
+
 Version 0.9.6
 ~~~~~~~~~~~~~