[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-4-2-g4a47434

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 6e1fab3c304fa73b9c6801a07290ce48b7cadb24
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Tue Sep 25 15:41:08 2012 +0400

    capabilities is linux-only feature.
    
    disable it for other platforms.

diff --git a/debian/README.Debian b/debian/README.Debian
index cfb3140..1b003f8 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -86,13 +86,10 @@ daemons and RunBefore/RunAfter jobs will run as that user.  However,
 the file daemon run as root, as will your ClientRunBefore/After
 jobs. File daemon can use linux capabilities(7) for drop root
 privileges, but it require root privileges for correctly restore
-files original permissions. For run file daemon without root 
+original files permissions. For run file daemon without root 
 privileges you can add ARGS="-k -u <username>" into
-/etc/default/bacula-fd. Installation of a director will ask you for a
-database user to use.
-
-File daemon can be run without root privileges, it has support for
-keep 
+/etc/default/bacula-fd. This is linux specific feature. Installation 
+of a director will ask you for a database user to 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
diff --git a/debian/changelog b/debian/changelog
index 0cccca9..e2cf252 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+bacula (5.2.6+dfsg-5) unstable; urgency=low
+
+  * debian/control:
+    - capabilities is linux-only feature. disable it for non-linux platforms.
+  * debian/README.Debian:
+    + add information, that capabilities is linux-only feature. 
+
+ -- 
+
 bacula (5.2.6+dfsg-4) unstable; urgency=high
 
   * debian/control, debian/bacula-director-db.templates.in,
diff --git a/debian/control b/debian/control
index 2204983..5c04d1c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: autotools-dev, autoconf, debhelper (>= 8.1.3), po-debconf,
  zlib1g-dev, libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev
  (>= 9.1), postgresql-server-dev-all, libwrap0-dev, python-dev, libgtk2.0-dev,
  libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc,
- libxt-dev, libqt4-dev, libssl-dev, liblzo2-dev, libcap-dev
+ libxt-dev, libqt4-dev, libssl-dev, liblzo2-dev, libcap-dev [linux-any]
 Build-Conflicts: python2.4
 Standards-Version: 3.9.3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-bacula/bacula.git;a=summary

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