[pkg-bacula-commits] [bacula] 01/01: Merge branch 'migrate-files' into systemd-fixuser

[Sven Hartge]

This is an automated email from the git hooks/post-receive script.

hartge-guest pushed a commit to branch systemd-fixuser
in repository bacula.

commit efdb5f7a342f5f942915c2d8e01c67f47d26f0cc
Merge: a4ea270 5efb7f1
Author: Sven Hartge <sven at svenhartge.de>
Date:   Mon Aug 1 16:05:22 2016 +0200

    Merge branch 'migrate-files' into systemd-fixuser

 debian/NEWS                                        |  10 ++
 debian/TODO                                        |  23 ++--
 debian/bacula-bscan.install                        |   1 +
 ...ula-sd-db.manpages.in => bacula-bscan.manpages} |   1 -
 debian/bacula-common-db.install.in                 |   1 -
 debian/bacula-common.install                       |   1 +
 debian/bacula-console.links                        |   2 -
 debian/bacula-director-common.install              |   4 -
 debian/bacula-director-common.maintscript          |   1 -
 debian/bacula-director-common.manpages             |   2 -
 debian/bacula-director-mysql.install               |   5 +-
 debian/bacula-director-pgsql.install               |   7 +-
 debian/bacula-director-sqlite3.install             |   5 +-
 ...a-director-common.dirs => bacula-director.dirs} |   0
 ...acula-director.init.in => bacula-director.init} |   0
 debian/bacula-director.install                     |   7 ++
 ...tor-db.manpages.in => bacula-director.manpages} |   2 +
 ...rector-common.postrm => bacula-director.postrm} |   0
 debian/bacula-sd-db.install.in                     |   3 -
 debian/bacula-sd-mysql.maintscript                 |   1 -
 debian/bacula-sd-pgsql.maintscript                 |   1 -
 debian/bacula-sd-sqlite3.maintscript               |   1 -
 debian/bacula-sd.install                           |   2 +
 debian/bacula-sd.manpages                          |   5 +-
 debian/changelog                                   |  22 +++-
 debian/control                                     | 139 ++++++++-------------
 debian/rules                                       |  25 +---
 .../scripts/generate-doc-dir-to-symlink-migration  |   2 +-
 28 files changed, 123 insertions(+), 150 deletions(-)

diff --cc debian/TODO
index 568086b,e3d1720..991936a
--- a/debian/TODO
+++ b/debian/TODO
@@@ -20,13 -22,11 +22,18 @@@ Wishlist
     http://www.bacula.org/7.4.x-manuals/en/main/New_Features_in_5_2_13.html#SECTION00658000000000000000
     https://lists.alioth.debian.org/pipermail/pkg-bacula-devel/2016-July/001536.html
     https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=699149
 +   Done:
 +        - setcap cap_dac_read_search+ep for /usr/sbin/bacula-fd via postinst
 +        - parsing variable ENABLE_NONROOT in bacula-fd init-script
 +   Missing:
 +        - decide if non-root should be default on Linux or not
 +        - adding ENABLE_NONROOT=true/false to /etc/default/bacula-fd
 +        - document way to do the systemd drop-in configuration to enable/disable non-root
+  * convert debian/copyright into machine readable format
+    use follow fragment in the headers
+    Files-Excluded: src/lib/sha1.c
+ 		   src/lib/sha1.h
+    see: https://wiki.debian.org/UscanEnhancements
  
  Review unmerged old changes:
  
diff --cc debian/changelog
index 9c31089,3a07b17..8225f80
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,21 +1,33 @@@
 +bacula (7.4.3+dfsg-4~fixuser1) UNRELEASED; urgency=medium
 +
 +  [ Sven Hartge ]
 +  * remove configuration option to change runtime user for director
 +    and storage daemon
 +  * add capability cap_dac_read_search to bacula-fd, making it possible
 +    to run as non-root in the future.
 +  * change bacula-fd init-script to make running as non-root configurable
 +    by the admin via /etc/default/bacula-fd
 +
 + -- Sven Hartge <sven at svenhartge.de>  Tue, 18 Jul 2016 23:59:59 +0200
 +
  bacula (7.4.3+dfsg-3) experimental; urgency=medium
  
-   [ Sven Hartge ]
-   * Fix dependencies between bacula-director-common and
-     bacula-director-DBTYPE to allow move of init-script
-     from the first to the second.
+   Reorganisation of packages, providing the necessary Breaks/Conflicts for
+   the transitions. Thanks to Sven Hartge for his help.
+ 
+   * Remove link /usr/bin/bconsole, finishing bconsole's transition to
+     /usr/sbin/ started in 5.0.3+dfsgreal-1
+   * Move all common files from bacula-diretor-DBTYPE to
+     bacula-director-common
+   * Move bcopy and btape from bacula-sd-DBTYPE to bacula-sd
+   * Move bscan into it's own package, making bacula-sd-DBTYPE obsolete
+   * Move libbacsql from bacula-common-DBTYPE to bacula-common
+   * Rename bacula-director-common to bacula-director
+   * Move init-scripts and systemd services files into bacula-director
+     (Closes: #832357)
+   * Added note to debian/NEWS
  
-  -- Sven Hartge <sven at svenhartge.de>  Wed, 20 Jul 2016 13:16:37 +0200
+  -- Carsten Leonhardt <leo at debian.org>  Mon, 01 Aug 2016 02:41:20 +0200
  
  bacula (7.4.3+dfsg-2) experimental; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git