X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fversion.h;h=0f1ff184a03f139d554f06f98f57f9872b23c540;hb=b5ffb0c399e2a8c25555c9013ca86a31590895f4;hp=8c4040d2996be1c7de4c609c9ee0857ac20f8adc;hpb=f60d09a5da57641c63949c54b672030487e0087b;p=bacula%2Fbacula

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 8c4040d299..0f1ff184a0 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,19 +1,16 @@
-/*
- *  Version $Id$
- */
 
 #undef  VERSION
-#define VERSION "3.1.4"
-#define BDATE   "31 October 2009"
-#define LSMDATE "31Oct09"
+#define VERSION "5.0.2"
+#define BDATE   "28 April 2010"
+#define LSMDATE "28Apr10"
 
-#define PROG_COPYRIGHT "Copyright (C) %d-2009 Free Software Foundation Europe e.V.\n"
-#define BYEAR "2009"       /* year for copyright messages in progs */
+#define PROG_COPYRIGHT "Copyright (C) %d-2010 Free Software Foundation Europe e.V.\n"
+#define BYEAR "2010"       /* year for copyright messages in progs */
 
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 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.
@@ -38,6 +35,15 @@
    Switzerland, email:ftf@fsfeurope.org.
 */
 
+/* Shared object library versions */
+
+/* Uncomment to overwrite default values from VERSION */
+/* #define LIBBAC_LT_RELEASE     "5.1.0" */
+/* #define LIBBACCFG_LT_RELEASE  "5.1.0" */
+/* #define LIBBACPY_LT_RELEASE   "5.1.0" */
+/* #define LIBBACSQL_LT_RELEASE  "5.1.0" */
+/* #define LIBBACFIND_LT_RELEASE "5.1.0" */
+
 
 /* Debug flags */
 #undef  DEBUG
@@ -46,7 +52,7 @@
 #define TRACE_FILE 1
 
 /* If this is set stdout will not be closed on startup */
-#define DEVELOPER 1
+/* #define DEVELOPER 1 */
 
 /*
  * SMCHECK does orphaned buffer checking (memory leaks)
@@ -65,10 +71,19 @@
 #if DEVELOPER
 # ifndef _USE_LOCKMGR
 #  define _USE_LOCKMGR
-# endif
-#endif
+# endif /* _USE_LOCKMGR */
+/*
+ * Enable priority management with the lock manager
+ *
+ * Note, turning this on will cause the Bacula SD to abort if
+ *  mutexes are executed out of order, which could lead to a
+ *  deadlock.  However, note that this is not necessarily a
+ *  deadlock, so turn this on only for debugging.
+ */
+#define USE_LOCKMGR_PRIORITY
+#endif  /* DEVELOPER */
 
-#if !HAVE_LINUX_OS
+#if !HAVE_LINUX_OS && !HAVE_SUN_OS && !HAVE_DARWIN_OS && !HAVE_FREEBSD_OS
 # undef _USE_LOCKMGR
 #endif