[pkg-bacula-commits] [bacula] 35/35: Install bsmtp to /usr/sbin as intended by upstream

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to tag development/2011-04-29
in repository bacula.

commit e872c7188c5def17905303c9f443e7ec7238f9fb
Author: Jan Hauke Rahm <jhr at debian.org>
Date:   Fri Apr 29 15:45:01 2011 +0200

    Install bsmtp to /usr/sbin as intended by upstream
---
 debian/bacula-common.install      |  2 +-
 debian/bacula-common.links        |  3 +--
 debian/patches/fix-default-config | 20 --------------------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/bacula-common.install b/debian/bacula-common.install
index 11eb93e..3bb437b 100644
--- a/debian/bacula-common.install
+++ b/debian/bacula-common.install
@@ -5,4 +5,4 @@ usr/lib/bacula/libbac.so
 usr/lib/bacula/libbac-*.so
 usr/lib/bacula/libbacpy*.so
 usr/sbin/btraceback		usr/lib/bacula
-usr/sbin/bsmtp			usr/lib/bacula
+usr/sbin/bsmtp
diff --git a/debian/bacula-common.links b/debian/bacula-common.links
index db2e3b8..a71fa02 100644
--- a/debian/bacula-common.links
+++ b/debian/bacula-common.links
@@ -1,4 +1,3 @@
 usr/lib/bacula/btraceback	usr/sbin/btraceback
 var/log/bacula/log              var/lib/bacula/log
-usr/lib/bacula/bsmtp	usr/lib/bacula/smtp
-usr/lib/bacula/bsmtp    usr/sbin/bsmtp
+usr/sbin/bsmtp			usr/lib/bacula/smtp
diff --git a/debian/patches/fix-default-config b/debian/patches/fix-default-config
index b8188e6..ac32624 100644
--- a/debian/patches/fix-default-config
+++ b/debian/patches/fix-default-config
@@ -62,26 +62,6 @@
  #  Address = @hostname at 2
  #  FDPort = @fd_port@
  #  Catalog = MyCatalog
-@@ -251,8 +252,8 @@
- #  tell (most) people that its coming from an automated source.
- 
- #
--  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: %t %e of %c %l\" %r"
--  operatorcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: Intervention needed for %j\" %r"
-+  mailcommand = "/usr/lib/bacula/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: %t %e of %c %l\" %r"
-+  operatorcommand = "/usr/lib/bacula/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula: Intervention needed for %j\" %r"
-   mail = @job_email@ = all, !skipped            
-   operator = @job_email@ = mount
-   console = all, !skipped, !saved
-@@ -270,7 +271,7 @@
- # Message delivery for daemon messages (no job).
- Messages {
-   Name = Daemon
--  mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
-+  mailcommand = "/usr/lib/bacula/bsmtp -h @smtp_host@ -f \"\(Bacula\) \<%r\>\" -s \"Bacula daemon message\" %r"
-   mail = @job_email@ = all, !skipped            
-   console = all, !skipped, !saved
-   append = "@working_dir@/log" = all, !skipped
 @@ -307,7 +308,7 @@
  # Restricted console used by tray-monitor to get the status of the director
  #

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git