X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fversion.h;h=5670e7da7f26bbc28991dd6228e28bc312eb86f2;hb=b5de5a3192406d3b23257c548fa1f0e88ca0d03c;hp=a4c49cec86672cdccf60d209b9b3247ed6a215ea;hpb=e5354e987eb18188d0e43a64fb480ffd5e472c83;p=bacula%2Fbacula

diff --git a/bacula/src/version.h b/bacula/src/version.h
index a4c49cec86..5670e7da7f 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,21 +1,21 @@
 
 #undef  VERSION
-#define VERSION "5.1.4"
-#define BDATE   "02 Jun 2010"
-#define LSMDATE "02Jun10"
+#define VERSION "5.2.0rc1"
+#define BDATE   "04 August 2011"
+#define LSMDATE "04Aug11"
 
-#define PROG_COPYRIGHT "Copyright (C) %d-2010 Free Software Foundation Europe e.V.\n"
-#define BYEAR "2010"       /* year for copyright messages in progs */
+#define PROG_COPYRIGHT "Copyright (C) %d-2011 Free Software Foundation Europe e.V.\n"
+#define BYEAR "2011"       /* year for copyright messages in progs */
 
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -24,12 +24,13 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
    Bacula® is a registered trademark of Kern Sibbald.
+
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -42,6 +43,7 @@
 /* #define LIBBACCFG_LT_RELEASE  "5.1.0" */
 /* #define LIBBACPY_LT_RELEASE   "5.1.0" */
 /* #define LIBBACSQL_LT_RELEASE  "5.1.0" */
+/* #define LIBBACCATS_LT_RELEASE  "5.1.0" */
 /* #define LIBBACFIND_LT_RELEASE "5.1.0" */
 
 
@@ -81,6 +83,14 @@
  *  deadlock, so turn this on only for debugging.
  */
 #define USE_LOCKMGR_PRIORITY
+
+/*
+ * Enable thread verification before kill 
+ *
+ * Note, this extra check have a high cost when using
+ * dozens of thread, so turn this only for debugging.
+ */
+/* #define USE_LOCKMGR_SAFEKILL */
 #endif  /* DEVELOPER */
 
 #if !HAVE_LINUX_OS && !HAVE_SUN_OS && !HAVE_DARWIN_OS && !HAVE_FREEBSD_OS
@@ -95,6 +105,11 @@
 # define USE_VTAPE
 #endif
 
+/*
+ * USE_FTP is a ftp driver for the FD using curl.
+ */
+// #define USE_FTP
+
 /* 
  * for fastest speed but you must have a UPS to avoid unwanted shutdowns
  */