[prev in list] [next in list] [prev in thread] [next in thread]
List: bacula-commits
Subject: [Bacula-commits] [bacula.org] Bacula Community source branch Branch-7.2 updated. af39ea48ab5cfe9fbb7
From: git () bacula ! org
Date: 2015-10-18 22:28:30
Message-ID: 20151018222831.7069239B64C () bacula ! bacula ! org
[Download RAW message or body]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula Community source".
The branch, Branch-7.2 has been updated
via af39ea48ab5cfe9fbb77413ef6e9040afb69f09f (commit)
via dca77d9ec55e8d2e07241baeb63d6c2e028ab552 (commit)
via 2bbf4b5a811a50fa3ccd33dd0ab2cc3f6cbc896a (commit)
from dfe932d873073d10eb3a9f3856a23a844b5557ea (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit af39ea48ab5cfe9fbb77413ef6e9040afb69f09f
Author: Kern Sibbald <kern@sibbald.com>
Date: Sun Oct 18 15:26:11 2015 -0700
Fix bug 2171 cannot build tray-monitor
commit dca77d9ec55e8d2e07241baeb63d6c2e028ab552
Author: Kern Sibbald <kern@sibbald.com>
Date: Sun Oct 18 10:33:07 2015 -0700
Recompile configure.in
commit 2bbf4b5a811a50fa3ccd33dd0ab2cc3f6cbc896a
Author: Kern Sibbald <kern@sibbald.com>
Date: Sun Oct 18 10:32:56 2015 -0700
Fix bug 2173 QT tray monitor can not be built due to missing files in configure
-----------------------------------------------------------------------
Summary of changes:
diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 19f8b78..0843981 100644
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -3294,6 +3294,8 @@ AC_OUTPUT([autoconf/Make.common \
src/qt-console/bat.pro.mingw32 \
src/qt-console/bat.pro.mingw64 \
src/qt-console/install_conf_file \
+ src/qt-console/tray-monitor/tray-monitor.conf \
+ src/qt-console/tray-monitor/tray-monitor.pro \
src/qt-console/tray-monitor/tray-monitor.pro.mingw32 \
src/qt-console/tray-monitor/tray-monitor.pro.mingw64 \
src/dird/Makefile \
diff --git a/bacula/configure b/bacula/configure
index 572a980..e476645 100755
--- a/bacula/configure
+++ b/bacula/configure
@@ -30881,7 +30881,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
fi
-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile \
scripts/btraceback scripts/bconsole scripts/bacula scripts/bacula-ctl-dir \
scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile \
scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler \
scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf \
scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper \
scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile \
src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro \
src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 \
src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.pro.mingw32 \
src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile \
src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile \
src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/cats/Makefi \
le src/cats/make_catalog_backup.pl src/cats/make_catalog_backup \
src/cats/delete_catalog_backup src/cats/create_postgresql_database \
src/cats/update_postgresql_tables src/cats/make_postgresql_tables \
src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables \
src/cats/drop_postgresql_database src/cats/create_mysql_database \
src/cats/update_mysql_tables src/cats/make_mysql_tables \
src/cats/grant_mysql_privileges src/cats/drop_mysql_tables \
src/cats/drop_mysql_database src/cats/create_sqlite3_database \
src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables \
src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables \
src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql \
src/cats/create_bacula_database src/cats/update_bacula_tables \
src/cats/grant_bacula_privileges src/cats/make_bacula_tables \
src/cats/drop_bacula_tables src/cats/drop_bacula_database \
src/cats/install-default-backend src/findlib/Makefile src/tools/Makefile \
src/plugins/fd/Makefile src/plugins/sd/Mak efile src/plugins/dir/Makefile \
po/Makefile.in updatedb/update_mysql_tables updatedb/update_sqlite3_tables \
updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 \
updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 \
updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 \
updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 \
updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 \
updatedb/update_mysql_tables_12_to_13 updatedb/update_postgresql_tables_12_to_13 \
updatedb/update_mysql_tables_13_to_14 updatedb/update_postgresql_tables_13_to_14 \
examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec \
platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec \
platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec \
platforms/rpms/suse/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec \
platforms/rpms/suse/bacula-mtx.spec $PFILES"
+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile \
scripts/btraceback scripts/bconsole scripts/bacula scripts/bacula-ctl-dir \
scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile \
scripts/logrotate scripts/mtx-changer scripts/disk-changer scripts/dvd-handler \
scripts/dvd-simulator scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf \
scripts/bat.desktop scripts/bat.desktop.xsu scripts/bat.desktop.consolehelper \
scripts/bat.console_apps src/Makefile src/host.h src/console/Makefile \
src/console/bconsole.conf src/qt-console/bat.conf src/qt-console/bat.pro \
src/qt-console/bat.pro.mingw32 src/qt-console/bat.pro.mingw64 \
src/qt-console/install_conf_file src/qt-console/tray-monitor/tray-monitor.conf \
src/qt-console/tray-monitor/tray-monitor.pro \
src/qt-console/tray-monitor/tray-monitor.pro.mingw32 \
src/qt-console/tray-monitor/tray-monitor.pro.mingw64 src/dird/Makefile \
src/dird/bacula-dir.conf src/lib/Makefile src/stored/Mak efile \
src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf \
src/cats/Makefile src/cats/make_catalog_backup.pl src/cats/make_catalog_backup \
src/cats/delete_catalog_backup src/cats/create_postgresql_database \
src/cats/update_postgresql_tables src/cats/make_postgresql_tables \
src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables \
src/cats/drop_postgresql_database src/cats/create_mysql_database \
src/cats/update_mysql_tables src/cats/make_mysql_tables \
src/cats/grant_mysql_privileges src/cats/drop_mysql_tables \
src/cats/drop_mysql_database src/cats/create_sqlite3_database \
src/cats/update_sqlite3_tables src/cats/make_sqlite3_tables \
src/cats/grant_sqlite3_privileges src/cats/drop_sqlite3_tables \
src/cats/drop_sqlite3_database src/cats/sqlite src/cats/mysql \
src/cats/create_bacula_database src/cats/update_bacula_tables \
src/cats/grant_bacula_privileges src/cats/make_bacula_tables \
src/cats/drop_bacula_tables src/cats/drop_bacula_database \
src/cats/install-default
-backend src/findlib/Makefile src/tools/Makefile src/plugins/fd/Makefile \
src/plugins/sd/Makefile src/plugins/dir/Makefile po/Makefile.in \
updatedb/update_mysql_tables updatedb/update_sqlite3_tables \
updatedb/update_postgresql_tables updatedb/update_mysql_tables_9_to_10 \
updatedb/update_sqlite3_tables_9_to_10 updatedb/update_postgresql_tables_9_to_10 \
updatedb/update_mysql_tables_10_to_11 updatedb/update_sqlite3_tables_10_to_11 \
updatedb/update_postgresql_tables_10_to_11 updatedb/update_mysql_tables_11_to_12 \
updatedb/update_sqlite3_tables_11_to_12 updatedb/update_postgresql_tables_11_to_12 \
updatedb/update_mysql_tables_12_to_13 updatedb/update_postgresql_tables_12_to_13 \
updatedb/update_mysql_tables_13_to_14 updatedb/update_postgresql_tables_13_to_14 \
examples/nagios/check_bacula/Makefile platforms/rpms/redhat/bacula.spec \
platforms/rpms/redhat/bacula-bat.spec platforms/rpms/redhat/bacula-docs.spec \
platforms/rpms/redhat/bacula-mtx.spec platforms/rpms/suse/bacula.spec \
platforms/rpms/su se/bacula-bat.spec platforms/rpms/suse/bacula-docs.spec \
platforms/rpms/suse/bacula-mtx.spec $PFILES"
ac_config_commands="$ac_config_commands default"
@@ -32001,6 +32001,8 @@ do
"src/qt-console/bat.pro.mingw32") CONFIG_FILES="$CONFIG_FILES \
src/qt-console/bat.pro.mingw32" ;;
"src/qt-console/bat.pro.mingw64") CONFIG_FILES="$CONFIG_FILES \
src/qt-console/bat.pro.mingw64" ;;
"src/qt-console/install_conf_file") CONFIG_FILES="$CONFIG_FILES \
src/qt-console/install_conf_file" ;; + \
"src/qt-console/tray-monitor/tray-monitor.conf") CONFIG_FILES="$CONFIG_FILES \
src/qt-console/tray-monitor/tray-monitor.conf" ;; + \
"src/qt-console/tray-monitor/tray-monitor.pro") CONFIG_FILES="$CONFIG_FILES \
src/qt-console/tray-monitor/tray-monitor.pro" ;;
"src/qt-console/tray-monitor/tray-monitor.pro.mingw32") \
CONFIG_FILES="$CONFIG_FILES \
src/qt-console/tray-monitor/tray-monitor.pro.mingw32" ;;
"src/qt-console/tray-monitor/tray-monitor.pro.mingw64") \
CONFIG_FILES="$CONFIG_FILES \
src/qt-console/tray-monitor/tray-monitor.pro.mingw64" ;;
"src/dird/Makefile") CONFIG_FILES="$CONFIG_FILES src/dird/Makefile" ;;
diff --git a/bacula/src/qt-console/tray-monitor/authenticate.cpp \
b/bacula/src/qt-console/tray-monitor/authenticate.cpp index 16f78dd..dde4682 100644
--- a/bacula/src/qt-console/tray-monitor/authenticate.cpp
+++ b/bacula/src/qt-console/tray-monitor/authenticate.cpp
@@ -30,7 +30,7 @@
*
*/
-#include "winhdrs.h"
+//#include "winhdrs.h"
#include "tray-monitor.h"
void senditf(const char *fmt, ...);
diff --git a/bacula/src/qt-console/tray-monitor/tray-ui.h \
b/bacula/src/qt-console/tray-monitor/tray-ui.h index e4e5dfc..ce2b22f 100644
--- a/bacula/src/qt-console/tray-monitor/tray-ui.h
+++ b/bacula/src/qt-console/tray-monitor/tray-ui.h
@@ -27,7 +27,7 @@
# endif
#endif
-#include "winhdrs.h"
+//#include "winhdrs.h"
#include <QAction>
#include <QApplication>
#include <QButtonGroup>
hooks/post-receive
--
Bacula Community source
------------------------------------------------------------------------------
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic