[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 8b71398a56a1d9b6419f6e90480c8b095c7d28e4
Merge: 27f4e96e9f72624423a8ab41d8bef5787236ee40 1ab14b58a37702d03f25e2597c26391f259a589b
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Fri May 25 00:18:03 2012 +0400

    Merge commit '1ab14b5'

diff --combined debian/control
index e2d29de,b204817..227984c
--- a/debian/control
+++ b/debian/control
@@@ -3,14 -3,14 +3,14 @@@ Section: admi
  Priority: optional
  Maintainer: Debian Bacula packaging Group <pkg-bacula-devel at lists.alioth.debian.org>
  Uploaders: Jan Hauke Rahm <jhr at debian.org>
 -Build-Depends: autotools-dev, debhelper (>= 8.1.3), po-debconf,
 +Build-Depends: autotools-dev, autoconf, debhelper (>= 8.1.3), po-debconf,
   zlib1g-dev, libreadline-dev, libjconv-dev,
 - libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4),
 - postgresql-server-dev-8.4,
 + 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, procps
 + libssl-dev
  Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
  Standards-Version: 3.8.3
  Vcs-Browser: http://git.debian.org/?p=pkg-bacula/bacula.git;a=summary
@@@ -21,7 -21,7 +21,7 @@@ Package: bacul
  Architecture: all
  Depends: bacula-server, bacula-client, bacula-common, ${misc:Depends}
  Suggests: bacula-doc
- Description: network backup, recovery and verification - meta-package
+ Description: network backup, recovery and verification - metapackage
   Bacula is a set of programs to manage backup, recovery and verification
   of computer data across a network of computers of different kinds.
   .
@@@ -30,7 -30,7 +30,7 @@@
   damaged files. Due to its modular design, Bacula is scalable from small
   single computer systems to networks of hundreds of machines.
   .
-  This meta-package installs the entire suite of Bacula applications: job
+  This metapackage installs the entire suite of Bacula applications: job
   scheduling, storage control, node connector, and administrative console.
  
  Package: bacula-common
@@@ -164,7 -164,7 +164,7 @@@ Description: backup system - debug symb
  
  Package: bacula-director-sqlite3
  Architecture: any
 -Depends: bacula-director-common (= ${binary:Version}), sqlite3, ${shlibs:Depends}, bacula-common-sqlite3 (>= ${binary:Version}), file, dbconfig-common, ${misc:Depends}
 +Depends: bacula-director-common (= ${binary:Version}), sqlite3, ${shlibs:Depends}, bacula-common-sqlite3 (>= ${binary:Version}), file, dbconfig-common, ucf, ${misc:Depends}
  Conflicts: bacula-director
  Provides: bacula-director
  Replaces: bacula-director
@@@ -199,7 -199,7 +199,7 @@@ Description: backup system - debug symb
  
  Package: bacula-director-mysql
  Architecture: any
 -Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, mysql-client, ${shlibs:Depends}, bacula-common-mysql (>= ${binary:Version}), ${misc:Depends}
 +Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, mysql-client, ${shlibs:Depends}, bacula-common-mysql (>= ${binary:Version}), ucf, ${misc:Depends}
  Conflicts: bacula-director
  Provides: bacula-director
  Replaces: bacula-director
@@@ -235,11 -235,11 +235,11 @@@ Description: backup system - debug symb
  
  Package: bacula-director-pgsql
  Architecture: any
 -Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, postgresql-client-8.4, ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ${misc:Depends}
 +Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, postgresql-client (>= 7.4), ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ucf, ${misc:Depends}
  Conflicts: bacula-director
  Provides: bacula-director
  Replaces: bacula-director
 -Recommends: postgresql-8.4
 +Recommends: postgresql (>= 7.4)
  Suggests: postgresql-contrib, postgresql-doc
  Description: network backup, recovery and verification - PostgreSQL storage for Director
   Bacula is a set of programs to manage backup, recovery and verification of
@@@ -274,7 -274,7 +274,7 @@@ Package: bacula-clien
  Architecture: all
  Depends: bacula-console (>= ${source:Version}), bacula-fd (>= ${source:Version}), ${misc:Depends}
  Recommends: bacula-traymonitor
- Description: network backup, recovery and verification - client meta-package
+ Description: network backup, recovery and verification - client metapackage
   Bacula is a set of programs to manage backup, recovery and verification of
   data across a network of computers of different kinds.
   .
@@@ -282,12 -282,12 +282,12 @@@
   archive operations. It can run as a daemon or as a foreground service which
   administrators can use to schedule backups and recover files.
   .
-  The package is a meta-package for client installations (file daemon and
+  The package is a metapackage for client installations (file daemon and
   console only).
  
  Package: bacula-fd
  Architecture: any
 -Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends}, lsb-base, ${misc:Depends}
 +Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends}, ucf, lsb-base, ${misc:Depends}
  Suggests: bacula-traymonitor
  Description: network backup, recovery and verification - file daemon
   Bacula is a set of programs to manage backup, recovery and verification of
@@@ -310,23 -310,23 +310,23 @@@ Description: backup system - debug symb
   responsible for providing the file attributes and data when requested by
   the Director, and also for the file system-dependent part of restoration.
   .
 - This package contains the file director's debugging symbols.
 + This package contains the file daemon's debugging symbols.
  
  Package: bacula-server
  Architecture: all
  Depends: bacula-director-sqlite3 (>= ${source:Version})|bacula-director, bacula-sd (>= ${source:Version}), bacula-sd-sqlite3 (>= ${source:Version})|bacula-sd-tools, ${misc:Depends}
  Recommends: bacula-fd
- Description: network backup, recovery and verification - server meta-package
+ Description: network backup, recovery and verification - server metapackage
   Bacula is a set of programs to manage backup, recovery and verification of
   data across a network of computers of different kinds.
   .
-  This meta-package provides a standard server install, consisting of the
+  This metapackage provides a standard server install, consisting of the
   director and storage daemons.
  
  Package: bacula-sd
  Architecture: any
  Pre-Depends: bacula-common (= ${binary:Version})
 -Depends: ${shlibs:Depends}, mtx, python, lsb-base, ${misc:Depends}
 +Depends: ${shlibs:Depends}, mtx, python, lsb-base, ${misc:Depends}, ucf
  Recommends: mt-st, bacula-sd-sqlite3 (>= ${source:Version})|bacula-sd-tools
  Suggests: dds2tar, scsitools, sg3-utils
  Description: network backup, recovery and verification - storage daemon

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