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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit e59bf8790600f83531eeb66e8e1f7b83ef712194
Merge: c9d2ecdd43c6ec9f08be7649224c59c887c1bf39 9aa2a35d89381f5dcf639a78ce33a2e0187c482d
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Fri Jun 8 22:54:00 2012 +0400

    Merge branch 'master' of ssh://git.debian.org/git/pkg-bacula/bacula

diff --combined debian/changelog
index b8cc7a9,76008f9..dc2cbc1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -52,7 -52,7 +52,7 @@@ bacula (5.2.6+dfsg-1) UNRELEASED; urgen
        and arguments (Closes: #555737, #530019, #530018, #530014),
        thanks to Christopher Phillips (Blake) <blake at lindenlab.com> 
        and Teodor <mteodor at gmail.com>.
 -    + cleanup maintainer scripts.
 +    + cleanup and unify maintainer scripts (Closes: #670427).
      + make all maintainer scripts bash-independent.
    * debian/bacula-director-mysql.script.5.0.0,
      debian/rules:
@@@ -108,6 -108,9 +108,9 @@@
      - remove, deprecated upstream since 2.0.2-1 (see #391820).
    * debian/additions/bacula-tray-monitor.desktop:
      - remove, use upstream file.
+   * debian/bacula-common.install:
+     + install systemd tmpfiles.d's bacula.conf, thanks to Michael
+       Stapelberg <michael+db20090501 at stapelberg.de> (Closes: #624532).
    * debian/bacula-console*:
      + move bconsole to /usr/sbin/ as intended by upstream, providing
        symlinks in old place.
@@@ -124,6 -127,9 +127,9 @@@
      + move bat to /usr/sbin/ as intended by upstream.
      - remove useless -c option, /etc/bacula/bat.conf is used by default
        if not specified.
+   * debian/bacula-director-*.install, debian/bacula-fd.install,
+     debian/bacula-sd.install:
+     + install upstream systemd service files.
    * debian/bacula-director-*.postinst:
      - remove path for sh call (thanks to lintian).
    * debian/bacula-traymonitor.install:
@@@ -142,6 -148,8 +148,8 @@@
    * debian/NEWS:
      + add note about moving bat/bconsole/bacula-tray-monitor to
        /usr/sbin/ as intended by upstream.
+   * debian/patches/add-systemd-bacula.conf-for-piddir.patch:
+     + add bacula.conf which defines the PID directory to be created.
    * debian/patches/fix-binutils-gold-linking.patch:
      + import from upstream BTS (Closes: #553956).
    * debian/patches/fix-scriptdir-examples-devices.patch:
@@@ -152,6 -160,7 +160,7 @@@
    * debian/rules:
      + add --with-dump-email=root and --with-job-email=root to CONF_ALL,
        thus removing the '@localhost' domain part (Closes: #519567).
+     + add --with-systemd=/lib/systemd/system for systemd files.
      + rename bacula-tray-monitor.xpm.
  
    [ Martin Pitt ]

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