--- bacula-2.0.3/scripts/logwatch/logfile.bacula.conf.in.orig	2007-05-25 11:24:34.000000000 +0200
+++ bacula-2.0.3/scripts/logwatch/logfile.bacula.conf.in	2007-05-25 11:25:46.000000000 +0200
@@ -1,3 +1,3 @@
 # What actual file?  Defaults to LogPath if not absolute path....
-LogFile = @working_dir@/log
+LogFile = @localstatedir@/log/bacula/bacula.log
 
--- bacula-2.0.3/scripts/logrotate.in.orig	2007-05-25 11:26:10.000000000 +0200
+++ bacula-2.0.3/scripts/logrotate.in	2007-05-25 11:26:54.000000000 +0200
@@ -6,7 +6,8 @@
 #
 #      /etc/logrotate.d/bacula
 #
-@working_dir@/log {
+@localstatedir@/log/bacula/*.log {
+    noolddir
     monthly
     rotate 5
     notifempty
--- bacula-3.0.1/src/dird/bacula-dir.conf.in.orig	2008-07-04 20:18:15.000000000 +0200
+++ bacula-3.0.1/src/dird/bacula-dir.conf.in	2009-05-20 14:05:31.000000000 +0200
@@ -261,7 +261,7 @@ Messages {
 #          time to time as it will grow indefinitely. However, it will
 #          also keep all your messages if they scroll off the console.
 #
-  append = "@working_dir@/log" = all, !skipped
+  append = "@localstatedir@/log/bacula/bacula.log" = all, !skipped
   catalog = all
 }
 
@@ -273,7 +273,7 @@ Messages {
   mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
   mail = @job_email@ = all, !skipped            
   console = all, !skipped, !saved
-  append = "@working_dir@/log" = all, !skipped
+  append = "@localstatedir@/log/bacula/bacula.log" = all, !skipped
 }
 
 # Default pool definition
--- bacula-3.0.1/scripts/mtx-changer.in.orig	2008-07-18 10:44:03.000000000 +0200
+++ bacula-3.0.1/scripts/mtx-changer.in	2009-05-20 14:08:40.000000000 +0200
@@ -58,9 +58,9 @@
 MTX=@MTX@
 
 if test ${debug_log} -ne 0 ; then
-  touch @working_dir@/mtx.log
+  touch @localstatedir@/log/bacula/mtx.log
 fi
-dbgfile="@working_dir@/mtx.log"
+dbgfile="@localstatedir@/log/bacula/mtx.log"
 debug() {
     if test -f $dbgfile; then
 	echo "`date +\"%Y%m%d-%H:%M:%S\"` $*" >> $dbgfile
--- bacula-3.0.1/scripts/disk-changer.in.orig	2009-04-21 15:00:16.000000000 +0200
+++ bacula-3.0.1/scripts/disk-changer.in	2009-05-20 14:05:31.000000000 +0200
@@ -84,14 +84,15 @@
 #
 
 wd=@working_dir@
+ld=@localstatedir@/log/bacula
 
 #
 # log whats done
 #
 # to turn on logging, uncomment the following line
-#touch $wd/disk-changer.log
+#touch $ld/disk-changer.log
 #
-dbgfile="$wd/disk-changer.log"
+dbgfile="$ld/disk-changer.log"
 debug() {
     if test -f $dbgfile; then
         echo "`date +\"%Y%m%d-%H:%M:%S\"` $*" >> $dbgfile
--- bacula-2.0.3/scripts/bacula.desktop.gnome2.consolehelper.in.orig	2007-05-29 10:42:45.000000000 +0200
+++ bacula-2.0.3/scripts/bacula.desktop.gnome2.consolehelper.in	2007-05-29 10:42:51.000000000 +0200
@@ -2,7 +2,7 @@
 Name=Bacula Console
 Comment=Bacula Director Console
 Icon=/usr/share/pixmaps/bacula.png
-Exec=/usr/bin/bgnome-console -c @sysconfdir@/bgnome-console.conf
+Exec=@sbindir@/bgconsole -c @sysconfdir@/bgnome-console.conf
 Terminal=false
 Type=Application
 Encoding=UTF-8
--- bacula-2.0.3/scripts/wxconsole.desktop.consolehelper.in.orig	2007-05-29 09:55:28.000000000 +0200
+++ bacula-2.0.3/scripts/wxconsole.desktop.consolehelper.in	2007-05-29 09:56:31.000000000 +0200
@@ -2,7 +2,7 @@
 Name=Bacula WX Console
 Comment=Bacula Director Console
 Icon=/usr/share/pixmaps/wxwin16x16.xpm
-Exec=/usr/bin/bwx-console -c @sysconfdir@/bwx-console.conf
+Exec=@sbindir@/bwxconsole -c @sysconfdir@/bwx-console.conf
 Terminal=false
 Type=Application
 Encoding=UTF-8
--- bacula-2.2.6/scripts/bat.console_apps.in.orig	2007-12-08 11:36:41.000000000 +0100
+++ bacula-2.2.6/scripts/bat.console_apps.in	2007-12-08 11:36:50.000000000 +0100
@@ -1,3 +1,3 @@
 USER=root
-PROGRAM=@sbindir@/bat
+PROGRAM=@sbindir@/bqt-console
 SESSION=true
--- bacula-2.2.6/scripts/bat.desktop.consolehelper.in.orig	2007-12-08 11:32:06.000000000 +0100
+++ bacula-2.2.6/scripts/bat.desktop.consolehelper.in	2007-12-08 11:32:14.000000000 +0100
@@ -2,7 +2,7 @@
 Name=Bacula Administration Tool
 Comment=Bacula Director Console
 Icon=/usr/share/pixmaps/bat_icon.png
-Exec=/usr/bin/bat -c @sysconfdir@/bat.conf
+Exec=@sbindir@/bat -c @sysconfdir@/bat.conf
 Terminal=false
 Type=Application
 Encoding=UTF-8