[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, squeeze-backports, updated. debian/5.2.6+dfsg-7-18-g32d7ccc

[Bart Swedrowski]

The following commit has been merged in the squeeze-backports branch:
commit d652a7beb7dab8b0fb12a5b8e017ffa8bfbd3f6b
Merge: 081a7692220175c49728a159cda76e607a4aa85e 8e178b68e216bcdd6d38d7109f288b4904c80623
Author: Bart Swedrowski <bart at timedout.org>
Date:   Tue Jan 22 15:51:30 2013 +0000

    Merge debian/5.2.6+dfsg-7 with squeeze-backports branch

diff --combined debian/changelog
index 525c1dd,901069a..9d9499d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,39 +1,39 @@@
+ bacula (5.2.6+dfsg-7) unstable; urgency=low
+ 
+   * debian/bacula-sd.install, bacula-director-{sqlite3,mysql,pgsql}.install,
+     debian/rules:
+     - Remove incorrect systemd service files for bacula-director and
+       bacula-sd due to unaccepted for freeze changes in fixes.
+   * debian/additions/common-functions.dpkg, debian/*.init, 
+     debian/patches/delegate-chuid-to-systemd.patch, debian/patches/series:
+     - [revert] delegate daemons uid/gid changing to start-stop-daemon.
+   * debian/control:
+     + [revert] remove mtx from build-depends on Hurd, due to package
+       unavailability and unneccessary functionality on this platform.
+     - [revert] Add build-depends for LZO support.
+   * debian/rules:
+     - [revert] add lintian overrides for hardening for all packages.
+     + [revert] disable xattr and acl on Hurd.
+   * debian/rules:
+     - [revert] Cleanup list of linked libraries.
+   * debian/rules, debian/control, debian/*.init, debian/bacula-common.postrm,
+     debian/additions/common-functions.init:
+     - [revert] switch to /run directory (/var/run/bacula -> /run/bacula,
+       /var/lock -> /run/lock).
+   * debian/bacula-common.preinst:
+     - [revert] add bacula into cdrom group.
+   * debian/bacula-common.preinst:
+     - [revert] switch from usermod to more debian-policy friendly adduser.
+   * debian/*.postrm:
+     - [revert] make package purging more carefull about users files.
+   * debian/po/nl.po:
+     + add dutch translation (thanks to Vincent Zweije).
+   * debian/bacula-director-common.bacula-director.init (Closes: #605449):
+     + start sql database before bacula-director (thanks to Teodor MICU
+       <mteodor at gmail.com>).
+ 
+  -- Alexander Golovko <alexandro at ankalagon.ru>  Tue, 08 Jan 2013 16:01:20 +0400
+ 
  bacula (5.2.6+dfsg-6) unstable; urgency=high
  
    [ Alexander Golovko ]
@@@ -31,13 -67,6 +67,13 @@@
  
   -- Alexander Golovko <alexandro at ankalagon.ru>  Wed, 24 Oct 2012 15:19:49 +0400
  
 +bacula (5.2.6+dfsg-5~bpo60+1) squeeze-backports; urgency=low
 +
 +  [ Bart Swedrowski ]
 +  * Rebuild for squeeze-backports.
 +
 + -- Bart Swedrowski <bart at timedout.org>  Tue, 25 Sep 2012 14:55:00 +0100
 +
  bacula (5.2.6+dfsg-5) unstable; urgency=low
  
    * debian/control:
@@@ -149,13 -178,6 +185,13 @@@ bacula (5.2.6+dfsg-2) unstable; urgency
  
   -- Luca Capello <luca at pca.it>  Fri, 29 Jun 2012 05:59:45 +0200
  
 +bacula (5.2.6+dfsg-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Change Build-Depends debhelper (>= 8.0.0), libpq-dev (>= 8.4)
 +
 + -- Bart Swedrowski <bart at timedout.org>  Fri, 22 Jun 2012 16:12:23 +0100
 +
  bacula (5.2.6+dfsg-1) unstable; urgency=high
  
    [ Alexander Golovko ]
diff --combined debian/control
index e318e8a,d513eca..b29e4df
--- a/debian/control
+++ b/debian/control
@@@ -2,16 -2,14 +2,16 @@@ Source: bacul
  Section: admin
  Priority: optional
  Maintainer: Debian Bacula Team <pkg-bacula-devel at lists.alioth.debian.org>
 -Uploaders: Jan Hauke Rahm <jhr at debian.org>, Luca Capello <luca at pca.it>
 -Build-Depends: autotools-dev, autoconf, debhelper (>= 8.1.3), po-debconf,
 +Uploaders: Jan Hauke Rahm <jhr at debian.org>, Luca Capello <luca at pca.it>,
 + Alexander Golovko <alexandro at ankalagon.ru>, Bart Swedrowski <bart at timedout.org>
 +DM-Upload-Allowed: yes
 +Build-Depends: autotools-dev, autoconf, debhelper (>= 8.0.0), po-debconf,
   zlib1g-dev, libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev
 - (>= 9.1), postgresql-server-dev-all, libwrap0-dev, python-dev, libgtk2.0-dev,
 + (>= 8.4), postgresql-server-dev-all, libwrap0-dev, python-dev, libgtk2.0-dev,
   libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev, libx11-dev, mtx, bc,
 - libxt-dev, libqt4-dev, libssl-dev, libcap-dev [linux-any]
 + libxt-dev, libqt4-dev, libssl-dev, liblzo2-dev, libcap-dev [linux-any]
  Build-Conflicts: python2.4
- Standards-Version: 3.9.3
+ Standards-Version: 3.9.2
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-bacula/bacula.git;a=summary
  Vcs-Git: git://anonscm.debian.org/pkg-bacula/bacula.git
  Homepage: http://www.bacula.org/
@@@ -274,8 -272,8 +274,13 @@@ Description: network backup service - c
  
  Package: bacula-fd
  Architecture: any
++<<<<<<< HEAD
 +Depends: bacula-common (= ${binary:Version}), lsb-base, ucf,
 + ${shlibs:Depends}, ${misc:Depends}
++=======
+ Depends: bacula-common (= ${binary:Version}), lsb-base, ucf, ${shlibs:Depends},
+  ${misc:Depends}
++>>>>>>> debian/5.2.6+dfsg-7
  Suggests: bacula-traymonitor
  Description: network backup service - file daemon
   Bacula is a set of programs to manage backup, recovery, and verification of

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