Mark trunk as 2.6.900a to clearly separate it from 2.6 release branch.

SVN-Revision: 372

diff --git a/configure.ac b/configure.ac
index a26c37ba923f5fb79543eaa5109e200f2dd8a919..1afe4abb23a5118374c1df42ff02bd07653098b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ dnl First, define all of the version numbers up front.
 dnl In particular, this allows the version macro to be used in AC_INIT
 
 dnl These first two version numbers are updated automatically on each release.
-m4_define([LIBARCHIVE_VERSION_S],[2.5.905a])
-m4_define([LIBARCHIVE_VERSION_N],[2005905])
+m4_define([LIBARCHIVE_VERSION_S],[2.6.900a])
+m4_define([LIBARCHIVE_VERSION_N],[2006900])
 
 dnl bsdtar versioning tracks libarchive
 m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())

diff --git a/libarchive/archive.h b/libarchive/archive.h
index d6a830d986a9916144eca505f9a4195c062339ae..a45cc09c70e40c82bd503e66475d5205a2586278 100644 (file)
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -117,13 +117,13 @@ extern "C" {
  *             (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000)
  * #endif
  */
-#define        ARCHIVE_VERSION_NUMBER 2005905
+#define        ARCHIVE_VERSION_NUMBER 2006900
 __LA_DECL int          archive_version_number(void);
 
 /*
  * Textual name/version of the library, useful for version displays.
  */
-#define        ARCHIVE_VERSION_STRING "libarchive 2.5.905a"
+#define        ARCHIVE_VERSION_STRING "libarchive 2.6.900a"
 __LA_DECL const char * archive_version_string(void);
 
 #if ARCHIVE_VERSION_NUMBER < 3000000

diff --git a/tar/Makefile b/tar/Makefile
index cda8f89b138a327587e1dec05cd7d6b07c7c82a9..9b827052a9670fbfcdb10aa2c62da26fc4764223 100644 (file)
--- a/tar/Makefile
+++ b/tar/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: src/usr.bin/tar/Makefile,v 1.40 2008/12/06 07:38:14 kientzle Exp $
 
 PROG=  bsdtar
-BSDTAR_VERSION_STRING=2.5.905a
+BSDTAR_VERSION_STRING=2.6.900a
 SRCS=  bsdtar.c cmdline.c getdate.y matching.c read.c siginfo.c subst.c tree.c util.c write.c
 WARNS?=        5
 DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}

diff --git a/version b/version
index 0203b60ff39397a23eabd7c66214f6f494c2fb8a..e546fe1cfa666acb52c7a23b1045fbc05831b146 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-2005905a
+2006900a