o) Update to version 1.36.1

2 files changed, 20 insertions, 42 deletions

diff --git a/sysutils/bacula-server/files/patch-scripts-Makefile.in b/sysutils/bacula-server/files/patch-scripts-Makefile.in
index 135c486aa2c5..f5e2cee7d1b3 100644
--- a/sysutils/bacula-server/files/patch-scripts-Makefile.in
+++ b/sysutils/bacula-server/files/patch-scripts-Makefile.in
@@ -1,34 +1,43 @@
-*** scripts/Makefile.in.orig	Wed Mar 31 00:54:17 2004
---- scripts/Makefile.in	Thu Apr  8 19:56:21 2004
+*** scripts/Makefile.in.orig	Wed Nov 17 23:48:21 2004
+--- scripts/Makefile.in	Sun Nov 28 15:00:56 2004
 ***************
-*** 32,46 ****
+*** 32,50 ****
   	$(MKDIR) $(DESTDIR)$(scriptdir)
-
+  
   install: installdirs
 ! 	$(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
 ! 	$(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
 ! 	$(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole
 ! 	$(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole
 ! 	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(scriptdir)/bacula
-! 	$(INSTALL_SCRIPT) fd $(DESTDIR)$(scriptdir)/fd
-! 	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
+  	@if  test -f ${DESTDIR}${scriptdir}/mtx-changer; then \
+  	   echo "  ==> Saving existing mtx-changer to mtx-changer.old"; \
+  	   $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \
+  	fi
+  	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
 ! 	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
+! 	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
 ! 	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
-
+  
   uninstall:
   	(cd $(DESTDIR)$(scriptdir); $(RMF) startmysql)
---- 32,46 ----
+--- 32,50 ----
   	$(MKDIR) $(DESTDIR)$(scriptdir)
-
+  
   install: installdirs
 ! #	$(INSTALL_SCRIPT) startmysql $(DESTDIR)$(scriptdir)/startmysql
 ! #	$(INSTALL_SCRIPT) stopmysql $(DESTDIR)$(scriptdir)/stopmysql
 ! #	$(INSTALL_SCRIPT) bconsole $(DESTDIR)$(scriptdir)/bconsole
 ! #	$(INSTALL_SCRIPT) gconsole $(DESTDIR)$(scriptdir)/gconsole
 ! 	$(INSTALL_SCRIPT) bacula $(DESTDIR)$(sysconfdir)/rc.d/bacula.sh.sample
-! 	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
+  	@if  test -f ${DESTDIR}${scriptdir}/mtx-changer; then \
+  	   echo "  ==> Saving existing mtx-changer to mtx-changer.old"; \
+  	   $(MV) -f ${DESTDIR}${scriptdir}/mtx-changer ${DESTDIR}${scriptdir}/mtx-changer.old; \
+  	fi
+  	$(INSTALL_SCRIPT) mtx-changer $(DESTDIR)$(scriptdir)/mtx-changer
 ! #	$(INSTALL_DATA)   btraceback.gdb $(DESTDIR)$(scriptdir)/btraceback.gdb
+! #	$(INSTALL_DATA)   btraceback.dbx $(DESTDIR)$(scriptdir)/btraceback.dbx
 ! #	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
-
+  
   uninstall:
   	(cd $(DESTDIR)$(scriptdir); $(RMF) startmysql)
diff --git a/sysutils/bacula-server/files/patch-src-wx-console b/sysutils/bacula-server/files/patch-src-wx-console
deleted file mode 100644
index 6f388bef45e5..000000000000
--- a/sysutils/bacula-server/files/patch-src-wx-console
+++ /dev/null
@@ -1,31 +0,0 @@
-*** src/wx-console/wxbconfigpanel.cpp.orig	Mon May 31 18:30:40 2004
---- src/wx-console/wxbconfigpanel.cpp	Sat Jul  3 16:37:15 2004
-***************
-*** 88,100 ****
-  wxString wxbConfigParam::GetValue() {
-     switch (type) {
-     case text:
-!       return (statictext) ? statictext->GetLabel() : "";
-        break;
-     case modifiableText:
-!       return (textctrl) ? textctrl->GetValue() : "";      
-        break;
-     case choice:
-!       return (choicectrl) ? choicectrl->GetStringSelection() : "";
-        break;      
-     }
-     return "";
---- 88,100 ----
-  wxString wxbConfigParam::GetValue() {
-     switch (type) {
-     case text:
-! 	return (statictext != NULL) ? statictext->GetLabel() : wxString("");
-        break;
-     case modifiableText:
-!       return (textctrl != NULL) ? textctrl->GetValue() : wxString("");
-        break;
-     case choice:
-!       return (choicectrl != NULL) ? choicectrl->GetStringSelection() : wxString("");
-        break;
-     }
-     return "";