[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-43-geac3ea4

[Jan Hauke Rahm]

The following commit has been merged in the master branch:
commit 2cdfcfec4764ae6cde77c44f474bd521f7562e1d
Author: Jan Hauke Rahm <jhr at debian.org>
Date:   Fri Apr 15 00:12:00 2011 +0200

    Dropping /usr/bin/bconsole as it's defective by design
    
    The bconsole wrapper script makes assumptions about config files a
    sysadmin can easily have moved or changed heavily. It's therefor droped.
    Instead /usr/sbin/bacula-console is linked to /usr/sbin/bconsole (as
    provided by upstream).

diff --git a/debian/additions/bconsole b/debian/additions/bconsole
deleted file mode 100644
index a1de329..0000000
--- a/debian/additions/bconsole
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-CFGFILE=/etc/bacula/bconsole.conf
-exec /usr/sbin/bacula-console -c $CFGFILE $*
diff --git a/debian/bacula-console.install b/debian/bacula-console.install
deleted file mode 100644
index 57963f9..0000000
--- a/debian/bacula-console.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/additions/bconsole		usr/bin
-debian/tmp-install-sqlite3/usr/sbin/bconsole usr/sbin/bacula-console
diff --git a/debian/bacula-console.links b/debian/bacula-console.links
index 5055fe2..947cf8e 100644
--- a/debian/bacula-console.links
+++ b/debian/bacula-console.links
@@ -1 +1,2 @@
 usr/share/man/man8/bconsole.8.gz usr/share/man/man8/bacula-console.8.gz
+usr/sbin/bconsole usr/sbin/bacula-console
diff --git a/debian/rules b/debian/rules
index 3a2c871..6a01dd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,7 +119,6 @@ override_dh_installinit:
 override_dh_install:
 	chmod 755 debian/additions/postinst-common
 	chmod 755 debian/scripts/extract_here
-	chmod 755 debian/additions/bconsole
 	dh_install
 	chmod 755 debian/bacula-common/usr/lib/bacula/btraceback
 	######### dbconfig-common stuff

-- 
Bacula, a network backup, recovery and verification program