Libarchive 2.6
SVN-Revision: 295
diff --git a/NEWS b/NEWS
index ff53dc6..7146455 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
+Dec 28, 2008: libarchive 2.6.0 released
+
Dec 25, 2008: libarchive 2.5.905a released
Dec 10, 2008: libarchive 2.5.904a released
diff --git a/configure.ac b/configure.ac
index a26c37b..545737e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@
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.0])
+m4_define([LIBARCHIVE_VERSION_N],[2006000])
dnl bsdtar versioning tracks libarchive
m4_define([BSDTAR_VERSION_S],LIBARCHIVE_VERSION_S())
diff --git a/libarchive/archive.h b/libarchive/archive.h
index ab2259e..9da0bc0 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -113,13 +113,13 @@
* (ARCHIVE_API_VERSION * 1000000 + ARCHIVE_API_FEATURE * 1000)
* #endif
*/
-#define ARCHIVE_VERSION_NUMBER 2005905
+#define ARCHIVE_VERSION_NUMBER 2006000
__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.0"
__LA_DECL const char * archive_version_string(void);
#if ARCHIVE_VERSION_NUMBER < 3000000
diff --git a/tar/Makefile b/tar/Makefile
index cda8f89..f8369ed 100644
--- 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.0
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 0203b60..69e1e8c 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2005905a
+2006000
