Merge lp:~ubuntu-branches/ubuntu/precise/bacula/precise-201202101202 into lp:ubuntu/precise/bacula

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/bacula reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/bacula/precise-201202101202. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

82. By Scott Moser on 2012-02-09

releasing version 5.2.5-0ubuntu1

81. By Scott Moser on 2012-02-09

fix database creation data so it works with mysql 5.5

80. By Scott Moser on 2012-02-09

fixes SONAME of libbaccats-{mysql,pgsql,sqlite3}-<version>.so to be
libbaccats-<version> which made dh_shlibdeps fail in 5.2.3 after
correct libraries were copied.

79. By Scott Moser on 2012-02-09

include /usr/lib/x86_64-linux-gnu in build-time --with-mysql search path

78. By Scott Moser on 2012-02-09

copy correct backend-specific libbaccats files to the appropriate
package to not have only the dummy library (LP: #929523)

77. By Scott Moser on 2012-02-09

New upstream release.

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-06 09:33:25 +0000
+++ debian/changelog	2012-02-10 12:11:23 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 bacula (5.2.5-0ubuntu2) precise; urgency=low
 
   * Enable LZO support (LP: #925315)
@@ -1908,3 +1909,1909 @@
 
  -- José Luis Tallón <[e-mail]>  Wed, 18 Feb 2004 00:04:11 +0100
 
+=======
+bacula (5.2.5-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+    * fixes SONAME of libbaccats-{mysql,pgsql,sqlite3}-<version>.so to be
+      libbaccats-<version> which made dh_shlibdeps fail in 5.2.3 after
+      correct libraries were copied.
+  * copy correct backend-specific libbaccats files to the appropriate
+    package to not have only the dummy library (LP: #929523)
+  * include /usr/lib/x86_64-linux-gnu in build-time --with-mysql search path
+  * fix database creation data so it works with mysql 5.5
+
+ -- Scott Moser <[e-mail]>  Thu, 09 Feb 2012 16:05:44 -0500
+
+bacula (5.2.3-0ubuntu3) precise; urgency=low
+
+  * remove libbaccats* from bacula-common, which fixes 
+    a depends-but-conflicts between bacula-common and 
+    bacula-{mysql,pgsql,sqlite3} (LP: #897303)
+
+ -- Scott Moser <[e-mail]>  Wed, 08 Feb 2012 14:33:34 -0500
+
+bacula (5.2.3-0ubuntu2) precise; urgency=low
+
+  * Fix debian/rules mistakenly looking for 5.2.1.so version files. Now pulls
+    the version from dpkg-parsechangelog to avoid future mistakes.
+
+ -- Ben Collins <[e-mail]>  Thu, 19 Jan 2012 00:13:55 +0000
+
+bacula (5.2.3-0ubuntu1) precise; urgency=low
+
+  * New upstream release. (LP: #917471)
+    + debian/patches/fix-libbaccats-path.patch: dropped as
+      now unnecessary
+
+ -- Scott Moser <[e-mail]>  Tue, 17 Jan 2012 15:06:46 -0500
+
+bacula (5.2.1-0ubuntu2) precise; urgency=low
+
+  * Rebuild for libmysqlclient transition
+
+ -- Clint Byrum <[e-mail]>  Wed, 23 Nov 2011 23:25:00 -0800
+
+bacula (5.2.1-0ubuntu1) precise; urgency=low
+
+  * New upstream release:
+    + Switch to dpkg-source 3.0 (quilt) format.
+    + Use quilt for patches.
+    + Bump standards to 3.9.2.
+    + Clean up debian/rules.
+    + Split out patches applied directly into source into quilt patches.
+    + Add po-debconf as a build dependency.
+    + debian/patches/fix-libbaccats-path.patch: Fix symlink when installing
+      libbacccats.
+
+ -- Chuck Short <[e-mail]>  Sun, 06 Nov 2011 20:34:58 -0500
+
+bacula (5.0.3-1ubuntu6) precise; urgency=low
+
+  * Add needed gawk dependency (LP: #645082)
+    - debian/control: add gawk to Depends for bacula-director-common.
+    - debian/patches/ubuntu_bacula-dir.conf.patch: call
+      make_catalog_backup_awk with gawk, as awk might refer to something
+      other than gawk, but make_catalog_backup_awk is gawk-specific.
+      (as pointed out by Fred Baumgarten)
+
+ -- Serge Hallyn <[e-mail]>  Fri, 14 Oct 2011 12:00:42 -0500
+
+bacula (5.0.3-1ubuntu5) oneiric; urgency=low
+
+  * debian/control: Drop unused libqwt5-qt4-dev build-dep (bacula is currently
+    built --without-qwt) to support qwt6 transition
+
+ -- Scott Kitterman <[e-mail]>  Fri, 26 Aug 2011 09:57:57 -0400
+
+bacula (5.0.3-1ubuntu4) oneiric; urgency=low
+
+  * debian/control: Build against PostgreSQL 9.1 (LP: #833684)
+  * debian/control: Drop bacula-director-sqlite migration package, we have
+    carried it long enough for upgrading. Drop libsqlite0-dev build
+    dependency, so that the old sqlite can drop out of main at some point.
+
+ -- Martin Pitt <[e-mail]>  Thu, 25 Aug 2011 15:00:36 +0200
+
+bacula (5.0.3-1ubuntu3) oneiric; urgency=low
+
+  * debian/control: Build against PostgreSQL 9.0.
+
+ -- Martin Pitt <[e-mail]>  Thu, 09 Jun 2011 17:25:23 +0200
+
+bacula (5.0.3-1ubuntu2) oneiric; urgency=low
+
+  * Rebuild for OpenSSL 1.0.0.
+
+ -- Colin Watson <[e-mail]>  Fri, 20 May 2011 10:10:13 +0100
+
+bacula (5.0.3-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Daemons listen on all interfaces. (LP: #286643)
+    - Start Daemons on installation.
+    - Drop mt-st to suggests. So that bacula goes back to main. (LP: #286528)
+    - debian/rules: Disable fortify source since it was causing bacula-director to 
+      segfault.
+    - debian/control: 
+      + Cleaned up bacula-director-pgsql dependences and recommends.
+      + Made mysql the default director to install bacula-director-mysql.
+
+ -- Chuck Short <[e-mail]>  Mon, 02 May 2011 11:35:26 +0100
+
+bacula (5.0.3-1) unstable; urgency=low
+
+  * [27362ff7] Adopted by bacula packaging group (Closes: #612296)
+  * [14bbb35e] New upstream version  (Closes: #592622)
+    + Fixes OpenSSL 1.0.0 issue (Closes: #622003)
+    + Doesn't install any Product column (Closes: #615570)
+  * [7562cd38] Install alternative binary name for tray-monitor (Closes: 461943)
+
+ -- Jan Hauke Rahm <[e-mail]>  Thu, 21 Apr 2011 15:16:55 +0200
+
+bacula (5.0.3-0ubuntu2) natty; urgency=low
+
+  * debian/bacula-directory-{mysql,pgsql}.postinst: Wrap $dbc_dbname
+    in quotes in postinst. (LP: #689327)
+
+
+ -- Chuck Short <[e-mail]>  Mon, 07 Mar 2011 10:00:03 -0500
+
+bacula (5.0.3-0ubuntu1) natty; urgency=low
+
+  * New upstream version. 
+
+ -- Chuck Short <[e-mail]>  Mon, 14 Feb 2011 14:08:20 -0500
+
+bacula (5.0.2-3) unstable; urgency=low
+
+  * Wrap password commands in quotes.  Closes: #607443.
+  * Orphaning this package; changing maintainer to QA group.
+    WNPP bug #612296 filed.
+
+ -- John Goerzen <[e-mail]>  Mon, 07 Feb 2011 08:20:22 -0600
+
+bacula (5.0.2-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "make_catalog_backup is broken": patch configure to use /usr/bin as
+    the path of the PostgreSQL binaries instead of dynamically setting it at
+    build time to /usr/lib/postgresql/$VERSION/bin (closes: #606802).
+
+ -- gregor herrmann <[e-mail]>  Wed, 15 Dec 2010 16:42:56 +0100
+
+bacula (5.0.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "bacula meta-package not installable with recommended packages":
+    bacula-sd: Recommends: add a real package to the virtual bacula-sd-tools;
+    thanks to Hideki Yamane for the proposal (closes: #602222).
+
+ -- gregor herrmann <[e-mail]>  Sat, 27 Nov 2010 17:18:41 +0100
+
+bacula (5.0.2-2ubuntu3) natty; urgency=low
+
+  * Added libssl explicit build dependency in src/lib/Makefile.in for libbac.
+  Closes: (LP: #687968)
+
+ -- Ahmed Kamal <[e-mail]>  Fri, 10 Dec 2010 10:30:04 +0200
+
+bacula (5.0.2-2ubuntu2) natty; urgency=low
+
+  * Rebuild with python 2.7 as the python default.
+
+ -- Matthias Klose <[e-mail]>  Thu, 09 Dec 2010 16:43:46 +0000
+
+bacula (5.0.2-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Daemons listen on all interfaces. (LP: #286643)
+    - Start daemons on installation
+    - Drop mt-st to suggests. So that bacula goes back to main. (LP: #286528)
+    - debian/rules: Disable fortify source since it was causing bacula-director
+      to segfault.
+    - debian/control:
+      + Cleaned up bacula-director-pgsql dependencies and recommends.
+      + Made mysql the default director to install bacula-director-{mysql|pgsql}.
+
+ -- Chuck Short <[e-mail]>  Fri, 27 Aug 2010 20:54:42 +0100
+
+bacula (5.0.2-2) unstable; urgency=medium
+
+  * Remove spurious creation of file_jpfid_idx on upgrade.  Closes: #591293.
+
+ -- John Goerzen <[e-mail]>  Fri, 20 Aug 2010 14:58:19 -0500
+
+bacula (5.0.2-1ubuntu1) maverick; urgency=low
+
+  * Resynchronize with debian, remaining changes:
+    - Daemons listen on all interfaces. (LP: #286643)
+    - Start daemons on installation
+    - Drop mt-st to suggests. So that bacula goes back to main. (LP: #286528)
+    - debian/rules: Disable fortify source since it was causing bacula-director
+      to segfault.
+    - debian/control:
+      + Cleaned up bacula-director-pgsql dependencies and recommends.
+      + Made mysql the default director to install bacula-director-{mysql|pgsql}.
+     
+ -- Chuck Short <[e-mail]>  Tue, 22 Jun 2010 09:11:35 -0400
+
+bacula (5.0.2-1) unstable; urgency=medium
+
+  * New upstream release.  Closes: #585729, #582484.
+  * Drop bacula-sd-tools from Conflicts and Replaces line of bacula-sq-sqlite.
+    Fixes RC bug.  Closes: #582422.
+  * Update PostgreSQL recommendations to 8.4.
+  * Add sqlite to deps for bacula-director-sqlite3.  Closes: #542825.
+
+ -- John Goerzen <[e-mail]>  Mon, 21 Jun 2010 09:22:47 -0500
+
+bacula (5.0.2-0ubuntu1) maverick; urgency=low
+
+  * New upstream release, changes since 5.0.1:
+    - Probable fix for SD crash bug #1553
+    - Fix #1559 problem when restoring pruned jobs with a regexp
+    - Fix for bug #1560 bcopy cannot find Volume
+    - Fix cancel crash bug #1551
+    - Check if sql backend is thread-safe
+    - Correct Pool display in SD status. Fixes bug #1541
+    - Fix cancel crash reported by Stephen Thompson
+    - Rewind on close to fix #1549
+    - Remove closelog() in bpipe fixes bug #1536
+    - Fix #1517 about missing Base level in .level command
+    - Replace ASSERT in block.c with fail Job
+    - Fix database locking calling db_lock and returning from function without
+      calling db_unlock.
+    - Add missing db_unlock to bvfs_update_cache.
+    - Fix #1532 about permission on binaries
+    - Fix #1527 about deadlock during migration
+    - Another fix for OpenSSLv1
+    - Fix tls.c for OpenSSLv1
+    - Fix #1511 when trying to insert more than 50.000 directories in bvfs
+    - Fix plugin load not to stop if one plugin bad -- pointed out by James
+    - Remove --without-qwt from configure statement.
+    - Second correct fix to bug #1524 verify fails after adding or removing files
+    - Fix bug #1524 verify fails after adding or removing files
+    - Apply fix suggested by Andreas in bug #1502 for mediaview column sort problem
+    - Fix OpenSSL 1.x problem in crypto.c on Fedora 12
+    - Display AllowCompress warning message only if compression used in FileSet
+  * Dropped debian/patches/ubuntu_address.patch.
+
+ -- Chuck Short <[e-mail]>  Thu, 29 Apr 2010 09:45:01 -0400
+
+bacula (5.0.1-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.  Remaining changes:
+    - Daemons listen on all interfaces. (LP: #286643)
+    - Start daemons on installation
+    - Drop mt-st to suggests. So that bacula goes back to main. (LP: #286528)
+    - debian/rules: Disable fortify source since it was causing bacula-director
+      to segfault.
+    - debian/control:
+      + Cleaned up bacula-director-pgsql dependencies and recommends.
+      + Made mysql the default director to install bacula-director-{mysql|pgsql}.
+   * Dropped:
+     - Generate default passwords at install time, integrated upstream.
+     - Added LSB support to init scripts, integrated upstream.
+
+ -- Chuck Short <[e-mail]>  Sun, 14 Mar 2010 02:19:12 +0000
+
+bacula (5.0.1-1) unstable; urgency=low
+
+  * New upstream release.  Closes: #572166.
+  * Revert dbcheck.8 to exact upstream version.
+  * Drop Debian patches that add indices to databases.  This is per the
+    new upstream statement saying "we strongly recommend to avoid the
+    temptation to add new indexes.  In general, these will cause very
+    significant performance problems in other areas."
+  * Reverted other Debian-specific patches to database update scripts
+    that are no longer included in our packages.
+  * Fix for MySQL and PostgreSQL postinst to correctly put catalog backup
+    name in bacula-dir.conf.
+
+ -- John Goerzen <[e-mail]>  Wed, 03 Mar 2010 08:38:35 -0600
+
+bacula (5.0.0-6) unstable; urgency=low
+
+  * Generate default passwords at install time instead of at build time.
+    Closes: #365097.  Patch originated in Ubuntu; modified for Debian.
+    Merged to Debian master at 8381602cfbecaea0ca8559100020f878af81a237.
+  * Call rm -rf /var/{log,lib}/bacula on purge.  This patch was part of
+    Ubuntu's set merged above.
+  * Modified Ubuntu's password patch to use
+    /etc/bacula/common_default_passwords instead of debconf per Debian
+    practice.
+  * Added full LSB support to init scripts.  Patch originated in Ubuntu,
+    and was merged with LSB status support already in Debian.
+    Merged to Debian master at b3e2b4bc8dc1ad2a66b1e80c4cfa6176a15a062d.
+  * Correct perms on new Sqlite3 database so it's owned by bacula:bacula.
+  * Correct Sqlite3 postinst to handle paths of DBNAME correctly.
+
+ -- John Goerzen <[e-mail]>  Mon, 01 Mar 2010 15:43:02 -0600
+
+bacula (5.0.0-5) unstable; urgency=medium
+
+  * Fix bashism in scripts/disk-changer.in.  Closes: #530049.
+  * Correct MySQL index patch to avoid syntax error on install.
+    Closes: #569535.
+  * Corrected MySQL upgrade issue by adding a shell script to determine
+    whether to remove Stripe column from JobMedia table.  This would have
+    caused upgrade to crash for people that had upgraded all the way from
+    the 1.x days.
+    Closes: #569285.
+  * Patch from Petr Salinger to disable ACLs on kfreebsd-* archs.
+    This corrects a FTBFS and Closes: #570890.
+  * Correct saving password to bacula-dir.conf on new install
+    with MySQL or PostgreSQL flavor.  Closes: #538824.
+  * Added make_catalog_backup.pl script to *-director debs.
+
+ -- John Goerzen <[e-mail]>  Mon, 22 Feb 2010 13:47:19 -0600
+
+bacula (5.0.0-4) unstable; urgency=low
+
+  * Corrected fail to install bug: after removing /var/run from the package
+    in 5.0.0-3, needed to also remove reference to it in
+    bacula-common.postinst.  Closes: #569288, #569298, #569305, #569326.
+
+ -- John Goerzen <[e-mail]>  Thu, 11 Feb 2010 08:05:47 -0600
+
+bacula (5.0.0-3) unstable; urgency=low
+
+  * Added MySQL indices to match PostgreSQL ones.  Closes: #563899.
+  * Copy slight spelling tweak to debian/copyright.
+  * Remove bad patch that caused double-restart of init scripts.
+    Closes: #569126.
+  * Fixed errant DROP INDEX command in sqlite upgrade process.
+  * Added --disable-conio to ./configure args to force use of readline.
+    --with-readline=yes was already supplied.  This will enable
+    new tab completion code.  Closes: #569154, #513393.
+  * [lintian] Add ${misc:Depends} to all package Depends lines.
+  * [lintian] Bump debhelper compat level to 6.
+  * [lintian] Update build-dep on debhelper due to use of dh_lintian.
+  * [lintian] No longer create /var/run in .dirs files.  init scripts are
+    already making sure it's there.
+  * [lintian] Remove now-useless bacula-director-common.preinst
+
+ -- John Goerzen <[e-mail]>  Wed, 10 Feb 2010 14:05:08 -0600
+
+bacula (5.0.0-2) unstable; urgency=low
+
+  * Now upload 5.0.x to unstable.
+  * Now install mtx-changer.conf in bacula-sd.  Closes: #531471.
+
+ -- John Goerzen <[e-mail]>  Tue, 09 Feb 2010 12:05:20 -0600
+
+bacula (5.0.0-1) experimental; urgency=low
+
+  * New upstream version.
+  * Removed build-dep option libreadline5-dev, leaving only libreadline-dev
+    option.  Closes: #553735.
+  * Update bacula-console-qt section to utils to match override file.
+  * Update standards-version to 3.8.3.
+
+ -- John Goerzen <[e-mail]>  Mon, 08 Feb 2010 15:44:00 -0600
+
+bacula (3.0.3-3) unstable; urgency=medium
+
+  * Fixed situation where dbconfig-common bits weren't being called.  This
+    prevented proper upgrades from lenny.  Closes: #516900, #542774.
+  * Convert Sqlite3 to use dbconfig-common like PostgreSQL and MySQL directors
+    have been for some time now.
+  * This change means it now correctly upgrades from Sqlite2.
+    Closes: #552413.
+  * This change means that all Bacula debconf templates are finally removed.
+    As a result, no need for translations remains.  Closing open translation
+    bugs since there is no longer anything to translate in this package.
+    Closes: #568469.
+  * Clean up handling of database upgrade scripts in debian/rules to make it
+    easier to handle new Bacula versions when they arrive.
+  * Make sure to stop the director before upgrading its database.
+  * Add lsb init.d status support.  Patch from Peter Eisentraut.
+    Closes: #536573.
+
+ -- John Goerzen <[e-mail]>  Mon, 08 Feb 2010 14:37:04 -0600
+
+bacula (3.0.3-2) unstable; urgency=medium
+
+  * Update build-dep from libmysqlclient15-dev to libmysqlclient-dev.
+    Rebuild on a newer i386 sid machine; 3.0.3-1 will not migrate to testing
+    due to dep on old libmysqlclient15 on i386.
+  * Remove bacula-doc ln in debian/rules, correcting dpkg's idea that bacula
+    has been completely removed on upgrade.
+    Closes: #545473, #554197, #545313.
+  * Add bpipe to built package.  Patch from Alex Bramley.  Closes: #549081.
+  * Added comments about make_catalog_backup to README.Debian.  Closes: #452687.
+
+ -- John Goerzen <[e-mail]>  Wed, 03 Feb 2010 21:37:56 -0600
+
+bacula (3.0.3-1) unstable; urgency=medium
+
+  * New upstream release.  Closes: #566646.
+  * Update all PostgreSQL dependencies to 8.4 only.
+    Closes: #559581.
+  * Ack NMU.  Closes: #549982, #565877, #543179, #544594, #544610.
+    Closes: #545729, #555450, #545408, #567660.
+  * Improve manpages for: bcopy, bextract, bls, btraceback, bacula-fd,
+    bacula-sd, bacula-dir, bconsole, dbcheck, btape, bscan.
+    Patches by Lucas B. Cohen
+    Closes: #499619.
+  * Import upstream patch to add bsmtp manpage and update
+    manpages.  Closes: #519573.
+  * Add lintian overrides for rpath warning for /usr/lib/bacula.
+  * Add explicit dep from bacula to bacula-common.  This dep is enforced
+    by other deps already, but was causing a lintian warning.
+
+ -- John Goerzen <[e-mail]>  Mon, 01 Feb 2010 11:33:48 -0600
+
+bacula (3.0.2-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+  * German (Helge Kreutzmann).  Closes: #549982, #565877
+  * Russian (Yuri Kozlov).  Closes: #543179
+  * Italian (Luca Monducci).  Closes: #544594
+  * French (Christian Perrier).  Closes: #544610
+  * Swedish (Martin Bagge).  Closes: #545729
+  * Spanish (Francisco Javier Cuadrado).  Closes: #555450
+  * Japanese (Hideki Yamane (Debian-JP)).  Closes: #545408
+  * Czech (Miroslav Kure).  Closes: #567660
+
+ -- Christian Perrier <[e-mail]>  Sun, 24 Jan 2010 08:01:18 +0100
+
+bacula (3.0.2-3ubuntu6) lucid; urgency=low
+
+  * Fix FTBFS. 
+
+ -- Chuck Short <[e-mail]>  Wed, 10 Mar 2010 16:36:15 -0500
+
+bacula (3.0.2-3ubuntu5) lucid; urgency=low
+
+  [ Chuck Short ]
+  * debian/rules: Add place holder so auto-upgrader doesnt fail. (LP: #499389) 
+
+ -- Chuck Short <[e-mail]>  Wed, 10 Mar 2010 16:36:12 -0500
+
+bacula (3.0.2-3ubuntu4) lucid; urgency=low
+
+  * debian/bacula-sd.install: Install mtx-changer.conf script. (LP: #494380) 
+
+ -- Chuck Short <[e-mail]>  Mon, 08 Mar 2010 14:38:52 -0500
+
+bacula (3.0.2-3ubuntu3) lucid; urgency=low
+
+  * debian/rules: add empty LDFLAGS (LP: #508382)
+
+ -- Ante Karamatic <[e-mail]>  Fri, 26 Feb 2010 15:28:56 +0000
+
+bacula (3.0.2-3ubuntu2) lucid; urgency=low
+
+  * No op rebuild for bacula-console-qt. (LP: #508394) 
+
+ -- Chuck Short <[e-mail]>  Mon, 25 Jan 2010 09:19:56 -0500
+
+bacula (3.0.2-3ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:
+    + debian/rules:
+      - added bat_icon.png and bat.desktop for bacula-console-qt (LP: #314746)
+      - added bacula-tray-monitor.xpm icon, fix Exec path in .desktop
+    + Store sd|fd|director passwords in debconf (LP: #222558)
+      - added debian/bacula-common.templates
+      - modified debian/bacula-common.postinst:
+        + generate random passwords and store them in debconf
+      - modified debian/bacula-[sd|fd|director-mysql|director-pgsql].postinst
+        + read and set passwords from debconf
+    + Daemons listen on all interfaces (LP: #286643)
+    + Start daemons on installation
+    + Build with generic XXX_*_XXX username, password and database name
+      and replace it with dbconfig's settings in postinstall scripts
+    + Drop mt-st to suggests. So that bacula goes back to main. (LP: #286528)
+    + debian/rules: Disable fortify source since it was causing
+      bacula-director to segfault.
+    + debian/control:
+      - Added libdbi-perl and libdb-mysql-perl to depends for
+        bacula-director-mysql due to new postinst configuration.
+      - Cleaned up bacula-director-pgsql dependenices and recommends.
+      - Made mysql the default director to install bacula-director-{mysql|pgsql}
+        added database handling to postinstall scripts and templates, modifiied
+        postinstall script's sed expressions.
+      - Removed libwgtk-2.6-dev as a build dependency; as a result
+        bacula-console-wx isn't built anymore.
+      - Install gawk if not installed. (LP: #207527)
+    + debian/make_catalog_backup_awk.[mysql|pgsql|sqlite3|sqlite]:
+      - New scripts for catalog backup. (CVE-2007-5626)
+    + debian/bacula-console-wx:
+      - Dropped since we are not building them anymore.
+    + debian/bacula-director-common.bacula-director.init,
+      debian/bacula-fd.init, debian/bacula-sd.init:
+      - Made more LSB specific. 
+    + Add missing bacula-director-[pgsql|mysql].templates.
+    + Suggest bacula-traymonitor rather than Recommends so we dont pull in the libgtk libraries
+      on the server seed.
+    + debian/control: Change build dependencies to MySQL 5.1.
+    + bacula.desktop: Run /usr/bin/bat not /usr/sbin/bat (LP: #38778)
+
+ -- Chuck Short <[e-mail]>  Fri, 06 Nov 2009 00:30:35 +0000
+
+bacula (3.0.2-3) unstable; urgency=low
+
+  * bacula-director-common doesn't require bacula-fd.  Patch from Sven
+    Hartge.  Closes: #542829.
+  * Use sed to tweak AUTOINCREMENT columns on sqlite2->sqlite3 upgrades.
+    Closes: #542810.
+  * Correct dep on "sqlite2" to "sqlite".  Closes: #543330.
+  * Chown converted sqlite2->sqlite3 db to bacula:bacula.  Closes: #543345.
+
+ -- John Goerzen <[e-mail]>  Mon, 24 Aug 2009 16:22:41 -0500
+
+bacula (3.0.2-2) unstable; urgency=low
+
+  * Fix syntax error in baclua-director-sqlite3 postinst.
+    Closes: #542758.
+
+ -- John Goerzen <[e-mail]>  Fri, 21 Aug 2009 08:10:17 -0500
+
+bacula (3.0.2-1) unstable; urgency=low
+
+  * New Upstream Version.  Supports IPv6.  Closes: #523852.
+  * Install bat from the correct place.  Closes: #532646.
+  * Add conflicts between bacula-common-* packages.  Closes: #529645.
+
+ -- John Goerzen <[e-mail]>  Thu, 20 Aug 2009 14:26:44 -0500
+
+bacula (3.0.1-2) experimental; urgency=low
+
+  * Apply patches from Sami Haahtinen: correct behavior on systems
+    where bash isn't the default, and move btape into SQL-specific
+    packages because it now links with database code.
+  * Fixing up links in bacula metapackage
+
+ -- John Goerzen <[e-mail]>  Mon, 18 May 2009 08:46:24 -0500
+
+bacula (3.0.1-1) experimental; urgency=low
+
+  * New Upstream Version
+
+ -- John Goerzen <[e-mail]>  Wed, 06 May 2009 08:49:31 -0500
+
+bacula (3.0.0-1) experimental; urgency=low
+
+  * New upstream version.  Now license-compatible with OpenSSL.
+    Closes: #523479.
+  * Upstream has deprecated Sqlite v2.  No longer build Sqlite v2.
+  * Upstream has deprecated wx console.  No longer build wx console.
+  * Document reload option in bacula-director init option.  Closes: #519563.
+  * This version has mt-st smarts.  Closes: #495464.
+  * Fixed init script stop order.  Closes: #502341.
+  * Make /usr/share/doc/bacula point to bacula-common.
+  * Update NEWS and README.Debian.  Closes: #492664.
+  * Correct NEWS format to shut up lintian warnings.
+  * Move bsmtp to bacula-common.  Closes: #476227.
+  * Update postgresql-client deps.  Closes: #492670.
+  * Remove ancient (pre-lenny) database upgrade scripts from .debs.
+  * Added Spanish translation from Francisco Javier Cuadrado.  Closes: #502950.
+  
+ -- John Goerzen <[e-mail]>  Thu, 30 Apr 2009 16:52:53 -0500
+
+bacula (2.4.4-1ubuntu9) karmic; urgency=low
+
+  * debian/bacula-director-common.bacula-director.init: doesn't require
+    bacula-fd.
+
+ -- Chuck Short <[e-mail]>  Mon, 05 Oct 2009 10:26:36 -0400
+
+bacula (2.4.4-1ubuntu8) karmic; urgency=low
+
+  * bacula.desktop: Run /usr/bin/bat not /usr/sbin/bat (LP: #38778) 
+
+ -- Chuck Short <[e-mail]>  Wed, 09 Sep 2009 10:02:24 -0400
+
+bacula (2.4.4-1ubuntu7) karmic; urgency=low
+
+  * debian/control: Change build dependencies to MySQL 5.1. 
+
+ -- Mathias Gug <[e-mail]>  Mon, 17 Aug 2009 17:20:06 -0400
+
+bacula (2.4.4-1ubuntu6) karmic; urgency=low
+
+  * debian/control: Change build and binary dependencies to PostgreSQL 8.4.
+    (LP: #403381)
+
+ -- Martin Pitt <[e-mail]>  Thu, 23 Jul 2009 11:53:12 +0200
+
+add-console-use-vt
+bacula (2.4.4-1ubuntu5) jaunty; urgency=low
+
+  * debian/rules:
+    - don't start director on bacula-director-common install (LP: #334781)
+
+ -- Ante Karamatic <[e-mail]>  Thu, 12 Mar 2009 09:10:07 +0000
+
+bacula (2.4.4-1ubuntu4) jaunty; urgency=low
+
+  * Rebuild against python 2.6, adding a build-conflicts with python2.5.
+
+ -- Steve Langasek <[e-mail]>  Thu, 05 Mar 2009 22:06:19 +0000
+
+bacula (2.4.4-1ubuntu3) jaunty; urgency=low
+
+  * Suggest bacula-traymonitor rather than Recommends so we
+    dont pull in the libgtk libraries on the server seed. 
+
+ -- Chuck Short <[e-mail]>  Thu, 29 Jan 2009 14:53:54 -0500
+
+bacula (2.4.4-1ubuntu2) jaunty; urgency=low
+
+  * Add missing bacula-director-[pgsql|mysql].templates
+
+ -- Ante Karamatic <[e-mail]>  Tue, 20 Jan 2009 07:45:53 +0000
+
+bacula (2.4.4-1ubuntu1) jaunty; urgency=low
+
+  * Upload fixes LP #269251, LP: #308903 and LP: #293515
+  * debian/rules:
+    - added bat_icon.png and bat.desktop for bacula-console-qt (LP: #314746)
+    - added bacula-tray-monitor.xpm icon, fix Exec path in .desktop
+  * debian/bacula-traymonitor.install
+    - remove bacula-tray-monitor.xpm, add bacula-tray-monitor.desktop
+  * Merge from debian unstable, remaining changes:
+    * Store sd|fd|director passwords in debconf (LP: #222558)
+      - added debian/bacula-common.templates
+      - modified debian/bacula-common.postinst:
+        + generate random passwords and store them in debconf
+      - modified debian/bacula-[sd|fd|director-mysql|director-pgsql].postinst
+        + read and set passwords from debconf
+    * Daemons listen on all interfaces (LP: #286643)
+    * Start daemons on installation
+    * Build with generic XXX_*_XXX username, password and database name
+      and replace it with dbconfig's settings in postinstall scripts
+    * Drop mt-st to suggests. So that bacula goes back to main. (LP: #286528)
+    * debian/rules: Disable fortify source since it was causing
+      bacula-director to segfault.
+    * debian/control:
+      - Added libdbi-perl and libdb-mysql-perl to depends for
+        bacula-director-mysql
+        due to new postinst configuration.
+      - Cleaned up bacula-director-pgsql dependenices and recommends.
+      - Made mysql the default director to install bacula-director-{mysql|pgsql}
+        added database handling to postinstall scripts and templates, modifiied
+        postinstall script's sed expressions.
+      - Removed libwgtk-2.6-dev as a build dependency; as a result
+        bacula-console-wx isn't built anymore.
+      - Install gawk if not installed. (LP: #207527)
+    * debian/make_catalog_backup_awk.[mysql|pgsql|sqlite3|sqlite]:
+      - New scripts for catalog backup. (CVE-2007-5626)
+    * debian/bacula-console-wx:
+      - Dropped since we are not building them anymore.
+    * debian/bacula-director-common.bacula-director.init,
+      debian/bacula-fd.init, debian/bacula-sd.init
+      - Made more LSB specific.
+
+ -- Ante Karamatic <[e-mail]>  Sat, 10 Jan 2009 04:57:41 +0000
+
+bacula (2.4.4-1) unstable; urgency=low
+
+  * New Upstream Version - a bugfix release.  Closes: #508816.
+  * Build-conflicts on Python 2.4.  Closes: #496512.
+
+ -- John Goerzen <[e-mail]>  Fri, 09 Jan 2009 14:07:27 -0600
+
+bacula (2.4.3-1ubuntu2) jaunty; urgency=low
+
+  * debian/bacula-common.postrm:
+    Fix the deletion of the bacula user and remove the
+    /var/log/bacula and /var/lib/bacula 
+
+ -- Chuck Short <[e-mail]>  Mon, 08 Dec 2008 20:12:58 +0000
+
+bacula (2.4.3-1ubuntu1) jaunty; urgency=low
+
+  * Store sd|fd|director passwords in debconf (LP: #222558)
+    - added debian/bacula-common.templates
+    - modified debian/bacula-common.postinst:
+      + generate random passwords and store them in debconf
+    - modified debian/bacula-[sd|fd|director-mysql|director-pgsql].postinst
+      + read and set passwords from debconf
+  * Daemons listen on all interfaces (LP: #286643)
+  * Start daemons on installation
+  * Build with generic XXX_*_XXX username, password and database name
+    and replace it with dbconfig's settings in postinstall scripts
+  * Merge from debian unstable, remaining changes:
+    - Drop mt-st to suggests. So that bacula goes back to main. (LP: #286528)
+    - debian/rules: Disable fortify source since it was causing
+      bacula-director to segfault.
+    - debian/control:
+      + Added libdbi-perl and libdb-mysql-perl to depends for
+        bacula-director-mysql
+        due to new postinst configuration.
+      + Cleaned up bacula-director-pgsql dependenices and recommends.
+      + Made mysql the default director to install bacula-director-{mysql|pgsql}
+        added database handling to postinstall scripts and templates, modifiied
+        postinstall script's sed expressions.
+      + Removed libwgtk-2.6-dev as a build dependency; as a result
+        bacula-console-wx isn't built anymore.
+      + Install gawk if not installed. (LP: #207527)
+    - debian/make_catalog_backup_awk.[mysql|pgsql|sqlite3|sqlite]:
+      + New scripts for catalog backup. (CVE-2007-5626)
+    - debian/bacula-console-wx:
+      + Dropped since we are not building them anymore.
+    - debian/bacula-director-common.bacula-director.init,
+      debian/bacula-fd.init, debian/bacula-sd.init
+      + Made more LSB specific.
+
+ -- Ante Karamatic <[e-mail]>  Wed, 26 Nov 2008 13:53:30 +0100
+
+bacula (2.4.3-1) unstable; urgency=low
+
+  * New Upstream Version.  Closes: #503457.
+  * Apply upstream 2.4.3-orphaned-jobs.patch.  Closes: #504688.
+
+ -- John Goerzen <[e-mail]>  Thu, 06 Nov 2008 10:42:21 -0600
+
+bacula (2.4.2-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Built against Python 2.5.  Closes: #496512.
+  * Fix removal of original configuration file during upgrade of
+    bacula-director-pgsql.  Closes: #496174.
+
+ -- Ben Hutchings <[e-mail]>  Sun, 05 Oct 2008 22:00:10 +0100
+
+bacula (2.4.2-3) unstable; urgency=low
+
+  * Apply upstream 2.4.2-verifydisk.patch
+  * Apply upstream 2.4.2-verify.patch
+  * Apply upstream 2.4.2-storename.patch
+  * Apply upstream 2.4.2-null-vol.patch
+  * Apply upstream 2.4.2-mig-message.patch
+  * Apply upstream 2.4.2-inchanger.patch
+  * Apply upstream 2.4.2-estimate-cmd.patch
+  * Apply upstream 2.4.2-bat.patch
+
+ -- John Goerzen <[e-mail]>  Fri, 03 Oct 2008 10:17:01 -0500
+
+bacula (2.4.2-2) unstable; urgency=low
+
+  * Updated Swedish strings for debconf.  Closes: #491758.
+  * Updated Japanese debconf translation from Hideki Yamane.
+    Closes: #489942.
+  * Added bacula-tray-monitor.1 manpage.  Closes: #461942.
+
+ -- John Goerzen <[e-mail]>  Sat, 30 Aug 2008 08:57:07 -0500
+
+bacula (2.4.2-1) unstable; urgency=high
+
+  * Fix sed pattern in debian/rules to correctly remove
+    'USE ${db_name};' from the MySQL command tables.  This prevented
+    bacula-director-mysql from being installed properly and was thus RC.
+    Closes: #441995, #489578.
+  * While investigating the above problem, also discovered 'USE bacula;'
+    statements in some upgrade tables.  This would cause the upgrade of
+    bacula-director-mysql to fail for anyone that had their MySQL
+    database named something other than "bacula".  Added pattern to fix this.
+  * New upstream release is a bugfix release, and fixes these issues:
+    + 2.4.1 included an unintentional debug statement whose purpose
+      was to crash the storage daemon.  This was triggered during a restore
+      at the end of a tape.  Fixed in 2.4.2 (upstream bug 1125).  When the
+      SD is crashed, no backups or restores can be performed until it is
+      restarted.
+    + During a multi-tape restore, Bacula could incorrectly attempt
+      to reread the same tape.  (Upstream bug 1126)
+    + bcopy no longer reads too many records (upstream bug 1107)
+    + Now sets a large timeout on MySQL databases to prevent trouble
+      with the connection timining out before data gets inserted.  
+      Upstream bug 1034.
+    + There are also some other minor bugfixes and win32 changes upstream
+      in this release, which of course don't impact Debian.
+
+ -- John Goerzen <[e-mail]>  Mon, 04 Aug 2008 09:22:36 -0500
+
+bacula (2.4.1-1) unstable; urgency=high
+
+  * New Upstream Version.
+    + Fixes a bug where a tape may be incorrectly reused, destroying
+      data.  Closes: #490996.
+
+ -- John Goerzen <[e-mail]>  Wed, 16 Jul 2008 13:26:06 -0500
+
+bacula (2.4.0-1) unstable; urgency=low
+
+  [ John Goerzen ]
+  * Removed debian/Makefile and debian/po/Makefile
+  * Apply upstream 2.4.1-restore-wrong-mediatype.patch
+  * bacula-fd: fix LSB init headers to not require bacula-sd.  Closes:
+    #486256.
+
+  [ Mark Hymers ]
+  * Bump Standards-Version to 3.8.0.  No changes needed.
+  * Imported bacula-2.4.0.  Closes: #487767.
+
+  [ John Goerzen ]
+  * Corrected GIT URL
+  * Clarify the presence of BAT
+
+ -- John Goerzen <[e-mail]>  Mon, 30 Jun 2008 09:15:11 -0500
+
+bacula (2.2.8-8) unstable; urgency=high
+
+  * Apply upstream 2.2.8-jobmedia-fix.patch, high urgency.
+  * Hard code an archive directory in call to configure. This prevents
+    the default bacula sd file from having a syntax error.
+    Closes: #472126
+
+ -- John Goerzen <[e-mail]>  Fri, 28 Mar 2008 10:01:41 -0500
+
+bacula (2.2.8-7) unstable; urgency=low
+
+  * Updated for compatibility with PostgreSQL 8.3.  Closes: #468880
+  * Run debconf-updatepo
+  * Update Brazilian Portuguese translation.  Patch from Eder L. Marques.
+    Closes: #466703.
+
+ -- John Goerzen <[e-mail]>  Tue, 25 Mar 2008 12:48:53 -0500
+
+bacula (2.2.8-6) unstable; urgency=low
+
+  * Change section to admin to match override file
+  * Add Homepage: line to control per devref 6.2.4
+  * More fixes to make Bacula binNMU safe.  Patch from Lior Kaplan.
+    Closes: #472249.
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #462210
+  * [Debconf translation updates]
+    + German. Closes: #462981
+    + Galician. Closes: #462991
+    + Portuguese. Closes: #463314
+    + Finnish. Closes: #463954
+    + Czech. Closes: #464427
+    + French. Closes: #464838
+    + Italian. Closes: #465068
+    + Russian. Closes: #465079
+    + Vietnamese. Closes: #465536
+
+ -- John Goerzen <[e-mail]>  Mon, 24 Mar 2008 10:42:44 -0500
+
+bacula (2.2.8-5) unstable; urgency=low
+
+  * Added Debian VCS fields to debian/control.
+  * Applied 2.2.8-bacula-conf.patch from upstream
+  * Applied upstream 2.2.8-jobmedia.patch
+  * Applied upstream 2.2.8-pool-source.patch.  Closes: #464687.
+  * Revert the patch to src/filed/backup.c introduced by Bastian in
+    2.2.6-0.1 in preparation for applying upstream's new patch.
+  * Apply upstream 2.2.8-strip-path.patch.  Closes: #452195.
+
+ -- John Goerzen <[e-mail]>  Wed, 27 Feb 2008 05:44:58 -0600
+
+bacula (2.2.8-4) unstable; urgency=low
+
+  * Added Replaces: on bacula-common, so it overwrites btraceback
+    in bacula-director-common for upgraders.  Closes: #463317.
+  * Applied updated Portugese debconf translation from
+    Miguel Figueiredo.  Closes: #463314.
+
+ -- John Goerzen <[e-mail]>  Thu, 31 Jan 2008 08:44:26 -0600
+
+bacula (2.2.8-3) unstable; urgency=low
+
+  * Simplified cleanup.  Closes: #453112.
+  * Corrected debian/rules pattern for removing USE statements in
+    MySQL scripts.  Closes: #441995.
+  * Clarified the effect of not using SSL/TLS in README.Debian.
+    Closes: #444732.
+
+ -- John Goerzen <[e-mail]>  Wed, 30 Jan 2008 06:40:44 -0600
+
+bacula (2.2.8-2) unstable; urgency=low
+
+  * Fix binary-arch target so that bacula-common contains all
+    of the necessary files.  Thanks to Mark Hymers for the patch.
+
+ -- John Goerzen <[e-mail]>  Tue, 29 Jan 2008 21:14:55 -0600
+
+bacula (2.2.8-1) unstable; urgency=low
+
+  * New upstream release.  (2.2.8 prepared by John Goerzen)
+  * Added build-dep on postgresql-server-dev-8.2.  Closes: #462502.
+  * Moved btraceback and btraceback.gdb from bacula-director-common
+    to bacula-common.  Closes: #452183.  This change meant that
+    bacula-common changes from arch all to arch any.
+  * Fixed debian/watch file.  Thanks to Raphael Geissert for the
+    patch.  Closes: #449666.
+  * New German debconf translation from Helge Kreutzmann.
+    Closes: #462981.
+  * New Galician debconf translation from Jacobo Tarrio.
+    Closes: #462991.
+  * New Japenese debconf translation from Hideki Yamane.
+    Closes: #463092.
+  * Init script updates to help improve /var/run on tmpfs support.
+    Applied patch ac7bb3384082 from James Westby.  Closes: #452683.
+  * Init script updates to have dependency information.
+    Applied patch from Petter Reinholdtsen.  CLoses: #460252.
+  * Make bacula-common Pre-Depends instead of Depends on adduser.
+    Closes: #452684.
+  * Added postgresql-8.2 to Recommends: for
+    bacula-director-pgsql.  Closes: #459859.
+  * Change recommends on kde|desktop-environment to suggests
+    on kde|gnome-desktop-environment.  Closes: #459891.
+  * Merged the following changes from Mark Hymer's Mercurial tree:
+    + Upstream 2.2.6 and 2.2.7.  Closes: #458780.
+    + Bump Build-Dep for libgtk2.0-dev to be >= 2.10 as the traymonitor
+      code needs it.  Closes: #451499.
+    + Update libmysqlclient-dev Build-Dep.  Closes: #439969.
+    + Use correct path to mtx-changer.  Closes: #435627.
+    + Install tray-monitor.conf file.  Closes: #413754.
+    + Only alter permissions and ownership on files in /etc/bacula when we
+      install them; don't clobber local changes.
+    + Simplify scripts by removing support for upgrading from versions which
+      are pre-sarge.
+
+ -- John Goerzen <[e-mail]>  Tue, 29 Jan 2008 04:12:36 -0600
+
+bacula (2.2.6-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+    - Release stdout/stderr on daemonization. (closes: #441621)
+  * Fix symlinks case for strippath in File Set. (closes: #452200)
+  * Fix hostname replace in default config.
+
+ -- Bastian Blank <[e-mail]>  Tue, 27 Nov 2007 13:59:29 +0000
+
+bacula (2.2.5-1) unstable; urgency=medium
+
+  * New upstream release.
+    urgency=medium due to a number of major bugfixes
+  * Updated menu section.  Closes: #444913.
+  * Fix for binNMU safety.  Thanks to Lior Kaplan for the patch.
+    Closes: #444694.
+  * Added text to traymonitor description.  Closes: #442117.
+
+ -- John Goerzen <[e-mail]>  Thu, 18 Oct 2007 11:59:50 -0500
+
+bacula (2.2.4-1) unstable; urgency=high
+
+  * New upstream version.  Closes: #441849, #441855, #441878, #441990.
+  * Documented lack of SSL/TLS in NEWS.Debian and README.Debian.
+    Closes: #440034.
+  * Enhance traymonitor description in control.  Closes: #442117.
+
+ -- John Goerzen <[e-mail]>  Wed, 19 Sep 2007 09:17:02 -0500
+
+bacula (2.2.0-1) unstable; urgency=low
+
+  * Update debian/copyright from LICENSE.
+  * Disable OpenSSL support due to licensing concerns
+    See thread at
+    http://lists.debian.org/debian-legal/2007/07/msg00144.html
+  * Applied updated Vietnamese translation from Clytie Siddall.
+    Closes: #427042.
+  * Following changes prepared by Mark Hymers <[e-mail]>:
+    * New upstream version.  Closes: #438806.
+      * make_catalog_backup script now takes a host parameter.  
+        Closes: #419885.
+    * Deal with moving wx-console.conf to bwx-console.conf
+    * Add new bacula-console-qt package.
+    * Update Standards-Version to 3.7.2.  No changes required.
+    * Remove postgresql-dev Build-Dep.  Closes: #429963.
+    * Make binNMU safe.  Based on patch from Lior Kaplan.  Closes: #430106.
+    * Re-order postgresql-client Depends.  Closes: #419311.
+    * Remove libwxgtk2.4-dev Build-Depends.  Closes: #425159.
+
+ -- John Goerzen <[e-mail]>  Fri, 24 Aug 2007 02:13:34 -0500
+
+bacula (2.0.3-4) unstable; urgency=low
+
+  * Applied patches from upstream:
+    2.0.3-ampm
+    2.0.3-maxbyteslist
+    2.0.3-maxwaittime
+    2.0.3-schedule-next-hour
+  * Rebuild fixes binNMU problems.  Closes: #419843.
+  * Added README.Debian to bacula-common.  (It was already installed
+    in bacula).  This should make it easier to find.  Closes: #418498.
+  * Documented upgrade procedure in README.Debian.
+  * Don't try to rebuild configs when there is no need to and
+    when the source is unavailable.  Closes: #420197, #413145.
+  * Fix typo in bacula-sd manpage.  Closes: #417571.
+
+ -- John Goerzen <[e-mail]>  Mon, 23 Apr 2007 07:09:31 -0500
+
+bacula (2.0.3-3) unstable; urgency=low
+
+  * Make postrm scripts more versatile.  Closes: #416649.
+
+ -- John Goerzen <[e-mail]>  Fri, 13 Apr 2007 03:13:05 -0500
+
+bacula (2.0.3-2) unstable; urgency=low
+
+  * Finally upload to unstable.
+  * Added note to README.Debian about /etc/bacula/scripts
+    and multiple versions of PostgreSQL.  Closes: #383357.
+  * Added dep from bacula-director-common on mailx, and drop explicit
+    deps on mail-transport-agent.  Closes: #386920.
+  * Version 2.0.x now properly initializes supplemental groups.
+    Closes: #391492.  (This should have been closed in 2.0.2-1 upload)
+  * Properly remove password in sqlite/sqlite3 postinsts.
+    Closes: #404866.
+  * Consoles connect to localhost by default.  Closes: #404868, #407081.
+  * Don't munge make_catalog_backup in bacula-dir.conf.  Closes: #407082.
+  * Remove spurious dep from bacula-director-pgsql on sqlite3.
+    Closes: #396921.
+
+ -- John Goerzen <[e-mail]>  Tue, 13 Mar 2007 10:40:14 -0500
+
+bacula (2.0.3-1) experimental; urgency=low
+
+  * New upstream release.
+  * Local manpage bug should have been closed with 2.0.2-1.
+    Closes: #367643.
+
+ -- John Goerzen <[e-mail]>  Wed,  7 Mar 2007 03:40:37 -0600
+
+bacula (2.0.2-1) experimental; urgency=low
+
+  * New upstream release.  Closes: #408381.
+  * Upstream has dropped Gnome console.  Closes: #391820.
+  * Remove debian/manpages since manpages are now shipped upstream.
+    Modify debian/*.manpages to reference these files.
+  * debian/ support for automatically upgrading database to v10.
+  * Updated German translation.  Closes: #406547.
+  * Removed references to obsolete docs.
+
+ -- John Goerzen <[e-mail]>  Fri, 23 Feb 2007 08:21:36 -0600
+
+bacula (1.38.11-8) unstable; urgency=high
+
+  * Rebuild to fix earlier binNMU.   Closes: #411652.
+  * debian/control switched to suggested source:Version approach from
+    debian-devel.
+
+ -- John Goerzen <[e-mail]>  Thu, 22 Feb 2007 12:58:55 -0600
+
+bacula (1.38.11-7) unstable; urgency=low
+
+  * ACK NMU.  Closes: #394605.
+  * New Japanese translation thanks to Hideky Yamane.  Closes: #392638.
+  * New Czech translation from Jakup Kasparec.  Closes: #392680.
+
+ -- John Goerzen <[e-mail]>  Fri, 27 Oct 2006 08:39:46 -0500
+
+bacula (1.38.11-6.1) unstable; urgency=low
+
+  * Remove explicit build dependency on python2.3.
+
+ -- Matthias Klose <[e-mail]>  Fri, 27 Oct 2006 05:47:35 +0200
+
+bacula (1.38.11-6) unstable; urgency=high
+
+  * Only call dbconfig-common if it exists in maintainer scripts.
+    Closes: #388220, #388222.
+
+ -- John Goerzen <[e-mail]>  Fri, 22 Sep 2006 10:06:22 -0500
+
+bacula (1.38.11-5) unstable; urgency=high
+
+  * Added missing shlibs:Depends for bacula-director-pgsql.  Closes: #384837.
+
+ -- John Goerzen <[e-mail]>  Sun, 27 Aug 2006 18:48:24 -0500
+
+bacula (1.38.11-4) unstable; urgency=high
+
+  * Rebuild against newer libmysql15-dev.  Closes: #384433.
+  * Build build-dep on libmysql15-dev.
+
+ -- John Goerzen <[e-mail]>  Fri, 25 Aug 2006 13:52:24 -0500
+
+bacula (1.38.11-3) unstable; urgency=high
+
+  * Update postrm to new dbconfig-common method.  Closes: #383142.
+
+ -- John Goerzen <[e-mail]>  Mon, 21 Aug 2006 09:19:49 -0500
+
+bacula (1.38.11-2) unstable; urgency=low
+
+  * Updated Brazilian Portugese translation from Felipe August van de Wiel.
+    Closes: #373992.
+  * Updated Dutch translation from Kurt De Bree.  Closes: #375128.
+  * New Portugese translation from Rui Branco.  Closes: #380675.
+
+ -- John Goerzen <[e-mail]>  Sat, 12 Aug 2006 09:40:36 -0500
+
+bacula (1.38.11-1) unstable; urgency=low
+
+  * New upstream release
+  * Update debian/copyright with new upstream LICENSE
+  * Add Suggests on bacula-doc
+
+ -- John Goerzen <[e-mail]>  Fri, 30 Jun 2006 08:02:36 -0500
+
+bacula (1.38.10-2) unstable; urgency=low
+
+  * Applied 1.38.10-scheduler.patch and 1.38.10-dvd-eof.patch from upstream.
+
+ -- John Goerzen <[e-mail]>  Mon, 26 Jun 2006 17:12:43 -0500
+
+bacula (1.38.10-1) unstable; urgency=low
+
+  * New upstream version.
+  * New French translation from Thomas Huriaux.  Closes: #370476.
+  * Update dep on dbconfig-common for new PostgreSQL date style config.
+  * Daemons listen only on localhost by default.  Closes: #367105.
+
+ -- John Goerzen <[e-mail]>  Mon, 12 Jun 2006 15:44:23 -0500
+
+bacula (1.38.9-10) unstable; urgency=low
+
+  * Update LICENSE with newer version from upstream.  Closes: #367970.
+  * Applied patch from Kern Sibbald, Bacula author, to fix odd
+    segfault in bacula-sd.  Closes: #367424.
+
+ -- John Goerzen <[e-mail]>  Wed, 24 May 2006 22:25:03 -0500
+
+bacula (1.38.9-9) unstable; urgency=low
+
+  * Remove LD_ASSUME_KERNEL from bacula-director-common init script.
+    Closes: #367537.
+
+ -- John Goerzen <[e-mail]>  Tue, 16 May 2006 21:29:27 -0500
+
+bacula (1.38.9-8) unstable; urgency=low
+
+  * Now use GNU sed instead of ssed for inplace editing -- GNU sed
+    now has this feature.  Closes: #367201.
+  * Include examples/ directory in bacula-common.
+  * Remove old bacula-doc files.
+  * Create additional PostgreSQL indices (like we alredy do for MySQL)
+  * Added dbconfig-common as a dep for bacula-director-mysql.
+    Closes: #367420.
+  * Added build-dep on libxt-dev.
+  * Listed postgresql-8.1 and postgresql-8.0 as recommends for
+    bacula-director-pgsql.
+
+ -- John Goerzen <[e-mail]>  Mon, 15 May 2006 16:48:57 -0500
+
+bacula (1.38.9-7) unstable; urgency=low
+
+  * Made bacula-sd-* also Replace the old bacula-sd package.  Closes: #367075.
+  * Update debian/copyright from LICENSE.
+  * Remove bsmtp and btraceback manpages from debian/manpages.
+
+ -- John Goerzen <[e-mail]>  Sat, 13 May 2006 11:09:03 -0500
+
+bacula (1.38.9-6) unstable; urgency=low
+
+  * Rewrote remaining templates to use better language.
+    Closes: #236992, #313149.
+  * Removed obsolete file debian/RATIONALE.
+  * Added build-dependency on bc, which is used by autoconf/randpass.
+  * Changed Recommends in bacula-sd to dep on python for the dvd-changer
+    script.
+  * Rewrite most of README.Debian.  Include information about
+    users/security.  Closes: #304076.
+  * Remove obsolete directory debian/_pending.
+
+ -- John Goerzen <[e-mail]>  Sat, 13 May 2006 10:02:24 -0500
+
+bacula (1.38.9-5) unstable; urgency=low
+
+  * bacula-sd-*: added conflict on bacula-sd < 1.38.9, since some
+    manpages have moved around since that version and conflicts
+    could exist on upgrade.  Closes: #367075.
+  * Removed accidentally-copied bacula-director-pgsql.preinst.
+    Closes: #367066, #367069, #367070.
+
+ -- John Goerzen <[e-mail]>  Sat, 13 May 2006 09:25:35 -0500
+
+bacula (1.38.9-4) unstable; urgency=low
+
+  * Sanitize multi-variant deps with virtual packages
+
+  * Move bwild and bregex into bacula-director-common instead of all
+    the bacula-director-* packages.  Change bacula-director-common
+    from arch all to arch any.
+
+  * Changed all URLs from html-manual to rel-manual, and forwarded
+    this patch upstream.  Closes: #363151.
+
+  * Fix bacula-director-sqlite postinst to properly handle the upgrade
+    to 1.38.
+
+  * Added missing scripts disk-changer and dvd-handler to bacula-sd.
+
+  * Removed cruft in debian/additions and debian/patches.
+
+  * Revert changes to:
+    + grant_postgresql_privileges.in (no longer necessary)
+    + gnome2-console/console.c (should respect upstream syntax choices)
+    + update_mysql_tables_6_to_7, 7_to_8 (irrelevant)
+    + update_sqlite_tables_7_to_8 (gratuitous)
+
+  * Thanks to new support in dbconfig-common 1.8.13, the encoding for
+    the PostgreSQL database can now be specified.  PostgreSQL encoding
+    should therefore be fixed.
+
+  * Removed obsolete per-arch build code from rules.
+
+ -- John Goerzen <[e-mail]>  Fri, 12 May 2006 08:50:19 -0500
+
+bacula (1.38.9-3) unstable; urgency=low
+
+  * Clean up Sqlite3 postinst
+
+  * Added some more upstream docs to bacula-common
+
+  * Switched MySQL to use dbconfig-common.  Removed largs amounts of
+    old code for MySQL support.  Closes: #338884, #357386.
+
+  * No longer force removal of director conffiles on removal (only
+    purge).
+
+  * Removed obsolete templates for MySQL & PostgreSQL.
+
+  * Removed obsolete install-flavors templates in debian/rules.
+
+  * Install Sqlite and Sqlite3 scripts properly.
+
+  * Removed obsolete translations (they were causing build errors now
+    that the obsolete templates are gone)
+
+ -- John Goerzen <[e-mail]>  Thu, 11 May 2006 06:45:44 -0500
+
+bacula (1.38.9-2) unstable; urgency=low
+
+  * Sanitize dependencies in control -- make sure everything that
+    needs to depends on bacula-common and use bacula-server and 
+    bacula-client.
+
+  * Reverse direction of /var/log/bacula/log symlink to have main
+    logfile written in /var/log/bacula.
+
+  * Install upstream's default logrotate (with Debian's path).
+    Previously, there was no logrotate installed by default.
+    Closes: #309675.
+
+  * Removed duplicate user-adding code from bacula-director-common.
+    bacula-common already does this.
+
+  * Removed spurious chown/chmod of /var/run/bacula from bacula-sd
+    and bacula-fd.  bacula-common already does this.
+
+  * Moved chmod/chown of /var/lib/bacula and /var/log/bacula
+    from bacula-director-common to bacula-common.  These areas may be
+    used by non-director packages as well.
+
+  * Slight simplification of debian/rules
+
+  * Switched to dbconfig-common for PostgreSQL.  Closes: #365096.
+  
+  * Removed large amounts of old code for PostgreSQL support.
+
+ -- John Goerzen <[e-mail]>  Wed, 10 May 2006 22:17:29 -0500
+
+bacula (1.38.9-1) unstable; urgency=low
+
+  * New maintainer: John Goerzen <[e-mail]>.
+    Closes: #366625.
+    Thanks to Jose Luis Tallon for initially packaging and maintaining
+    Bacula in Debian.
+
+  * Close bugs that have been fixed in my earlier NMUs.
+    Closes: #322753, #335809, #343762, #326175, #309601, #305220, #329271.
+    Closes: #326178, #312329, #303456, #339341, #339322, #281957, #331757.
+    Closes: #358762, #357619, #337250, #337376, #346430, #314492, #303862.
+    Closes: #339084.
+
+  * Examine all diffs to upstream and revert ones that are not
+    (any longer) necessary.
+
+  * Revert diff to db.m4 -- Bacula is now aware of pg_config natively.
+
+  * Removed commented-out patching/unpatching code in debian/rules
+
+  * Removed obsolete patch files debian/patches/*.patches,
+    debian/patches/*old.  These were only referenced by commented-out
+    code in debian/rules.
+
+  * Revert patch to dbd_find.c -- no apparent reason existed for
+    the change.
+
+  * Reverted hack to comment in update_mysql_tables_6_to_7
+
+  * Reverted hack to configure checking on syntax
+
+  * Renamed bacula-wxconsole to bacula-console-wx to maintain a
+    sane naming scheme.  Closes: #326177.
+
+  * Removed commented-out bacula-doc section from debian/control.
+
+  * Build-depends on mtx.
+
+  * Removed commented-out build-depends-indep for docs.
+
+  * Rewrote debian/rules build system -- now uses suggested vim-like 
+    build system.  It calls configure several times and builds the
+    package for each DB, rather than trying to hack the configure
+    system to short-circuit that.
+
+  * Use stock make_catalog_backup/delete_catalog_backup scripts,
+    and move these into the per-db bacula-director-* packages.
+
+  * Now build Sqlite3 packages (in addition to existing Sqlite v2
+    packages) and make them the default.
+
+  * Fix sqlite build-deps.  Previous versions build-dep'd on sqlite3
+    but built using sqlite2.
+
+  * No longer rename consoles in rules.
+
+  * Update standards-version to 3.7.0.
+  
+  * Clean target removes config.log
+
+  * Move bcopy and bscan manpages into proper bacula-sd-*sql* packages
+
+  * Added missing debconf dependencies to the bacula director packages
+
+  * Added missing adduser dependency to bacula-director-common
+
+  * Fixed menu files for correct location of console files
+
+ -- John Goerzen <[e-mail]>  Wed, 10 May 2006 11:16:05 -0500
+
+bacula (1.38.9-0.2) unstable; urgency=low
+
+  * No longer rm -rf /var/lib/bacula in bacula-director-common postinst.
+    Other Bacula packages may still be installed, and this breaks them.
+  * Include bwild and bregex in bacula-director-* packages.
+
+ -- John Goerzen <[e-mail]>  Tue,  9 May 2006 08:45:28 -0500
+
+bacula (1.38.9-0.1) unstable; urgency=low
+
+  * New upstream release: 1.38.9, which is mostly a bugfix release.
+
+ -- John Goerzen <[e-mail]>  Mon,  8 May 2006 10:50:45 -0500
+
+bacula (1.38.8-0.1) unstable; urgency=low
+
+  * Non-maintainer upload by John Goerzen.
+  * Add missing build-deps: libgnomeui-dev, libx11-dev.
+  * Commented out code that attempts to patch pg_hba.conf.  This sort of
+    thing should never be done without prompting the user.  It was broken
+    for sid as written, and also failed to take into account the
+    possibility of Unix domain sockets or having multiple versions of
+    PostgreSQL on a machine.  Closes: #309601.
+  * Build-Conflicts on python2.2-dev.  The configure script will use it
+    by default, instead of python2.3-dev, if it's available.  This could
+    lead to different Python versions being linked in on different archs.
+  * Numerous fixes to clean target to make sure all sorts of otherwise-missed
+    generated files get removed.
+  * Removed spurious chown of /var/lib/bacula in 
+    bacula-director-common.preinst.  Having it there could lead to 
+    failure to install that package since that directory may not already
+    exist.  postinst for that package was already doing the same chown
+    anyway.
+  * Removed erreneous chown attempt of /var/log/bacula/log in
+    bacula-director-common.postinst.  This file is not installed
+    by this package.  Closes: #303862.
+  * Fixed distribution of bscan and bcopy such that they appear in their
+    bacula-sd-* properly, and not in bacula-director or bacula-sd.
+  * debian/rules contains bashisms and will not build if bash is not
+    the default shell.  Explicitly set SHELL in debian/rules.
+
+  * The below changes were made available by Jose Luis Tallon on SourceForge.
+
+  * New upstream version (Closes: #339322)
+    - fixes insecure temporary file creation (Closes: #329271)
+    - fixes error in online help (Closes: #303456)
+    - fixes segfault w/ fd (Closes: #346430)
+
+  * debian/rules : fix typo w/in build process (Closes: #337250)
+    - enable TLS functionality
+    - added upstream's generic 'bacula' manpage
+
+  * debian/control, dependency information
+    - simplify dependencies; allow transition to cdebconf (Closes: #331757)
+    - wrapped Build-Depends line
+    - upgrade to building with wxWidgets2.6 (Closes: #326178)
+    - upgrade to libmysqlclient15 (Closes: #358762)
+    - bacula-doc is now another set of packages
+    - splitted bacula-sd in 'flavors'(avoid static linking)
+
+  * init process: auto-create /var/run/bacula on startup (Closes: #357619)
+
+  * bacula-director-mysql: 
+    - fix db-autoconfig -- typo in grant sentence(improper quoting) (Closes: #312329)
+    - upgrade to libmysqlclient15-dev (Closes: #343762)
+    - Automatically add indexes to tables (Closes: #335809)
+
+  * bacula-director-pgqsl: 
+    - purge debconf data on purge (Closes: #314492)
+    - rebuild -- update postgresql-client dependency (Closes: #339341)
+
+  * bacula-sd
+    - Solves problem w/ Linux2.6 and no tapes on startup (Closes: #337376)
+    - Better handling of auto-labels (Closes: #322753)
+
+  * GUI
+    - bacula-wxconsole: Link against GNOME2 libs only (Closes: #326178)
+    - bacula-console-gnome: provide desktop entry (Closes: #326175)
+    - bacula-console-gnome: fix help (Closes: #305220)
+    - created bacula-traymonitor package (Closes: #281957)
+
+  * Localization
+    - se_SV (tack så mycket, Daniel) (Closes: #339084)
+
+  * Christoph Haas added to "Uploaders"
+
+ -- John Goerzen <[e-mail]>  Thu, 27 Apr 2006 10:04:07 -0500
+
+bacula (1.36.3-2) unstable; urgency=low
+
+  * bacula-director-mysql: fix granting of privileges during postinst
+    -- typo in grant sentence('eval' missing) (Closes: #312329)
+
+  * bacula-director-pgsql: fix problems with unicode filenames
+    -- CREATE DATABASE $CATALOG WITH ENCODING = 'SQL_ASCII' (Closes: #313227)
+
+  * bacula-sd: Fix MTX support (Closes: #308803)
+
+  * Localization enhancements:
+    - JA (Closes: #310104)
+    - FR (Closes: #309664)
+    - CS (Closes: #312148)
+    - VI (Closes: #313148)
+
+  * Solved problem with bacula-sd's lib dependencies 
+    -- bcopy was being improperly compiled (Closes: #309919)
+
+  * PostgreSQL transition completed: build-depend on libpq-dev instead
+
+ -- Jose Luis Tallon <[e-mail]>  Wed,  9 Jun 2005 02:33:13 +0200
+
+bacula (1.36.3-1) unstable; urgency=low
+
+  * New upstream version; several bugfixes (Closes: #306176)
+
+  * bacula-director-mysql: link against libmysql12, in order
+    to better support MySQL-4.1 installations which have not 
+    been properly configured (Closes: #305669)
+
+  * bacula-director-mysql: Additional fixes for the solution of 
+    #303111 -- Add much more robustness to the autoconfig process
+
+  * Included patch from bugs.bacula.org to have proper behaviour on backup
+    attempts when FD is unreachable(Closes: #304531)
+
+  * Documentation: fix bscan and bls's manpage(rewritten).
+
+ -- Jose Luis Tallon <[e-mail]>  Wed, 11 May 2005 18:56:13 +0200
+
+bacula (1.36.2-2) unstable; urgency=low
+
+  * bacula-director-pgsql: postinst enhancements by Jamie Ffolliott
+
+  * bacula-fd: proper behaviour on restart (Closes: #293570)
+
+  * bacula-director-common: fix to template for make_catalog_backup
+    to force users to configure it properly (Closes: #299052)
+
+  * bacula-common: remove dup'd btraceback (Closes: #301219)
+
+  * Updated french translation (Closes: #303120)
+
+  * bacula-director-mysql:
+    - succeed also when password contains spaces (Closes: #303111)
+
+ -- Jose Luis Tallon <[e-mail]>  Sun, 10 Apr 2005 19:21:25 +0200
+
+bacula (1.36.2-1) unstable; urgency=low
+
+  * New upstream version. Some fixes and enhancements (Closes: #297477)
+
+  * bacula-director-pgsql: postinst fixed (Closes: #289838, #272191)
+    - connect to db, create tables, create user & grant privs
+    - use the configured root password
+    - support remote pgsql hosts
+    - patch the grant script to re-enable key indexes needed
+    - set create_tables to false after successful creation, and
+      reset variables configured by debconf if they result in an error
+      so they are re-entered on the next install attempt.
+    - fix the catalog upgrade process
+    - save .pgpass with user/pass, for secure use by bacula scripts,
+      package upgrades
+    - write bacula-dir.conf with correct bacula user/pass/db, and
+      correct the catalog backup command
+    - enable auth to the local bacula db in pg_hba.conf.  Fixes a
+      director startup error.
+  * bacula-director-pgsql: config fixed
+    - configure remote pgsql hosts
+    - add reconfigure
+    - add drop db option in reconfigure, to re-create the bacula db
+
+  * bacula-director-pgsql: postrm completed
+    - drop the db and user, & remove the .pgpass file
+
+  * Many thanks to Jamie ffolliott <[e-mail]>, the author of
+    all of the PostgreSQL-related fixes. Long overdue, now in :-)
+
+  * UpdateDB: fix typo in 'update_mysql_tables_7_to_8' (Closes: #288107)
+
+  * bacula-director-mysql: fix typo in sql_cmds (Closes: #295823)
+
+  * bacula-director-sqlite: fix db upgrade logic (Closes: #282416, #289209)
+    (lines 62 & 71 of the postinst script)
+
+  * bacula-fd: new version apparently solves crashes (Closes: #277273)
+
+  * bacula-common: move symlink to proper package (Closes: #285659)
+
+  * Patch by Nicolas Boichat to fix "cancel" in wx-console (Closes: #292517)
+
+  * Updated Dutch translation (Closes: #281559)
+
+ -- Jose Luis Tallon <[e-mail]>  Tue, 22 Mar 2005 13:31:34 +0100
+
+bacula (1.36.1-1) unstable; urgency=low
+
+  * New upstream version. Includes several minor improvements.
+
+  * bacula-director-pgsql: really compile in support for PostgreSQL, after
+    latest breakages (Closes: #274997, #282788)
+
+  * bacula-director-sqlite: revised upgrade logic. Should work now --
+    feedback requested (Closes: #282416)
+
+  * Fix once and for all, broken variable assignment(hopefully)
+    (Closes: 275284)
+
+  * UpdateDB: robustness added to upstream scripts; should be able to better
+    detect broken setups. Integrated upstream. Thanks, Kern!
+
+ -- Jose Luis Tallon <[e-mail]>  Fri, 3 Dec 2004 18:22:05 +0100
+
+bacula (1.36.0-1) unstable; urgency=low
+
+  * New upstream version (Closes: #278605)
+    - hopefully solves problems where bacula-fd segfaulted
+    - database format changed to v8. Add upgrading v6 -> v7 -> v8 
+      capabilities to postinst scripts. (Closes: #271892)
+    - updatedb scripts patched, to avoid problem with PostgreSQL update.
+
+  * bacula-director-common: added "reload" action (send SIGHUP)
+
+  * bacula-fd:
+    - to avoid problems with broken setups, postinst scripts now use
+      '/bin/bash' instead of '/bin/sh' (Closes: #277127)
+
+  * bacula-doc: added missing image (Closes: #279913)
+
+  * UpdateDB: robustness added to upstream scripts; should be able to better
+    detect broken setups.
+
+  * Really close bug due to typo in 'config' (Closes: #275284)
+
+  * Fix a typo in package description, by <[e-mail]> (Closes: #277220)
+
+ -- Jose Luis Tallon <[e-mail]>  Wed, 17 Nov 2004 20:41:05 +0100
+
+bacula (1.34.6-2) unstable; urgency=low
+
+  * PgSQL "flavor":
+    - another little build improvement (Closes: #274997)
+    - typo in 'config', reported by PMHahn (Closes: #275284)
+
+ -- Jose Luis Tallon <[e-mail]>  Sat, 9 Oct 2004 16:04:05 +0200
+
+bacula (1.34.6-2) unstable; urgency=high
+
+  * Urgency high because the PostgreSQL "flavor" is not properly built.
+    It is linked against the "internal" database, which is not functional.
+    - The flag to enable PostgreSQL is called "HAVE_POSTGRESQL" instead of
+      HAVE_PGSQL -- Reported by E Zanardi <[e-mail]>
+    - Newer libpq needs -lssl -lcrypto...
+
+  * bacula-director-mysql: fixed bogus update procedure 
+    - succeed when catalog is already up-to-date (Closes: #271998)
+    - work when admin user has a non-blank password.
+
+  * bacula-director-pgsql: fixed problem, where --regardless of specified
+    dbadmin-- root was used to connect to PgSQL (Closes: #272181)
+
+  * bacula-sd: daemon leaves FD 0,1,2 open; Close them.
+    Backported change to lib/daemon.c from 1.35.3 (Closes: #272083)
+
+  * bacula-director-common: 
+    - link /usr/lib/bacula/smtp to bsmtp to preserve older configurations 
+      (Closes: #272880)
+    - Integrated patch from Daniel Hermann, to ensure proper 'director'
+    termination in init.d script (Closes: #271579)
+
+  * Integrated some more of PMHahn build enhancements. Thanks!
+
+  * Properly building the static bscan "flavors" brings in 
+    many build dependencies..ggrrrr
+    ( libpq depends on libkrb5, libk5crypto, libcom_err, libcrypt,... )
+
+  * Corrected some more typos
+    - Missing cleanup after building "flavored" binaries
+    - Missing 'btraceback' component
+
+  * Package sponsored by Roberto Lumbreras <[e-mail]>
+
+ -- Jose Luis Tallon <[e-mail]>  Wed, 29 Sep 2004 16:04:05 +0200
+
+bacula (1.34.6-1) unstable; urgency=high
+
+  * New upstream version
+  * Applied patch to avoid deadlocks in bacula-dir (urgency -> high)
+
+  * Several cleanups from both Philipp M Hahn & Filip Van Raemdonck. I can't
+    sufficiently express my gratitude here. Thanks!!
+    - fixed upgrade support
+    - build improvements
+    - several minor fixups/reorganization. I hope i got it right this time..
+
+  * Now bscan is a set of 3 statically-linked binaries, so that bacula-sd
+    does not pull all three client libs. This had been pending for a long time...
+
+  * Some more minor improvements
+    - Logfiles are already in /var/log/bacula/ (Closes: #254245)
+    - Fixed perms on /var/log/bacula/log (Closes: #252410)
+
+  * Bacula's GNOME console was already linked against v2 libs 
+    since 1.34.5-1 (Closes: #264975)
+
+  * MySQL flavor's postinst issues
+    - Wrong ordering of db_get / assignment (Closes: #270329)
+    - Split line changes meaning, other cleanups (Closes: #270197)
+
+  * Updated debconf translations
+    - FR (Closes: #269958)
+    - JA, by Hideki Yamane <[e-mail]> (Closes: #270765)
+
+  * Debconf-related fixes:
+    - Updated versioned dependency w/Debconf: v1.4.30 seems to work.
+    - Reset password's "seen" flag, so that it gets asked again
+    - Moved root password question back to 'config' grr...
+
+  * Several adjustments to descriptions; minor additions to Suggests:
+    Matthew Hawkins has provided invaluable feedback here. Thanks!!!
+
+  * The "fix all those typos" release.
+    - Shin-young Yune: -director-pgsql.postinst
+    - typos in -director-{my,pg}sql 's postinst scripts
+    - typos in dh_link commands to get manpages installed
+
+  * Misc fixes
+    - /var/lib/bacula absent from -director-common (Closes: #270196)
+    - /usr/share/bacula-common/defconfig dir was empty!
+    - grant_pgsql_privileges missing from -director-common
+    - adjusted dependencies so that meta-packages can be upgraded
+
+  * Package sponsored by Roberto Lumbreras <[e-mail]>
+
+ -- Jose Luis Tallon <[e-mail]>  Wed, 2 Sep 2004 12:36:51 +0200
+
+bacula (1.34.5-1) unstable; urgency=high
+
+  * Urgency high, because:
+    - TLS libraries from libc6-i686 no longer break bacula. (Closes: #250351)
+
+  * New upstream version (Closes: #242725, #242735)
+    - Supports PostgreSQL for the catalog (Closes: #252244)
+    - Supports backup to disk.
+    - Supports backing up ACLs (enabled in this package)
+    - Several minor bugfixes since 1.34.2
+
+  * Completely redone, much more efficient, build system. Contributed by
+    Turbo Fredriksson <[e-mail]> and adapted by me: now only the
+    "flavor-dependent"(cats,dird,tools) are rebuilt, instead of the full
+    package. The scripts are also generated from 'rules' instead.
+
+  * Several upstream enhancements/changes;
+    + Database schema changes: `postinst' will try to upgrade MySQL & SQLite
+    + Added PostgreSQL support for the catalog
+    + Added support for disk-based backups, etc (see Documentation)
+
+  * Security related changes
+    - More secure password handling in configure/postinst (prompt during postinst,
+    delete password inmediately) -- breaks unattended installs unless one
+    uses debconf seeding, sorry; Warnings with lintian/linda, grrr...
+    - Added TCP wrappers(libwrap) support, after agreement with
+    Steve Smith (Closes: #245626)
+    - Ensured proper ownership and permissions for /var/lib/bacula, in order
+    for the PostgreSQL port to run securely.
+
+  * Upgrade to compiling/linking the console against Gnome2;
+    renamed to bconsole-gnome to avoid namespace pollution (Closes: #246953)
+
+  * Added wxWindows console version, bacula-wxconsole.
+
+  * Moved bcopy,bls,bextract,bscan,btape manpages to sect 8 - lintian's advice.
+    - Fix minor error in bconsole's displayed usage (Closes: #254427)
+
+  * Include bscan.sqlite, bscan.mysql, bscan.pgsql in bacula-sd, under /usr/lib
+  so that data recovery can be attempted with the supplied package in the event
+  that the catalog gets damaged; As politely asked by Christof Lehmann, and
+  later by Tilo Levante (Closes: #255059)
+
+  * PostgreSQL port of the maintainer scripts, merged from contributions by
+    Alvaro Hernandez Tortosa <[e-mail]> and
+    Philipp Matthias Hahn <[e-mail]>. Many thanks!.
+
+  * Merged enhancements/patches by PMHahn: PgSQL support, docs, 
+    maint. scripts, debian/rules. I owe you one.
+
+  * Added pt_BR translation, by <[e-mail]> (Closes: #254110)
+
+  * Misc minor bugfixes:
+    - Restart breakage if not running (Closes: #252360)
+    - Fixed wrong paths in scripts: added "flavor-independent" catalog backup
+      script for bacula-sd (Closes: #250863)
+    - Depend on exim4|mail-transport-agent (Closes: #255340)
+	
+  * Package sponsored by Filip Van Raemdonck <[e-mail]>
+
+ -- Jose Luis Tallon <[e-mail]>  Sun, 29 Aug 2004 19:08:51 +0200
+
+bacula (1.32f-5-3.1) unstable; urgency=high
+
+  * NMU - acknowledged.
+
+  * Changes from NMUer Filip Van Raedmdonck:
+    - Build database specific catalog backup script and install it in the
+      respective packages. This fixes tests and paths. (Closes: #250863)
+    - Build GNOME 2 console. (Closes: #264975)
+      Rename to gnome-bconsole to avoid namespace pollution. (Closes: #246953)
+    - Retitle the menu entry to avoid conflict with the textual one, point it to
+      the right config file location and run it with help of gksu.
+    - Add Brazilian Portuguese debconf template translation. (Closes: #254110)
+    - Depend on exim4 instead of exim. (Closes: #255340)
+
+ -- Filip Van Raemdonck <[e-mail]>  Mon, 11 Aug 2004 18:42:34 +0200
+
+bacula (1.32f-5-3) unstable; urgency=low
+
+  * Added *real* DE translation and some enhancements to the manual pages,
+    submitted by Philipp Hahn <[e-mail]>. Thanks! (Closes: #246676)
+
+  * Fix permissions problem in -director-sqlite's postinst (Closes: #246955)
+
+  * Package sponsored by Roberto Lumbreras <[e-mail]>
+
+ -- Jose Luis Tallon <[e-mail]>  Sun,  2 May 2004 23:58:06 +0100
+
+bacula (1.32f-5-2) unstable; urgency=low
+
+  * Create '/var/lib/bacula/bacula.db' in postinst (Closes: #243983)
+
+  * Fix dependency goofup which made the 'bacula' meta-package uninstallable (Closes: #245259)
+
+  * Changed architecture for 'bacula', 'bacula-client' and 'bacula-server'
+    meta-packages from 'any' to 'all'. Thanks to Linda ;)
+
+  * Package sponsored by Roberto Lumbreras <[e-mail]>
+
+ -- Jose Luis Tallon <[e-mail]>  Wed, 21 Apr 2004 12:48:01 +0100
+
+bacula (1.32f-5-1) unstable; urgency=low
+
+  * Do not provide same file as conserver-client: moved /usr/bin/console
+    to /usr/bin/bconsole. (Closes: #240282)
+
+  * Added menu entries for 'bacula-console' & 'bacula-console-gnome'.
+
+  * Added French translation of Bacula's templates (Closes: #238190)
+  * Added Dutch translation of Bacula's templates (Closes: #241310)
+    Thanks, guys!!! 
+
+  * Since Katie does not understand tham i am myself ;) when comparing my
+    name in changelog[UTF-8] & control[7bit ascii], remove accentuated vowels.
+
+  * Fix wrong substitutions in FD scripts: provide customized
+    {start,stop}mysql scripts for Debian (Closes: #238630)
+
+  * Tweak dependencies, so that one can install the "everything"
+    meta-package(`bacula_x.yy-*.deb') with the MySQL version of the director
+    [depend on the 'bacula-director' virtual package] (Closes: #240005)
+
+  * Package sponsored by Roberto Lumbreras <[e-mail]>
+
+ -- Jose Luis Tallon <[e-mail]>  Mon, 12 Apr 2004 22:03:19 +0200
+
+bacula (1.32f-4-3) unstable; urgency=low
+
+  * Fix typo in bacula-director-sqlite.postinst introduced in the previous
+    upload. Cosmetic enhancement when reinstalling/upgrading: avoid error
+    messages from SQLite.
+
+  * Package sponsored by Roberto Lumbreras <[e-mail]>
+
+ -- José Luis Tallón <[e-mail]>  Sun, 14 Mar 2004 01:18:31 +0100
+
+bacula (1.32f-4-2) unstable; urgency=low
+
+  * Add missing logic to bacula-director-sqlite's postinst so that
+    configuration succeeds (Closes: #236126)
+
+  * Fix compilation problem in Alpha platform (var.c file)
+
+  * Package sponsored by Roberto Lumbreras <[e-mail]>
+
+ -- José Luis Tallón <[e-mail]>  Sat, 13 Mar 2004 21:39:33 +0100
+
+bacula (1.32f-4-1) unstable; urgency=low
+
+  * Do *not* depend on OpenSSL, since it is not really needed, as confirmed
+    by upstream.
+
+  * Increase robustnes in bacula-director-mysql's postinst: succeed
+    also when MySQL runs at localhost and network connectivity is disabled.
+
+  * Increase robustness & polish some rough edges in the 'config' script:
+    detect whether tables are created and act accordingly.
+
+  * Make bacula-director-mysql *restart* bacula if there was a previous
+    version installed, do *stop* it on remove.
+
+  * Increase robustness of bacula-director-common's initscript : killall -15
+    if start-stop-daemon --stop did not succeed.
+
+  * Fix packaging bug in bacula-console introduced with prev. release changes.
+
+  * Fix several typos/leftovers from package polishing lately: mostly
+    forgetting to update vars to reflect changes in file location/name
+
+  * New upstream version
+
+  * RFP/ITP fullfilled (Closes: bug#188946)
+
+  * Package sponsored by Roberto Lumbreras <[e-mail]>
+
+  * Moved /usr/sbin/console to /usr/sbin/bacula-console, and provided a
+    wrapper script so that it gets called with appropiate arguments, as a
+    convenience to users. Added corresponding manpage (linked to console.1)
+
+  * Previous changes, before first upload to the Debian archive:
+
+        - bacula (1.32f-3-1)	28 Jan 2004
+
+         * Fixed a typo in bacula-director-mysql, which made postinst stomp on
+           existing configuration file. Noticed by Dick Middleton.
+           Robustness features in bacula-director-mysql.postinst.
+
+         * Slightly better manpages.
+
+         * Readied for first upload to Debian's archive.
+
+        - bacula (1.32b-5)	24 Dec 2003
+
+          * Completely revamped the bacula-director-mysql postinst, based
+            upon suggestions/debugging by Frank Lenaerts.
+            Most work was done during the DebConf-ES, with assistance from
+            Alvaro Hernandez Tortosa <[e-mail]>
+
+          * Added "chmod 755" for scripts in the patches subdir to rules,
+            fixing a sure FTBFS bug. Pointed by Frank Lenaerts
+            <[e-mail]>
+
+        - bacula (1.32b-4)	23 Nov 2003
+
+          * Polished 'purge' behaviour[postrm scripts] -- do remove files.
+
+          * Updated Build-Depends & debian/rules to better comply with policy,
+            following advice from Roberto Lumbreras <[e-mail]>
+
+          * Strengthened permissions on /etc/bacula and FD/SD/Director config
+            files, to avoid giving away passwords to local users and thus
+            avoid attacks.  Problem reported/solution suggested by Frank
+            Lenaerts.
+
+          * Verified dependencies, loosened a bit so that backporting is easier.
+            Suggested by Frank Lenaerts <[e-mail]>
+
+        - bacula (1.32b-3)	10 Nov 2003
+
+          * Fixed several little packaging bugs:
+            - Dir & SD ports were mistakenly exchanged.
+            - SD privileges were a little too low.
+            - Gnome-Console's config file was missing.
+
+        - bacula (1.32b-2)	6 Nov 2003
+
+          * Polished Packaging a little bit
+
+          * Fixed daemon stop bug, based on suggestions
+            by Matthieu Racine <[e-mail]>
+
+          * bacula-common's postinst now adds needed entries to /etc/services
+
+        - bacula (1.32b-1)	19 Oct 2003
+
+          * Initial Packaging: 12 binary packages built
+
+ -- José Luis Tallón <[e-mail]>  Wed, 18 Feb 2004 00:04:11 +0100
+
+>>>>>>> MERGE-SOURCE
 
=== modified file 'debian/control'
--- debian/control	2012-02-06 09:33:25 +0000
+++ debian/control	2012-02-10 12:11:23 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Source: bacula
 Section: admin
 Priority: optional
@@ -318,3 +319,325 @@
  GNOME.
  .
  The monitor constantly displays Bacula's status.
+=======
+Source: bacula
+Section: admin
+Priority: optional
+Maintainer: Ubuntu Core Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Bacula packaging Group <[e-mail]>
+Uploaders: Jan Hauke Rahm <[e-mail]>
+Build-Depends: autotools-dev, debhelper (>= 6.0.7~), po-debconf (>= 0.8.2), 
+ zlib1g-dev, libreadline-dev,
+ libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), 
+ postgresql-server-dev-9.1,
+ libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10),
+ libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev,
+ libx11-dev, mtx, bc, libxt-dev, dpkg-dev (>= 1.13.19), libqt4-dev, 
+ libssl-dev, quilt, po-debconf
+Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
+Standards-Version: 3.9.2
+Vcs-Browser: http://git.debian.org/?p=users/jgoerzen/bacula
+Vcs-Git: git://git.debian.org/git/users/jgoerzen/bacula
+Homepage: http://www.bacula.org/
+
+Package: bacula
+Architecture: all
+Depends: bacula-server, bacula-client, bacula-common, ${misc:Depends}
+Suggests: bacula-doc
+Description: network backup, recovery and verification - meta-package
+ Bacula is a set of programs to manage backup, recovery and verification
+ of computer data across a network of computers of different kinds.
+ .
+ It is efficient and relatively easy to use, while offering many advanced
+ storage management features that make it easy to find and recover lost or
+ 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
+ scheduling, storage control, node connector, and administrative console.
+
+Package: bacula-common
+Replaces: bacula-director-common
+Architecture: any
+Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser (>= 3.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: bacula-doc
+Description: network backup, recovery and verification - common support files
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ This package provides files that are useful for other Bacula packages.
+
+Package: bacula-common-sqlite3
+Architecture: any
+Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser (>= 3.0)
+Depends: bacula-common, ${shlibs:Depends}, ${misc:Depends}
+Suggests: bacula-doc
+Conflicts: bacula-common-pgsql, bacula-common-mysql
+Description: network backup, recovery and verification - SQLite v3 common files
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ This package provides files that are useful for other Bacula packages
+ for the SQLite v3 database.
+
+Package: bacula-common-pgsql
+Architecture: any
+Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser (>= 3.0)
+Depends: bacula-common, ${shlibs:Depends}, ${misc:Depends}
+Suggests: bacula-doc
+Conflicts: bacula-common-sqlite3, bacula-common-mysql
+Description: network backup, recovery and verification - PostgreSQL common files
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ This package provides files that are useful for other Bacula packages
+ for the PostgreSQL database.
+
+Package: bacula-common-mysql
+Architecture: any
+Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser (>= 3.0)
+Depends: bacula-common, ${shlibs:Depends}, ${misc:Depends}
+Suggests: bacula-doc
+Conflicts: bacula-common-sqlite3, bacula-common-pgsql
+Description: network backup, recovery and verification - MySQL common files
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ This package provides files that are useful for other Bacula packages
+ for the MySQL database.
+
+Package: bacula-director-common
+Architecture: any
+Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, bacula-common (= ${binary:Version})
+Depends: ${shlibs:Depends}, adduser, gawk, mailx, lsb-base (>= 3.2-13), ${misc:Depends}
+Description: network backup, recovery and verification - Director common files
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ The Bacula Director service supervises all the backup, restore, verify and
+ archive operations. It can run as a daemon or as a foreground service which
+ administrators can use to schedule backups and recover files.
+ .
+ This package provides common files for the Bacula Director daemon.
+
+Package: bacula-director-sqlite3
+Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
+Architecture: any
+Depends: bacula-director-common (= ${binary:Version}), sqlite3, ${shlibs:Depends}, bacula-common-sqlite3 (>= ${binary:Version}), file, dbconfig-common (>= 1.8.19), ${misc:Depends}
+# Can remove dep on file once sqlite2 migration code is dropped from postinst
+# after squeeze (that migration code is for lenny -> squeeze)
+Conflicts: bacula-director
+Provides: bacula-director
+Replaces: bacula-director
+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.
+ .
+ The Bacula Director service supervises all the backup, restore, verify and
+ archive operations. It can run as a daemon or as a foreground service which
+ administrators can use to schedule backups and recover files.
+ .
+ This version stores Bacula's catalog in an SQLite 3 database, and thus is
+ suited for smaller installations.
+ 
+Package: bacula-director-mysql
+Architecture: any
+Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
+Depends: bacula-director-common (= ${binary:Version}), dbconfig-common (>= 1.8.19), mysql-client, ${shlibs:Depends}, bacula-common-mysql (>= ${binary:Version}), ${misc:Depends}
+Conflicts: bacula-director
+Provides: bacula-director
+Replaces: bacula-director
+Recommends: mysql-server (>= 4.0)
+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.
+ .
+ The Bacula Director service supervises all the backup, restore, verify and
+ archive operations. It can run as a daemon or as a foreground service which
+ administrators can use to schedule backups and recover files.
+ .
+ This version stores Bacula's catalog in a MySQL server, and thus is suited
+ for large installations.
+
+Package: bacula-director-pgsql
+Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
+Architecture: any
+Depends: bacula-director-common (= ${binary:Version}), dbconfig-common (>= 1.8.19), postgresql-client (>= 7.4), ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ${misc:Depends}
+Conflicts: bacula-director
+Provides: bacula-director
+Replaces: bacula-director
+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
+ data across a network of computers of different kinds.
+ .
+ The Bacula Director service supervises all the backup, restore, verify and
+ archive operations. It can run as a daemon or as a foreground service which
+ administrators can use to schedule backups and recover files.
+ .
+ This version stores Bacula's catalog in a PostgreSQL server, and thus is 
+ suited for large installations.
+
+Package: bacula-client
+Architecture: all
+Depends: bacula-console (>= ${source:Version}), bacula-fd (>= ${source:Version}), ${misc:Depends}
+Suggests: bacula-traymonitor
+Description: network backup, recovery and verification - client meta-package
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ The Bacula Director service supervises all the backup, restore, verify and
+ 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
+ console only).
+
+Package: bacula-fd
+Architecture: any
+Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends}, lsb-base (>= 3.2-13), ${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
+ data across a network of computers of different kinds.
+ .
+ The file daemon has to be installed on the machine to be backed up. It is
+ responsible for providing the file attributes and data when requested by
+ the Director, and also for the file system-dependent part of restoration.
+
+Package: bacula-server
+Architecture: all
+Depends: bacula-director-mysql (>= ${source:Version})|bacula-director, bacula-sd (>= ${source:Version}), bacula-sd-mysql (>= ${source:Version})|bacula-sd-tools, ${misc:Depends}
+Recommends: bacula-fd
+Description: network backup, recovery and verification - server meta-package
+ 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
+ director and storage daemons.
+
+Package: bacula-sd
+Architecture: any
+Pre-Depends: bacula-common (= ${binary:Version})
+Depends: ${shlibs:Depends}, mtx, python, lsb-base (>= 3.2-13), ${misc:Depends}
+Recommends: bacula-sd-tools
+Suggests: dds2tar, scsitools, sg3-utils, mt-st
+Description: network backup, recovery and verification - storage daemon
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ The storage daemon performs the storage and recovery of the file
+ attributes and data to the physical media; in other words, it is
+ responsible for reading and writing the backups.
+ .
+ It runs on the machine which has access to the backup device(s) - usually
+ a tape drive, but alternatively other storage media, such as files.
+
+Package: bacula-sd-sqlite3
+Architecture: any
+Depends: bacula-sd (= ${binary:Version}), ${shlibs:Depends}, bacula-common-sqlite3 (>= ${binary:Version}), ${misc:Depends}
+Conflicts: bacula-sd-tools, bacula-sd (<= 3.0.1-1)
+Replaces: bacula-sd-tools, bacula-sd (<= 3.0.1-1)
+Provides: bacula-sd-tools
+Description: network backup, recovery and verification - SQLite 3 SD tools
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ The storage daemon performs the storage and recovery of the file
+ attributes and data to the physical media; in other words, it is
+ responsible for reading and writing the backups.
+ .
+ This package contains SQLite 3 versions of the bscan and bcopy utilities,
+ which are used for recovery when Bacula's catalog is unavailable.
+
+Package: bacula-sd-sqlite
+Architecture: any
+Depends: bacula-sd (= ${binary:Version}), bacula-sd-sqlite3 (>= 3.0.0), ${misc:Depends}
+Conflicts: bacula-sd (<< 1.38.9)
+Replaces: bacula-sd (<< 1.38.9)
+Description: network backup, recovery and verification - SQLite SD tools
+ This is a transition package.  SQLite v2 support has been deprecated
+ as of Bacula 3.0.0.  This package depends on the SQLite v3 version of the
+ storage daemon.
+
+Package: bacula-sd-mysql
+Architecture: any
+Depends: bacula-sd (= ${binary:Version}), ${shlibs:Depends}, bacula-common-mysql (>= ${binary:Version}), ${misc:Depends}
+Conflicts: bacula-sd-tools, bacula-sd (<= 3.0.1-1)
+Replaces: bacula-sd-tools, bacula-sd (<= 3.0.1-1)
+Provides: bacula-sd-tools
+Description: network backup, recovery and verification - MySQL SD tools
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ The storage daemon performs the storage and recovery of the file
+ attributes and data to the physical media; in other words, it is
+ responsible for reading and writing the backups.
+ .
+ This package contains MySQL versions of the bscan and bcopy utilities,
+ which are used for recovery when Bacula's catalog is unavailable.
+
+Package: bacula-sd-pgsql
+Architecture: any
+Depends: bacula-sd (= ${binary:Version}), ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ${misc:Depends}
+Conflicts: bacula-sd-tools, bacula-sd (<= 3.0.1-1)
+Replaces: bacula-sd-tools, bacula-sd (<= 3.0.1-1)
+Provides: bacula-sd-tools
+Description: network backup, recovery and verification - PostgreSQL SD tools
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ The storage daemon performs the storage and recovery of the file
+ attributes and data to the physical media; in other words, it is
+ responsible for reading and writing the backups.
+ .
+ This package contains PostgreSQL versions of the bscan and bcopy utilities,
+ which are used for recovery when Bacula's catalog is unavailable.
+
+Package: bacula-console
+Architecture: any
+Pre-Depends: debconf (>= 1.4.30)
+Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: network backup, recovery and verification - text console
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ The management console allows the administrator or user to
+ communicate with the Bacula Director.
+ .
+ This package provides the text-interface version of the console.
+
+Package: bacula-console-qt
+Section: utils
+Architecture: any
+Pre-Depends: debconf (>= 1.4.30)
+Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Bacula Administration Tool Console
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ The management console allows the administrator or user to
+ communicate with the Bacula Director.
+ .
+ This package provides the most advanced GUI to bacula: the Bacula
+ Administration Tool (BAT) console.
+ .
+ This GUI interface has been designed to ease restore operations as much as
+ possible as compared to the basic text console.
+
+Package: bacula-traymonitor
+Architecture: any
+Depends: ${shlibs:Depends}, bacula-common (= ${binary:Version}), ${misc:Depends}
+Suggests: kde|gnome-desktop-environment
+Description: network backup, recovery and verification - tray monitor
+ Bacula is a set of programs to manage backup, recovery and verification of
+ data across a network of computers of different kinds.
+ .
+ This package provides a tray monitor for the Bacula backup system. It is
+ FreeDesktop-compatible, which means it will work under both KDE and
+ GNOME.
+ .
+ The monitor constantly displays Bacula's status.
+>>>>>>> MERGE-SOURCE
 
=== added file 'debian/patches/fix-make-mysql-tables.patch'
--- debian/patches/fix-make-mysql-tables.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-make-mysql-tables.patch	2012-02-10 12:11:23 +0000
@@ -0,0 +1,23 @@
+Description: fix msyql database creation schema for mysql 5.5
+Author: Scott Moser <[e-mail]>
+Last-Modified: 2012-02-09
+ On precise with mysql server at 5.5.17-4ubuntu6, the installation of
+ bacula-director-mysql fails with invalid SQL.  This change fixes
+ the problem there, but seems like it may likely break other versions
+ of mysql.  See [1,2] for upstream commits.
+ .
+ [1] http://www.bacula.org/git/cgit.cgi/bacula/commit/?id=9be8c0c13faf5d41df5a0ee2f3c5bebf165e2d30
+ [2] http://www.bacula.org/git/cgit.cgi/bacula/commit/?id=06d192f740d5cfc9a13ca56756f74658661a7141
+--- a/src/cats/make_mysql_tables.in
++++ b/src/cats/make_mysql_tables.in
+@@ -356,8 +356,8 @@ CREATE TABLE UnsavedFiles (
+ 
+ CREATE TABLE Counters (
+    Counter TINYBLOB NOT NULL,
+-   \`MinValue\` INTEGER DEFAULT 0,
+-   \`MaxValue\` INTEGER DEFAULT 0,
++   `MinValue` INTEGER DEFAULT 0,
++   `MaxValue` INTEGER DEFAULT 0,
+    CurrentValue INTEGER DEFAULT 0,
+    WrapCounter TINYBLOB NOT NULL,
+    PRIMARY KEY (Counter(128))
 
=== renamed file 'debian/patches/fix-make-mysql-tables.patch' => 'debian/patches/fix-make-mysql-tables.patch.moved'
=== added file 'debian/patches/mysql-search-lib-x86_64-linux-gnu.patch'
--- debian/patches/mysql-search-lib-x86_64-linux-gnu.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/mysql-search-lib-x86_64-linux-gnu.patch	2012-02-10 12:11:23 +0000
@@ -0,0 +1,32 @@
+Description: include /usr/lib/x86_64-linux-gnu in --with-mysql search path
+Origin: Scott Moser <[e-mail]>
+Bug: http://bugs.bacula.org/view.php?id=1829
+Last-Update: 2012-02-09
+Forwarded: Yes
+ Without this modification, the libbaccats-mysql was not linked to
+ mysql.
+
+--- a/autoconf/bacula-macros/db.m4
++++ b/autoconf/bacula-macros/db.m4
+@@ -342,6 +342,9 @@ AC_HELP_STRING([--with-mysql@<:@=DIR@:>@
+                    elif test -f /usr/lib64/libmysqlclient_r.a \
+                         -o -f /usr/lib64/libmysqlclient_r.so; then
+                            MYSQL_LIBDIR=/usr/lib64
++                   elif test -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.a \
++                        -o -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so; then
++                           MYSQL_LIBDIR=/usr/lib/x86_64-linux-gnu
+                    elif test -f /usr/lib/mysql/libmysqlclient_r.a \
+                           -o -f /usr/lib/mysql/libmysqlclient_r.so; then
+                            MYSQL_LIBDIR=/usr/lib/mysql
+--- a/configure
++++ b/configure
+@@ -23980,6 +23980,9 @@ if test "${with_mysql+set}" = set; then
+                    elif test -f /usr/lib64/libmysqlclient_r.a \
+                         -o -f /usr/lib64/libmysqlclient_r.so; then
+                            MYSQL_LIBDIR=/usr/lib64
++                   elif test -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.a \
++                        -o -f /usr/lib/x86_64-linux-gnu/libmysqlclient_r.so; then
++                           MYSQL_LIBDIR=/usr/lib/x86_64-linux-gnu
+                    elif test -f /usr/lib/mysql/libmysqlclient_r.a \
+                           -o -f /usr/lib/mysql/libmysqlclient_r.so; then
+                            MYSQL_LIBDIR=/usr/lib/mysql
 
=== renamed file 'debian/patches/mysql-search-lib-x86_64-linux-gnu.patch' => 'debian/patches/mysql-search-lib-x86_64-linux-gnu.patch.moved'