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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 27f4e96e9f72624423a8ab41d8bef5787236ee40
Merge: e33c70f5c1fc5b71a54a27800d1a3e99bc09663f 380beef629f7983c5a096102a603ab62ac641f86
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Fri May 25 00:15:50 2012 +0400

    Merge commit '380beef'

diff --combined debian/NEWS
index 24d2d19,01c9f5e..588a667
--- a/debian/NEWS
+++ b/debian/NEWS
@@@ -1,3 -1,27 +1,20 @@@
+ bacula (5.0.3-2) unstable; urgency=low
+ 
+   Significant changes since versions before 5.0.3:
+ 
 -  Configuration files were handled by post-installation (and -removal) scripts
 -  which has changed now. They are now provided as regular conffiles and not
 -  touched by any scripts. The installation process will ask for passwords
 -  which are stored in separate files and only sourced into the main
 -  configuration files. This will ensure easy upgrades even if your passwords
 -  change.
 -
+   The binary /usr/bin/bacula-console (formerly a wrapper around
+   /usr/sbin/bconsole) has been dropped as it made assumptions about where your
+   configuration files is.  Please use 'bconsole -c /path/to/config' (which is
+   basically what bconsole did). A symlink bacula-console -> bconsole is set up
+   to make the binary match the package name.
+ 
+   bacula-fd, -sd, and -director now ship /etc/default/bacula-{fd,sd,dir}
+   accordingly. The new files contain possibilities to disable the service,
+   provide additional arguments passed to the daemon, and specify a
+   configuration file other than the default. Do not delete these files.
+ 
+  -- Jan Hauke Rahm <jhr at debian.org>  Thu, 28 Apr 2011 21:47:05 +0200
+ 
  bacula (3.0.0-1) unstable; urgency=low
  
    * SSL/TLS is now available in Bacula in Debian.
diff --combined debian/README.Debian
index 046d434,a88980b..11c9936
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -6,25 -6,6 +6,25 @@@ The 'bacula-common' package provides so
  for Bacula.  You can find Bacula READMEs and other documentation files
  there.
  
 +DFSG-FREE PACKAGE
 +-----------------
 +
 +The SHA-1 implementation in upstream sources (src/lib/sha1.{h,c}) is
 +directly taken from RFC 3174 "US Secure Hash Algorithm 1 (SHA1)".
 +Given that the Debian considers RFCs non-free according to the Debian
 +Free Software Guidelines 3 and 6, the offending files were removed
 +from the upstream sources.
 +
 +Please note that thanks to a patch by Alexander Golovko there was no
 +loss of functionality: luckily, the SHA-1 implementation provided by
 +the OpenSSL library is compatible with the own in Bacula.  The fact
 +that Bacula is already linked with OpenSSL also means that nothing
 +changed for the Debian package.
 +
 +Please see the following bug report for a complete explanation:
 +
 +  <http://bugs.debian.org/658326>
 +
  BASIC INFORMATION
  -----------------
  
@@@ -68,9 -49,6 +68,6 @@@ CONSOL
  The package bacula-console provides the administration console for
  Bacula, so that users can contact the director.
  
-  There is, in fact, a wrapper
- script to ease usage by users: /usr/bin/bconsole
- 
  The BAT graphical admin console is contained in the
  bacula-console-qt package.
  
@@@ -93,7 -71,7 +90,7 @@@ use
  You can run Bacula consoles as any user, but the user you use will
  need to be able to read the console config files.  These files are, by
  default, under /etc/bacula.  You'll need to specify the config file
- with -c for any of the GUI consoles.
+ with -c for any of the consoles.
  
  PERFORMANCE NOTES
  =================
@@@ -164,4 -142,4 +161,4 @@@ http://www.bacula.org
  
  based on a file by Jose Luis Tallon
  
 - -- John Goerzen <jgoerzen at complete.org>, Mon,  1 Mar 2010 16:03:29 -0600
 + -- Luca Capello <luca at pca.it>, Fri, 18 May 2012 19:08:00 +0200

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