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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit c30ec5828db0e98be7092f17ed58c13d9cdaf6a1
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sat Jun 2 01:22:42 2012 +0400

    fix merged changes
    
    Add gawk into suggests for bacula-director-<dbtype>
    Fix path in debian/rules
    Reflect this changes in changelog

diff --git a/debian/changelog b/debian/changelog
index 0e68cdd..3d640e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -110,6 +110,8 @@ bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
     + add --with-dump-email=root and --with-job-email=root to CONF_ALL,
       thus removing the '@localhost' domain part (Closes: #519567).
     + call aclocal to include ltdl.m4 for binutils-gold upstream patch.
+  * debian/additions/*, debian/rules:
+    + add gawk script for catalog backup.
 
   [ Martin Pitt ]
   * debian/control (Closes: #639466):
diff --git a/debian/control b/debian/control
index 07d96b3..f7dd942 100644
--- a/debian/control
+++ b/debian/control
@@ -170,6 +170,7 @@ Depends: bacula-director-common (= ${binary:Version}), bacula-common-sqlite3
 Conflicts: bacula-director
 Provides: bacula-director
 Replaces: bacula-director
+Suggests: gawk
 Description: network backup, recovery and verification - SQLite 3 storage for Director
  Bacula is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -211,6 +212,7 @@ Conflicts: bacula-director
 Provides: bacula-director
 Replaces: bacula-director
 Recommends: mysql-server
+Suggests: gawk
 Description: network backup, recovery and verification - MySQL storage for Director
  Bacula is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -252,7 +254,7 @@ Conflicts: bacula-director
 Provides: bacula-director
 Replaces: bacula-director
 Recommends: postgresql (>= 7.4)
-Suggests: postgresql-contrib, postgresql-doc
+Suggests: gawk, 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
  data across a network of computers of different kinds.
diff --git a/debian/rules b/debian/rules
index a174d91..79eaa57 100755
--- a/debian/rules
+++ b/debian/rules
@@ -179,7 +179,7 @@ override_dh_fixperms:
 	dh_fixperms
 	chmod -x debian/bacula-sd/etc/bacula/scripts/mtx-changer.conf
 	chmod -x debian/bacula-common/usr/share/doc/bacula-common/examples/nagios/check_bacula/README
-	chmod +x debian/bacula-sd/etc/bacula/scripts/make_catalog_backup_awk
+	chmod +x debian/bacula-director-*/etc/bacula/scripts/make_catalog_backup_awk
 
 override_dh_prep:
 override_dh_auto_configure:

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