2.4.0 releaselibgphoto2-2_4_0-release

git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@10494 67ed7778-7388-44ab-90cf-0a291f65f57c

4 files changed, 19 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index 0e56d9b5b..9ca5fa665 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-libgphoto2 2.3.1.4.trunk
+libgphoto2 2.4.0
 
 Build:
    * Non-recursive camlib build: Makes "make -j2" useful.
@@ -44,7 +44,7 @@ disk port:
 
 directory driver:
    * ignore anything not starting by '.' because it is not DCF compliant
-     and it is use for things like Trash of metadata...
+     and it is used for things like Trash of metadata...
 
 PTP2 driver:
    * For Canon capture capable cameras, enable shutter and aperture control
diff --git a/configure.ac b/configure.ac
index 26fd8efe7..be72a3ccb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ AC_PREREQ(2.59)
 dnl NOTE: Be version style _higher_ than the last release.
 dnl       So lastversion.X.trunk for instance. Bump X if necessary.
 
-dnl ******* THE NEXT RELEASE VERSION MUST BE 2.3.2 at least or higher!
-AC_INIT([libgphoto2 photo camera library], [2.3.1.4.trunk], [gphoto-devel@lists.sourceforge.net], [libgphoto2])
+dnl ******* THE NEXT RELEASE VERSION MUST BE 2.4.1 at least or higher!
+AC_INIT([libgphoto2 photo camera library], [2.4.0], [gphoto-devel@lists.sourceforge.net], [libgphoto2])
 AC_CONFIG_SRCDIR([libgphoto2/gphoto2-version.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([auto-m4])
@@ -49,9 +49,7 @@ dnl ---------------------------------------------------------------------------
 dnl A:R:C=1:1:3  libgphoto2-2.2
 dnl A:R:C=2:0:4  libgphoto2-2.3 (since libgphoto2-2.2.1.5.trunk)
 dnl A:R:C=2:1:4  libgphoto2-2.3.1 (since libgphoto2-2.3.0.1.trunk)
-dnl A:R:C=3:0:5  libgphoto2-2.3.0.3.trunk (new gp_file_new_from_fd() function)
-dnl              libgphoto2-2.3.1.1.trunk (new gp_file_slurp() function)
-dnl              libgphoto2-2.3.1.2.trunk (new gp_camera_get_storageinfo() function + enums + struct)
+dnl A:R:C=3:0:5  libgphoto2-2.4.0 (since libgphoto2-2.3.0.3.trunk (new gp_file_new_from_fd(), gp_file_slurp(), gp_camera_get_storageinfo() functions + enums + struct)
 AC_SUBST([LIBGPHOTO2_AGE],      [3])
 AC_SUBST([LIBGPHOTO2_REVISION], [0])
 AC_SUBST([LIBGPHOTO2_CURRENT],  [5])
diff --git a/libgphoto2_port/NEWS b/libgphoto2_port/NEWS
index fdc4f3908..d97525e70 100644
--- a/libgphoto2_port/NEWS
+++ b/libgphoto2_port/NEWS
@@ -1,3 +1,15 @@
+libgphoto2_port 0.8.0
+
+   * various bug fixes and doxygenation
+
+USB:
+   * reset the USB device on close.  This cures the infamous "Canon hang 
+     on second init" problem.
+
+Disk:
+   * handle automounter properly.
+
+
 libgphoto2_port 0.7.2
 
 Build:
diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac
index 170c53819..a9bb0bd2b 100644
--- a/libgphoto2_port/configure.ac
+++ b/libgphoto2_port/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoreconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT([libgphoto2 port access library], [0.7.2], [gphoto-devel@lists.sourceforge.net], [libgphoto2_port])
+AC_INIT([libgphoto2 port access library], [0.8.0], [gphoto-devel@lists.sourceforge.net], [libgphoto2_port])
 AC_CONFIG_SRCDIR([libgphoto2_port/gphoto2-port-version.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([auto-m4])
@@ -40,7 +40,7 @@ dnl ---------------------------------------------------------------------------
 dnl A:R:C=6:1:6 libgphoto2_port-0.6.1 libgphoto2-2.2.1
 dnl A:R:C=7:0:7 libgphoto2_port-0.7.0 libgphoto2-2.3
 dnl A:R:C=7:1:7 libgphoto2_port-0.7.1 libgphoto2-2.3.x
-dnl A:R:C=8:0:8 libgphoto2_port-0.7.1 libgphoto2-2.4.x
+dnl A:R:C=8:0:8 libgphoto2_port-0.8.0 libgphoto2-2.4.x
 AC_SUBST([LIBGPHOTO2_PORT_AGE],      [8])
 AC_SUBST([LIBGPHOTO2_PORT_REVISION], [0])
 AC_SUBST([LIBGPHOTO2_PORT_CURRENT],  [8])