ebl merge with trunk

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.0@4303 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/debian/bweb.conffiles b/gui/debian/bweb.conffiles
index fda276273538accbb0242f179a2d7f2b13c811bf..5ea848bf3c5c60b7aebdbfe17550537d33236738 100644 (file)
--- a/gui/debian/bweb.conffiles
+++ b/gui/debian/bweb.conffiles
@@ -1 +1,2 @@
 /etc/bacula/bweb.conf
+/etc/apache/conf.d/bweb.conf

diff --git a/gui/debian/bweb.dirs b/gui/debian/bweb.dirs
index 720d96f0f4ca01c5ecc7b234c54ef0ea70a4040b..ed212beadbc0afd7de14962f9c5e181de09f9029 100644 (file)
--- a/gui/debian/bweb.dirs
+++ b/gui/debian/bweb.dirs
@@ -5,6 +5,7 @@ usr/share/doc/bweb
 usr/share/bweb
 usr/share/bweb/tpl
 usr/share/bweb/fr/tpl
+usr/share/bweb/es/tpl
 usr/share/bweb/html
 usr/share/perl5
 var/spool/bweb

diff --git a/gui/debian/bweb.postinst b/gui/debian/bweb.postinst
index 6b274a273923eb430b28a81863f3f5914bd2f9a6..8b11eb744acc54a2b856caf0362581146f51b67f 100644 (file)
--- a/gui/debian/bweb.postinst
+++ b/gui/debian/bweb.postinst
@@ -11,12 +11,14 @@ if [ "$1" = "configure" ] ; then
      echo "Please, use /etc/bacula/bweb.conf instead."
  fi
 
+ chmod 755 /etc/bacula
+
  chown www-data:root /etc/bacula/bweb.conf
  chmod 600 /etc/bacula/bweb.conf
 
  chown www-data:root /var/spool/bweb
  chmod 700 /var/spool/bweb
-       
+ 
  echo
  echo "If you are using postgresql, you have to load /usr/share/bweb/bweb-postgresql.sql in your database"
  
@@ -24,4 +26,10 @@ if [ "$1" = "configure" ] ; then
  echo 
  echo "You can use user/passwd (see /etc/apache/conf.d/bweb.conf)"
  echo "You have to reload your apache configuration"
+ echo 
+ echo "'/usr/bin/bconsole -n -c /etc/bacula/bconsole.conf' must be accessible"
+ echo "by your www-data. You meed to use :"
+ echo "chmod 644 /etc/bacula/bconsole.conf"
+ echo "chmod 755 /usr/bin/bconsole"
+ 
 fi

diff --git a/gui/debian/changelog b/gui/debian/changelog
index bfbf99baf972a159a9a40f3f79a6830c2d70aac8..e87bcb69cb34430adfda4147d9f1a6171997d6fc 100644 (file)
--- a/gui/debian/changelog
+++ b/gui/debian/changelog
@@ -1,5 +1,56 @@
+bweb (2.0.3-2) stable; urgency=low
+
+  * Add display_log_time option to view timestamp in display_log
+  * Add db_size information (for mysql5 and postgresql users)
+
+ -- Eric Bollengier <eric@eb.homelinux.org>  Thu,  01 Feb 2007 01:10:47 +0000
+
+bweb (2.0.3-1) stable; urgency=low
+
+  * Add limit and offset options to log view (for big log)
+
+ -- Eric Bollengier <eric@eb.homelinux.org>  Wed,  28 Feb 2007 21:10:47 +0000
+
+bweb (2.0.2-3) stable; urgency=low
+
+  * Add new stat_job_table option
+
+ -- Eric Bollengier <eric@eb.homelinux.org>  Sun,  25 Feb 2007 11:10:47 +0000
+
+bweb (2.0.2-2) stable; urgency=low
+
+  * fix brestore batch mode
+  * add EndTime to display_job in bweb
+
+ -- Eric Bollengier <eric@eb.homelinux.org>  Wed,  14 Feb 2007 11:10:47 +0000
+
+bweb (2.0.2-1) stable; urgency=low
+
+  * fix utf8 bug in brestore
+  * fix dependency
+
+ -- Eric Bollengier <eric@eb.homelinux.org>  Tue,  06 Feb 2007 21:10:47 +0000
+       
+bweb (2.0.1-2) stable; urgency=low
+
+  * fv_write_path is optionnal now
+  * fix /etc/bacula permissions
+  * fix label_barcodes drive bug 
+  * add spanish translation
+
+ -- Eric Bollengier <eric@eb.homelinux.org>  Fri,  19 Jan 2007 21:10:47 +0000
+
+bweb (2.0.1-1) stable; urgency=low
+
+  * Do nothing if destination string is empty
+  * Fix warning message when using with bweb http connector
+  * Add CVS version number to UA brestore
+
+ -- Eric Bollengier <eric@eb.homelinux.org>  Fri,  12 Jan 2007 22:54:47 +0000
+
 bweb (2.0.0-2) stable; urgency=low
 
+  * Depends: DBD-Pg or DBD-Mysql 
   * Add french tpl in /usr/share/bweb/fr/tpl
   * Add favicon.ico
   * Change /etc/bacula/bweb.conf initialisation

diff --git a/gui/debian/control b/gui/debian/control
index 8503ca25c8928299909c72a6bcb7e12d053d24c0..0d387f04d85c5fa5bea405cc0bcad809ecd9f247 100644 (file)
--- a/gui/debian/control
+++ b/gui/debian/control
@@ -8,24 +8,21 @@ Standards-Version: 3.6.1
 Package: brestore
 Section: base
 Architecture: all
-Depends: libwww-perl (>= 5.8), libtime-modules-perl, libgtk2-gladexml-perl, bweb-common
-Recommends: libdbd-pg-perl, libdbd-mysql-perl
+Depends: libwww-perl (>= 5.8), libtime-modules-perl, libgtk2-gladexml-perl, bweb-common, libdbd-pg-perl|libdbd-mysql-perl
 Description: Bacula restore interface
   Brestore allow you to restore yours files with a Gtk2 interface.
 
 Package: bweb
 Section: base
 Architecture: all
-Depends: libtime-modules-perl, bweb-common, libgd-graph-perl
-Recommends: libdbd-pg-perl, libdbd-mysql-perl
+Depends: libtime-modules-perl, bweb-common, libgd-graph-perl, libdbd-pg-perl|libdbd-mysql-perl,libhtml-template-perl
 Description: Bacula restore interface
   Bweb is a bacula web interface
 
 Package: bweb-common
 Section: base
 Architecture: all
-Depends: libtime-modules-perl
-Recommends: libexpect-perl
+Depends: libtime-modules-perl, libexpect-perl
 Description: Bacula restore interface
   Bweb is a bacula web interface
 

diff --git a/gui/debian/rules b/gui/debian/rules
index 7610594ba0ac6eec258cb98079e579c30e854bf8..bb7722058cff08f512a720c5c2165dd58f9c027d 100755 (executable)
--- a/gui/debian/rules
+++ b/gui/debian/rules
@@ -58,6 +58,7 @@ install-indep:
        install -m 755 bweb/cgi/bconsole.pl debian/bweb/usr/lib/cgi-bin/bweb
        install -m 644 bweb/tpl/*.tpl debian/bweb/usr/share/bweb/tpl 
        install -m 644 bweb/lang/fr/tpl/*.tpl debian/bweb/usr/share/bweb/fr/tpl 
+       install -m 644 bweb/lang/es/tpl/*.tpl debian/bweb/usr/share/bweb/es/tpl 
        install -m 644 bweb/html/*.js debian/bweb/usr/share/bweb/html
        install -m 644 bweb/html/*.css debian/bweb/usr/share/bweb/html
        install -m 644 bweb/html/*.png debian/bweb/usr/share/bweb/html
@@ -65,7 +66,8 @@ install-indep:
        install -m 644 bweb/html/*.html debian/bweb/usr/share/bweb/html
        install -m 644 bweb/html/*.ico debian/bweb/usr/share/bweb/html
        install -m 644 bweb/script/bweb-postgresql.sql debian/bweb/usr/share/bweb
-       echo '$$VAR1 = { template_dir => "/usr/share/bweb/tpl", fv_write_path => "/var/spool/bweb" };' > debian/bweb/etc/bacula/bweb.conf
+       install -m 644 bweb/script/update_job_old.sql debian/bweb/usr/share/bweb
+       echo '$$VAR1 = { template_dir => "/usr/share/bweb/tpl", bconsole => "/usr/bin/bconsole -n -c /etc/bacula/bconsole.conf", fv_write_path => "/var/spool/bweb" };' > debian/bweb/etc/bacula/bweb.conf
        chmod 600 debian/bweb/etc/bacula/bweb.conf
        dh_install -i
        touch install-indep-stamp