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

[Luca Capello]

The following commit has been merged in the master branch:
commit a64dee5c2199af135e7f91978c61909829756d0b
Author: Luca Capello <luca at pca.it>
Date:   Sun Apr 1 21:47:23 2012 +0200

    debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch
    
    This restores fc7990a, a fix for PostgreSQL lost with 63e0842 and
    partially restored with 8bea4b3, but still needed until upstream
    version 5.2.1.

diff --git a/debian/changelog b/debian/changelog
index 8aeb000..86588ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ bacula (5.0.3-2) UNRELEASED; urgency=low
   * debian/bacula-traymonitor.links:
     + also link the man page for traymonitor.
 
+  [ Luca Capello ]
+  * debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch:
+    + import from Git commit:fc7990a.
+
   [ Martin Pitt ]
   * debian/control (Closes: #639466):
     + update libpq-dev Build-Depends: to 9.1.
diff --git a/debian/patches/series b/debian/patches/series
index 4a1f57e..a9b6ce5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+upstream-1623_debian-591293___file_jpfid_idx.patch
 fix-default-config
 fix-sql-bindir
diff --git a/debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch b/debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch
new file mode 100644
index 0000000..3434554
--- /dev/null
+++ b/debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch
@@ -0,0 +1,34 @@
+Description: Fix file_jpfid_idx handling on upgrade
+Bug-Debian: 591293
+Bug: http://bugs.bacula.org/view.php?id=1623#c5605
+Origin: Debian, commit:fc7990abb396b0f0bd488e948cf97f1444d63415
+Author: John Goerzen <jgoerzen at complete.org>
+Reviewed-by: Luca Capello <luca at pca.it>
+Last-Update: 2012-04-01
+
+---
+ src/cats/update_postgresql_tables.in |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+--- a/src/cats/update_postgresql_tables.in
++++ b/src/cats/update_postgresql_tables.in
+@@ -61,6 +61,9 @@
+ 
+ CREATE INDEX basefiles_jobid_idx ON BaseFiles ( JobId );
+ 
++-- suppress output for index modification
++SET client_min_messages TO 'fatal';
++
+ -- Remove bad PostgreSQL index
+ DROP INDEX file_fp_idx;
+ 
+@@ -71,6 +74,9 @@
+ 
+ CREATE INDEX file_jpfid_idx on File (JobId, PathId, FilenameId);
+ 
++-- restore output
++SET client_min_messages TO DEFAULT;
++
+ ANALYSE;
+ 
+ END-OF-DATA

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