ebl Use apache2 in debian packages

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

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

diff --git a/gui/debian/bweb.dirs b/gui/debian/bweb.dirs
index 50a1225596c42fa4079ec2b0645e878f94980314..4a8958fabdf8178dc3526ed674e1e2ea38f480c6 100644 (file)
--- a/gui/debian/bweb.dirs
+++ b/gui/debian/bweb.dirs
@@ -1,5 +1,5 @@
 etc/bacula
-etc/apache/conf.d
+etc/apache2/conf.d
 usr/lib/cgi-bin/bweb
 usr/share/doc/bweb
 usr/share/bweb

diff --git a/gui/debian/changelog b/gui/debian/changelog
index c98a05ad7617df7cb2505ee6ff22b0928ea947f9..d55ecaeaec0fe54d0a52a87550a8ff5235bbacf5 100644 (file)
--- a/gui/debian/changelog
+++ b/gui/debian/changelog
@@ -1,3 +1,14 @@
+bweb (2.4.4-2) stable; urgency=low
+  * Use apache2 instead of apache
+       
+ -- Eric Bollengier <eric@eb.homelinux.org>  Mon,  19 Jan 2009 14:15:47 +0000
+
+bweb (2.4.4-1) stable; urgency=low
+  * Update bresto
+  * bug fix
+       
+ -- Eric Bollengier <eric@eb.homelinux.org>  Sun,  18 Jan 2009 22:15:47 +0000
+
 bweb (2.2.7-1) stable; urgency=low
   * Move /usr/share/bweb/fr/tpl to /usr/share/bweb/tpl/fr
   * Move /usr/share/bweb/es/tpl to /usr/share/bweb/tpl/es

diff --git a/gui/debian/control b/gui/debian/control
index 1e5d799c54d0ad7f20e19d451ecee09c17774851..9e7fd46cf7863c987b395d60839e88afe73c841c 100644 (file)
--- a/gui/debian/control
+++ b/gui/debian/control
@@ -15,7 +15,7 @@ Description: Bacula restore interface
 Package: bweb
 Section: base
 Architecture: all
-Depends: libtime-modules-perl, bweb-common, libgd-graph-perl, libdbd-pg-perl|libdbd-mysql-perl,libhtml-template-perl,libdate-calc-perl
+Depends: libtime-modules-perl, bweb-common, libgd-graph-perl, libdbd-pg-perl|libdbd-mysql-perl,libhtml-template-perl,libdate-calc-perl, apache2
 Description: Bacula web interface
   Bweb is a Bacula web interface
 

diff --git a/gui/debian/rules b/gui/debian/rules
index 6d81b8541493139bc3735b77cb502b3b19194c36..455e8581787b94100f0ed6adae64cbe950111bfc 100755 (executable)
--- a/gui/debian/rules
+++ b/gui/debian/rules
@@ -53,7 +53,7 @@ install-indep:
        install -m 644 bweb/lib/Bweb.pm debian/bweb/usr/share/perl5
        install -m 644 bweb/lib/GTime.pm debian/bweb/usr/share/perl5
        install -m 644 bweb/lib/GBalloon.pm debian/bweb/usr/share/perl5
-       install -m 644 bweb/script/bweb.conf debian/bweb/etc/apache/conf.d
+       install -m 644 bweb/script/bweb.conf debian/bweb/etc/apache2/conf.d
        install -m 755 bweb/cgi/bgraph.pl debian/bweb/usr/lib/cgi-bin/bweb
        install -m 755 bweb/cgi/bweb.pl debian/bweb/usr/lib/cgi-bin/bweb
        install -m 755 bweb/cgi/btime.pl debian/bweb/usr/lib/cgi-bin/bweb