diff options
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | configure.ac | 4 |
4 files changed, 16 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 69430d873..775d22a26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,15 @@ pkgconfig_DATA = libgphoto2.pc EXTRA_DIST += libgphoto2-uninstalled.pc.in noinst_DATA = libgphoto2-uninstalled.pc -doc_DATA = AUTHORS COPYING README NEWS +EXTRA_DIST += ChangeLog +EXTRA_DIST += INSTALL +doc_DATA = AUTHORS COPYING NEWS + +EXTRA_DIST += README.in README +doc_DATA += README + +EXTRA_DIST += README.packaging +doc_DATA += README.packaging nobase_include_HEADERS = \ gphoto2/gphoto2.h \ @@ -1,4 +1,4 @@ -libgphoto2 2.4.0.1.trunk +libgphoto2 2.4.0.3 PTP2 driver: * Fixed bugs in packing of PTP arrays, unpack / pack 64 bit entities. @@ -6,6 +6,10 @@ PTP2 driver: * Devices added: - Canon IXUS iZ +Build: + * Removed dummy README file from SVN. + * Ship README.packaging in dist tarball for the first time. + Test cases: * Test camlib loading of both uninstalled and installed camlibs. diff --git a/README b/README deleted file mode 100644 index c57a1f19e..000000000 --- a/README +++ /dev/null @@ -1,5 +0,0 @@ -This is a dummy place holder file. - -Please read README.in or generate README by running a build. - -(A README file must exist when running automake.) diff --git a/configure.ac b/configure.ac index 3fff491e0..add4dc304 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ 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.4.1 at least or higher! -AC_INIT([libgphoto2 photo camera library], [2.4.0.2.trunk], [gphoto-devel@lists.sourceforge.net], [libgphoto2]) +AC_INIT([libgphoto2 photo camera library], [2.4.0.3], [gphoto-devel@lists.sourceforge.net], [libgphoto2]) AC_CONFIG_SRCDIR([libgphoto2/gphoto2-version.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([auto-m4]) @@ -17,7 +17,7 @@ dnl The generated Makefile rule fails to remove the absolute part at dnl the beginning of the /path/to/buildroot/PACKAGE-VERSION/foo/bar dnl before determining the string length. However, the only relevant dnl string to determine the length of would be PACKAGE-VERSION/foo/bar -AM_INIT_AUTOMAKE([-Wall gnu 1.9 dist-bzip2 check-news subdir-objects]) +AM_INIT_AUTOMAKE([-Wall foreign 1.9 dist-bzip2 check-news subdir-objects]) GP_CHECK_SHELL_ENVIRONMENT GP_CONFIG_MSG([Build]) |