Merge branch 'upstream'

[debian/amanda] / common-src / versuff.c

diff --git a/common-src/versuff.c b/common-src/versuff.c
index 0e51292017803165327f8c01d915a11310b1e6f2..3504b3089e89542ebdc9793ea24841597d4023a4 100644 (file)
--- a/common-src/versuff.c
+++ b/common-src/versuff.c
@@ -32,15 +32,15 @@
 #include "version.h"
 
 const int   VERSION_MAJOR   = 2;
-const int   VERSION_MINOR   = 5;
-const int   VERSION_PATCH   = 2;
-const char *const VERSION_COMMENT = "p1";
+const int   VERSION_MINOR   = 6;
+const int   VERSION_PATCH   = 0;
+const char *const VERSION_COMMENT = "p2";
 
 const char *
 versionsuffix(void)
 {
 #ifdef USE_VERSION_SUFFIXES
-    return "-2.5.2p1";
+    return "-2.6.0p2";
 #else
     return "";
 #endif
@@ -49,5 +49,5 @@ versionsuffix(void)
 const char *
 version(void)
 {
-    return "2.5.2p1";
+    return "2.6.0p2";
 }