From 17514cc6154170150d4a03d0c52f95143f79ce75 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 4 Jun 2008 15:55:26 +0000
Subject: [PATCH] Cut off version 2.4.0

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7107 91ce42f0-d328-0410-95d8-f526ca767f89
---
 bacula/kernstodo                    |  2 ++
 bacula/src/console/console.c        |  2 +-
 bacula/src/version.h                |  6 +++---
 bacula/src/win32/installer/Makefile |  1 +
 bacula/technotes-2.3                | 10 ++++++++--
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 997371491a..530d143294 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -114,6 +114,8 @@ Professional Needs:
 
 Priority:
 ================
+- Fix #ifdefing so that smartalloc can be disabled. Check manual
+  -- the default is enabled.
 - Change calling sequence to delete_job_id_range() in ua_cmds.c 
   the preceding strtok() is done inside the subroutine only once.
 - Dangling softlinks are not restored properly.  For example, take a
diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
index 386fac430b..5553958b5b 100644
--- a/bacula/src/console/console.c
+++ b/bacula/src/console/console.c
@@ -405,7 +405,7 @@ get_cmd(FILE *input, const char *prompt, BSOCK *sock, int sec)
 
 #else /* no readline, do it ourselves */
 
-#if !defined(HAVE_WIN32)
+#ifdef HAVE_CONIO
 static bool bisatty(int fd)
 {
    if (no_conio) {
diff --git a/bacula/src/version.h b/bacula/src/version.h
index d443409196..5d6c410b58 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -4,8 +4,8 @@
 
 #undef  VERSION
 #define VERSION "2.3.22"
-#define BDATE   "01 June 2008"
-#define LSMDATE "01Jun08"
+#define BDATE   "04 June 2008"
+#define LSMDATE "04Jun08"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2008 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2008"       /* year for copyright messages in progs */
@@ -62,7 +62,7 @@
  *  run regress test.
  */
 #ifdef DEVELOPER
-//#define USE_FAKETAPE
+#define USE_FAKETAPE
 #endif
 
 /* 
diff --git a/bacula/src/win32/installer/Makefile b/bacula/src/win32/installer/Makefile
index 3c0ee400d6..971b420d13 100644
--- a/bacula/src/win32/installer/Makefile
+++ b/bacula/src/win32/installer/Makefile
@@ -86,6 +86,7 @@ CAT_FILES := \
 	grant_mysql_privileges.sql \
 	make_mysql_catalog_backup.cmd \
 	create_postgresql_database.cmd \
+	create_postgresql_database.sql \
 	drop_postgresql_database.cmd \
 	make_postgresql_tables.cmd \
 	make_postgresql_tables.sql \
diff --git a/bacula/technotes-2.3 b/bacula/technotes-2.3
index 8f175cf0ff..ddbb045345 100644
--- a/bacula/technotes-2.3
+++ b/bacula/technotes-2.3
@@ -1,4 +1,4 @@
-              Technical notes on version 2.3
+              Technical notes on version 2.5
 
           
 New features:
@@ -24,12 +24,18 @@ Add long term statistics job table
 
 
 General:
+
+Release Version 2.4.0:
+04Jun08
+kes  Fix Win32 build.
 03Jun08
 kes  Make sure to clear JS_WaitMedia when operator mounts a Volume.
+     This fixes bug #1095.
 31May08
 kes  Add create_postgresql_database.sql to Win32 installer. Should 
      fix problem reported by Juilio Monteiro.
-kes  Get correct slot when auto unloading a device.
+kes  Get correct slot when auto unloading a device. This fixes bug
+     #1086.
 30May08
 kes  Fix multiple media restore.
 kes  Make DEVICE Slot private and access it via a method.
-- 
2.39.5