]> git.sur5r.net Git - bacula/bacula/commitdiff
kes The bgnome-console (gnome-console) and bwx-console (wx-console) are
authorKern Sibbald <kern@sibbald.com>
Wed, 18 Apr 2007 17:06:43 +0000 (17:06 +0000)
committerKern Sibbald <kern@sibbald.com>
Wed, 18 Apr 2007 17:06:43 +0000 (17:06 +0000)
     deprecated. No additional bugs will be fixed, and they will be dropped
     in a future release (probably 2.4.0).
kes  Change name of wx-console to bwx-console to make it more Bacula
     unique.
kes  Change the name of gnome-console to bgnome-console to make it
     more Bacula unique.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4567 91ce42f0-d328-0410-95d8-f526ca767f89

14 files changed:
bacula/autoconf/configure.in
bacula/configure
bacula/kernstodo
bacula/scripts/Makefile.in
bacula/scripts/bacula.desktop.gnome1.consolehelper.in
bacula/scripts/bacula.desktop.gnome1.in
bacula/scripts/bacula.desktop.gnome1.xsu.in
bacula/scripts/bacula.desktop.gnome2.consolehelper.in
bacula/scripts/bacula.desktop.gnome2.in
bacula/scripts/bacula.desktop.gnome2.xsu.in
bacula/scripts/bgnome-console.console_apps.in [new file with mode: 0644]
bacula/scripts/gconsole.in
bacula/scripts/gnome-console.console_apps.in [deleted file]
bacula/technotes-2.1

index 0527c694dedc65cd69338a91ef64383eea48cdf1..fbebd39b1776c8a3f5f292d9412f443efe0e8dfe 100644 (file)
@@ -223,7 +223,7 @@ dnl# --------------------------------------------------------------------------
 # gnome (default off)
 # -------------------------------------------
 AC_ARG_ENABLE(gnome,
-  [  --enable-gnome      enable build of gnome-console GUI [disabled]],
+  [  --enable-gnome      enable build of bgnome-console GUI [disabled]],
   [if test x$enableval = xyes; then
     support_gnome=yes
   fi])
@@ -273,10 +273,10 @@ AC_SUBST(BAT_DIR)
 
 
 # -------------------------------------------
-# wx-console (default off)
+# bwx-console (default off)
 # -------------------------------------------
-AC_ARG_ENABLE(wx-console,
-  [  --enable-wx-console     enable build of wxWidgets console [disabled]],
+AC_ARG_ENABLE(bwx-console,
+  [  --enable-bwx-console     enable build of wxWidgets console [disabled]],
   [if test x$enableval = xyes; then
     support_wx_console=yes
   fi])
@@ -295,7 +295,7 @@ if test x$support_wx_console = xyes; then
      WX_DIR=src/wx-console
   else
      echo " "
-     echo "wx-config program not found. wx-console disabled."
+     echo "wx-config program not found. bwx-console disabled."
      echo " "
      support_wx_console=no
   fi
@@ -418,8 +418,8 @@ STATIC_GNOME_CONS=
 STATIC_WX_CONS=
 if test x$support_static_cons = xyes; then
    STATIC_CONS="static-bconsole"
-   STATIC_GNOME_CONS="static-gnome-console"
-   STATIC_WX_CONS="static-wx-console"
+   STATIC_GNOME_CONS="static-bgnome-console"
+   STATIC_WX_CONS="static-bwx-console"
 fi
 AC_SUBST(STATIC_CONS)
 AC_SUBST(STATIC_GNOME_CONS)
@@ -2027,7 +2027,7 @@ AC_OUTPUT([autoconf/Make.common \
           scripts/bacula.desktop.gnome2.consolehelper \
           scripts/bacula.desktop.gnome1.xsu \
           scripts/bacula.desktop.gnome2.xsu \
-          scripts/gnome-console.console_apps \
+          scripts/bgnome-console.console_apps \
           scripts/mtx-changer \
           scripts/disk-changer \
           scripts/dvd-handler \
@@ -2043,9 +2043,9 @@ AC_OUTPUT([autoconf/Make.common \
           src/console/Makefile \
           src/console/bconsole.conf \
           src/gnome2-console/Makefile \
-          src/gnome2-console/gnome-console.conf \
+          src/gnome2-console/bgnome-console.conf \
           src/wx-console/Makefile \
-          src/wx-console/wx-console.conf \
+          src/wx-console/bwx-console.conf \
           src/tray-monitor/Makefile \
           src/tray-monitor/tray-monitor.conf \
           src/dird/Makefile \
@@ -2234,7 +2234,7 @@ Configuration on `date`:
   enable-smartalloc:         ${support_smartalloc} 
   enable-bat:                ${support_bat}
   enable-gnome:              ${support_gnome} ${gnome_version}
-  enable-wx-console:         ${support_wx_console} ${wx_version}
+  enable-bwx-console:        ${support_wx_console} ${wx_version}
   enable-tray-monitor:       ${support_tray_monitor}
   client-only:               ${build_client_only}
   build-dird:                ${build_dird}
index 3692440ba4be1bbf7275726cbeeef8668df76bbd..7c484bece7b691eac1e77b7b3e963bc3bc6168d1 100755 (executable)
@@ -1430,9 +1430,9 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
-  --enable-gnome         enable build of gnome-console GUI disabled
+  --enable-gnome         enable build of bgnome-console GUI disabled
   --enable-bat enable build of bat Qt4 GUI disabled
-  --enable-wx-console     enable build of wxWidgets console disabled
+  --enable-bwx-console     enable build of wxWidgets console disabled
   --enable-tray-monitor   enable build of Gnome tray monitor (compatible with KDE) disabled
   --enable-smartalloc     enable smartalloc debugging support disabled
   --enable-static-tools   enable static tape tools disabled
 
 
 # -------------------------------------------
-# wx-console (default off)
+# bwx-console (default off)
 # -------------------------------------------
-# Check whether --enable-wx-console was given.
-if test "${enable_wx_console+set}" = set; then
-  enableval=$enable_wx_console; if test x$enableval = xyes; then
+# Check whether --enable-bwx-console was given.
+if test "${enable_bwx_console+set}" = set; then
+  enableval=$enable_bwx_console; if test x$enableval = xyes; then
     support_wx_console=yes
   fi
 fi
@@ -14732,7 +14732,7 @@ if test x$support_wx_console = xyes; then
      WX_DIR=src/wx-console
   else
      echo " "
-     echo "wx-config program not found. wx-console disabled."
+     echo "wx-config program not found. bwx-console disabled."
      echo " "
      support_wx_console=no
   fi
@@ -14875,8 +14875,8 @@ STATIC_GNOME_CONS=
 STATIC_WX_CONS=
 if test x$support_static_cons = xyes; then
    STATIC_CONS="static-bconsole"
-   STATIC_GNOME_CONS="static-gnome-console"
-   STATIC_WX_CONS="static-wx-console"
+   STATIC_GNOME_CONS="static-bgnome-console"
+   STATIC_WX_CONS="static-bwx-console"
 fi
 
 
@@ -33853,7 +33853,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then
    exit 1
 fi
 
-ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/gnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/wx-console/Makefile src/wx-console/wx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf 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/Makefile 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_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_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_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database 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/findlib/Makefile src/tools/Makefile po/Makefile.in $PFILES"
+ac_config_files="$ac_config_files autoconf/Make.common Makefile manpages/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/bacula-ctl-dir scripts/bacula-ctl-fd scripts/bacula-ctl-sd scripts/devel_bacula scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/bacula.desktop.gnome1.consolehelper scripts/bacula.desktop.gnome2.consolehelper scripts/bacula.desktop.gnome1.xsu scripts/bacula.desktop.gnome2.xsu scripts/bgnome-console.console_apps scripts/mtx-changer scripts/disk-changer scripts/dvd-handler scripts/dvd-simulator scripts/bacula-tray-monitor.desktop scripts/logwatch/Makefile scripts/logwatch/logfile.bacula.conf scripts/wxconsole.console_apps scripts/wxconsole.desktop.consolehelper scripts/wxconsole.desktop.xsu src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome2-console/Makefile src/gnome2-console/bgnome-console.conf src/wx-console/Makefile src/wx-console/bwx-console.conf src/tray-monitor/Makefile src/tray-monitor/tray-monitor.conf 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/Makefile 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_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_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_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database 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/findlib/Makefile src/tools/Makefile po/Makefile.in $PFILES"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -34437,7 +34437,7 @@ do
     "scripts/bacula.desktop.gnome2.consolehelper") CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome2.consolehelper" ;;
     "scripts/bacula.desktop.gnome1.xsu") CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome1.xsu" ;;
     "scripts/bacula.desktop.gnome2.xsu") CONFIG_FILES="$CONFIG_FILES scripts/bacula.desktop.gnome2.xsu" ;;
-    "scripts/gnome-console.console_apps") CONFIG_FILES="$CONFIG_FILES scripts/gnome-console.console_apps" ;;
+    "scripts/bgnome-console.console_apps") CONFIG_FILES="$CONFIG_FILES scripts/bgnome-console.console_apps" ;;
     "scripts/mtx-changer") CONFIG_FILES="$CONFIG_FILES scripts/mtx-changer" ;;
     "scripts/disk-changer") CONFIG_FILES="$CONFIG_FILES scripts/disk-changer" ;;
     "scripts/dvd-handler") CONFIG_FILES="$CONFIG_FILES scripts/dvd-handler" ;;
@@ -34453,9 +34453,9 @@ do
     "src/console/Makefile") CONFIG_FILES="$CONFIG_FILES src/console/Makefile" ;;
     "src/console/bconsole.conf") CONFIG_FILES="$CONFIG_FILES src/console/bconsole.conf" ;;
     "src/gnome2-console/Makefile") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/Makefile" ;;
-    "src/gnome2-console/gnome-console.conf") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/gnome-console.conf" ;;
+    "src/gnome2-console/bgnome-console.conf") CONFIG_FILES="$CONFIG_FILES src/gnome2-console/bgnome-console.conf" ;;
     "src/wx-console/Makefile") CONFIG_FILES="$CONFIG_FILES src/wx-console/Makefile" ;;
-    "src/wx-console/wx-console.conf") CONFIG_FILES="$CONFIG_FILES src/wx-console/wx-console.conf" ;;
+    "src/wx-console/bwx-console.conf") CONFIG_FILES="$CONFIG_FILES src/wx-console/bwx-console.conf" ;;
     "src/tray-monitor/Makefile") CONFIG_FILES="$CONFIG_FILES src/tray-monitor/Makefile" ;;
     "src/tray-monitor/tray-monitor.conf") CONFIG_FILES="$CONFIG_FILES src/tray-monitor/tray-monitor.conf" ;;
     "src/dird/Makefile") CONFIG_FILES="$CONFIG_FILES src/dird/Makefile" ;;
@@ -35586,7 +35586,7 @@ Configuration on `date`:
   enable-smartalloc:         ${support_smartalloc}
   enable-bat:                ${support_bat}
   enable-gnome:              ${support_gnome} ${gnome_version}
-  enable-wx-console:         ${support_wx_console} ${wx_version}
+  enable-bwx-console:        ${support_wx_console} ${wx_version}
   enable-tray-monitor:       ${support_tray_monitor}
   client-only:               ${build_client_only}
   build-dird:                ${build_dird}
index 389dd221a9cd10278f104d06fe3f89a545d86e4e..7426dc36a2d34d6ec7d343d0eab35d8aa054ca1e 100644 (file)
@@ -44,8 +44,6 @@ Document:
 
 Priority:
 - On restore add Restore Client, Original Client.
-- Change gnome-console to bgnome-console.
-- Change wx-console to bwx-console
 01-Apr 00:42 rufus-dir: Start Backup JobId 55, Job=kernsave.2007-04-01_00.42.48
 01-Apr 00:42 rufus-sd: Python SD JobStart: JobId=55 Client=Rufus
 01-Apr 00:42 rufus-dir: Created new Volume "Full0001" in catalog.
@@ -1788,3 +1786,5 @@ Block Position: 0
 - Migration Volume span bug
 - Rescue release
 - Bug reports
+- Change gnome-console to bgnome-console.
+- Change wx-console to bwx-console
index ce3c95de8f0e80275a9d3132aa7970017d7847a6..9ad6d0be495be626b63b76e53b2924930edd0139 100755 (executable)
@@ -103,6 +103,7 @@ distclean: clean
        @$(RMF) bconsole gconsole logrotate bacula.desktop 
        @$(RMF) bacula.desktop.gnome1 bacula.desktop.gnome2 mtx-changer dvd-handler
        @$(RMF) gnome-console.console_apps bacula.desktop.gnome2.xsu
+       @$(RMF) bgnome-console.console_apps
        @$(RMF) bacula.desktop.gnome2.consolehelper bacula.desktop.gnome1.xsu
        @$(RMF) bacula.desktop.gnome1.consolehelper
 
index 4797f60f28eb4624d605cb6e9adb0756aa44f97b..c2cddffc779003f8128a2517578ac06d7c43472c 100644 (file)
@@ -2,7 +2,7 @@
 Name=Bacula Console
 Comment=Bacula Director Console
 Icon=/usr/share/pixmaps/bacula.png
-Exec=/usr/bin/gnome-console -c @sysconfdir@/gnome-console.conf
+Exec=/usr/bin/bgnome-console -c @sysconfdir@/bgnome-console.conf
 Terminal=false
 Type=Application
 Encoding=UTF-8
index 8ae17bd2c342352e0a469a344ead771067270205..0560a9e8676d58c45d9aa423910a8df8c85f05aa 100644 (file)
@@ -2,7 +2,7 @@
 Name=Bacula Console
 Comment=Bacula Director Console
 Icon=/usr/share/pixmaps/bacula.png
-Exec=@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf
+Exec=@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf
 Terminal=false
 Type=Application
 Encoding=UTF-8
index 366a7dfce12e1099d9ca444f39b21b7b4c3143c7..477a3f832bba0b938f5085488790cd08346807b6 100644 (file)
@@ -2,7 +2,7 @@
 Name=Bacula Console
 Comment=Bacula Director Console
 Icon=/usr/share/pixmaps/bacula.png
-Exec=gnomesu -t "Query" -c "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
+Exec=gnomesu -t "Query" -c "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
 Terminal=false
 Type=Application
 Encoding=UTF-8
index 4797f60f28eb4624d605cb6e9adb0756aa44f97b..c2cddffc779003f8128a2517578ac06d7c43472c 100644 (file)
@@ -2,7 +2,7 @@
 Name=Bacula Console
 Comment=Bacula Director Console
 Icon=/usr/share/pixmaps/bacula.png
-Exec=/usr/bin/gnome-console -c @sysconfdir@/gnome-console.conf
+Exec=/usr/bin/bgnome-console -c @sysconfdir@/bgnome-console.conf
 Terminal=false
 Type=Application
 Encoding=UTF-8
index 8ae17bd2c342352e0a469a344ead771067270205..0560a9e8676d58c45d9aa423910a8df8c85f05aa 100644 (file)
@@ -2,7 +2,7 @@
 Name=Bacula Console
 Comment=Bacula Director Console
 Icon=/usr/share/pixmaps/bacula.png
-Exec=@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf
+Exec=@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf
 Terminal=false
 Type=Application
 Encoding=UTF-8
index 366a7dfce12e1099d9ca444f39b21b7b4c3143c7..477a3f832bba0b938f5085488790cd08346807b6 100644 (file)
@@ -2,7 +2,7 @@
 Name=Bacula Console
 Comment=Bacula Director Console
 Icon=/usr/share/pixmaps/bacula.png
-Exec=gnomesu -t "Query" -c "@sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
+Exec=gnomesu -t "Query" -c "@sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf" -d -e -m "In order to run the bacula console as root, ^additional information is required."
 Terminal=false
 Type=Application
 Encoding=UTF-8
diff --git a/bacula/scripts/bgnome-console.console_apps.in b/bacula/scripts/bgnome-console.console_apps.in
new file mode 100644 (file)
index 0000000..092df23
--- /dev/null
@@ -0,0 +1,3 @@
+USER=root
+PROGRAM=@sbindir@/bgnome-console
+SESSION=true
index ff0c0283bb9848bda3e44fb826312bc206bca512..a8db17cab875fa79fed3c88d9840397aa03f2ce6 100755 (executable)
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# Run gnome-console with test config file
+# Run bgnome-console with test config file
 #
 if [ $# = 1 ] ; then
-   echo "doing gnome-console $1.conf"
-   @sbindir@/gnome-console -c $1.conf
+   echo "doing bgnome-console $1.conf"
+   @sbindir@/bgnome-console -c $1.conf
 else
-   @sbindir@/gnome-console -c @sysconfdir@/gnome-console.conf
+   @sbindir@/bgnome-console -c @sysconfdir@/bgnome-console.conf
 fi
diff --git a/bacula/scripts/gnome-console.console_apps.in b/bacula/scripts/gnome-console.console_apps.in
deleted file mode 100644 (file)
index 6be995e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-USER=root
-PROGRAM=@sbindir@/gnome-console
-SESSION=true
index 429ecfc13cd7bc7aad3349c80e7659ea23b2b55c..e26acae711168c8d9d2d0d4254239a4e6d0d0ff7 100644 (file)
@@ -1,6 +1,14 @@
               Technical notes on version 2.1
 
 General:
+18Apr07
+kes  The bgnome-console (gnome-console) and bwx-console (wx-console) are
+     deprecated. No additional bugs will be fixed, and they will be dropped
+     in a future release (probably 2.4.0).
+kes  Change name of wx-console to bwx-console to make it more Bacula
+     unique.
+kes  Change the name of gnome-console to bgnome-console to make it
+     more Bacula unique.
 14Apr07
 kes  Some time in March, a Feature Request with patch from Jorj Bauer
      <jorj@seas.upenn.edu> was committed by Landon (with my approval).