[pkg-bacula-devel] Current status of merging development2 branch

Sun May 27 00:40:22 UTC 2012

Hi!

There is a list of changes in binary packages, builded from revision
0f4409a468a6749837e6b852024b6a52f93c74cb (revision before merge) and
a0cfd0fd8d5d7cc420828f21d7ab4a30211f3b44 (current last commit).

I try do not miss anything significant, but will see later...

###############################################################################
Changes in installed files
###############################################################################

/usr/lib/bacula/*.la:
  - removed

/var/lib/bacula/log:
  - removed (packages now builded with correct log dir)

/usr/share/lintian/overrides/bacula-fd:
  - removed useless override

/usr/share/doc/bacula-common/examples/nagios/check_bacula/Makefile.gz:
  - added (but subject for remove)

Packages with debug symbols:
  - added

/etc/bacula/bconsole.conf:
  - added (subject for remove?)

/usr/share/man/man8/bregex.8.gz,
/usr/share/man/man8/bwild.8.gz:
  - added manpages

/usr/share/bacula-common/common-functions:
  - splitted to common-functions.init and common-functions.dpkg

/etc/init.d/bacula-director:
  - moved from bacula-director-common package to 
bacula-director-<dbtype>

/usr/share/man/man1/bacula-tray-monitor.1.gz,
/usr/share/man/man8/dbcheck.8.gz,
/usr/share/man/man1/bsmtp.1.gz,
/usr/share/man/man1/bat.1.gz,
/usr/share/doc/bacula-common/examples/autochangers/locking-mtx-changer:
  - fixed syntax errors in upstream files

/usr/share/bacula-director/make_mysql_tables,
/usr/share/bacula-director/update_mysql_tables:
  - fixed bindir regression
  - removed "USE <database>" statement. But this statement was 
incorrect, so this has no matter.

/usr/share/dbconfig-common/data/bacula-director-mysql/*:
  - changes in one empty line.

/etc/bacula/scripts/make_catalog_backup,
/etc/bacula/scripts/make_catalog_backup.pl:
  - for mysql fixed bindir regression

/usr/share/doc/bacula-common/README.Debian.gz:
  - reflect changes about removing bconsole wrapper

/usr/share/lintian/overrides/bacula-console,
/usr/share/lintian/overrides/bacula-console-qt:
  - added wrong strings (subject for remove)

/usr/bin/bconsole, /usr/sbin/bacula-console:
  - bconsole was shell wrapper, but now vanilla bconsole search it 
config in the same place,
    so this wrapper removed. for compatibility provided simlink, so no 
changes for users

/etc/init.d/bacula-fd, /etc/init.d/bacula-sd, 
/etc/init.d/bacula-director:
  - add reading additional daemon parameters from /etc/default/<name>
  - add enabling/disabling daemon in /etc/default/<name>
  - remove enabling/disabling daemon by creating /etc/bacula/do_not_run

/usr/share/menu/bacula-console-qt:
  - fixed menu section

chagelog.Debian.gz, NEWS.Debian.gz:
  - see this files.

###############################################################################
Changes in packages metadata:
###############################################################################

bacula-common/postinst, bacula-common/postrm, bacula-common/preinst,
  bacula-console/postinst, bacula-console/postrm, 
bacula-traymonitor/postrm,
  bacula-sd/prerm, bacula-fd/prerm, bacula-director-sqlite3/prerm,
  bacula-director-mysql/prerm, bacula-director-pgsql/prerm,
  bacula-director-sqlite3/postrm, bacula-director-mysql/postrm,
  bacula-director-pgsql/postrm, new/bacula-director-sqlite3/config,
  new/bacula-director-mysql/config, new/bacula-director-pgsql/config:
  - cleanup some trash. no functional changes.

bacula-common-*/postint, bacula-common-*/postint, 
bacula-common/postinst,
  bacula-common/postrm, bacula-common/postinst, bacula-fd/postinst,
  bacula-fd/postrm, bacula-director-sqlite3/prerm,
  bacula-director-sqlite3/postrm:
  - removed unneeded ldconfig call

bacula-director-common/conffiles, bacula-director-sqlite3/conffiles,
  bacula-director-mysql/conffiles, bacula-director-pgsql/conffiles,
  bacula-director-sqlite3/prerm, bacula-director-mysql/prerm,
  bacula-director-pgsql/prerm, bacula-director-sqlite3/postinst,
  bacula-director-mysql/postinst, bacula-director-pgsql/postinst,
  bacula-director-common/postinst, bacula-director-common/postrm:
  - changes, related to bacula-director init script moving to
    bacula-director-<dbtype> packages.
  - bacula-director service stop/start is now handled by debhelper auto 
scripts

bacula-sd/postinst, bacula-sd/postrm, bacula-fd/postinst, 
bacula-fd/postrm,
  bacula-director-sqlite3/postinst, bacula-director-mysql/postinst,
  bacula-director-pgsql/postinst, bacula-director-sqlite3/postrm,
  bacula-director-mysql/postrm, bacula-director-pgsql/postrm,
  bacula-common/preinst:
  - manage /etc/default/<name>
  - remove do_not_run usage
  - migrate from do_not_run

bacula-common/postinst, bacula-director-sqlite3/postinst,
  bacula-director-mysql/postinst, bacula-director-pgsql/postinst:
  - include /usr/share/bacula-common/common-functions.dpkg instead of
    /usr/share/bacula-common/common-functions

bacula-console/conffiles:
  - added /etc/bacula/bconsole.conf (i think, this is merge error)

bacula-director-sqlite3/prerm, bacula-director-sqlite3/postrm:
  - fixed missed dbconfig-common call

bacula-director-sqlite3/config, bacula-director-mysql/config,
  bacula-director-pgsql/config:
  - some required changes for generate from one template. no functional 
changes.

###############################################################################
Changes in sources:
###############################################################################

A lot of. Most significant:

debian/rules is now use debhelper

bacula-director-<dbtype>.<file> now generates from 
bacula-director-db.<file>.in

###############################################################################
Some info about merges:
###############################################################################

This is not very accurate info, for details see merge commits.

* 570e78a Deploy alternative backup scripts
     NOT YET PROCESSED
* 007c95d Sort debian/additions a bit
     NOT YET PROCESSED
* d0e1b3d Drop unneeded build-dependency on libjconv-dev
     APPLIED
* b96eb25 Remove reference to qwt
     APPLIED
* d648252 Upper-case Bacula as it's a name
     APPLIED
* 0e942e7 Adjust bat.conf and bconsole.conf as well
     REJECTED
* 0f0ac94 Add (at least short) patch descriptions
     PARTIALLY APPLIED
* 543cf3c Add manual pages for /usr/sbin/b{wild,regex}
     APPLIED
* 8ea9585 Remove executable bit on config file and README
     APPLIED
* d77e917 Fix errors in man pages
     APPLIED
* b70a7d2 White space and line breaks clean-up
     APPLIED
* 112e36a Install bsmtp to /usr/sbin as intended by upstream
     APPLIED + fixes
* 70da38f Bump Standards-Version to 3.9.2
     APPLIED
* cb1524e Use perl script to handle dbconfig installs
     APPLIED + fixes
* 8b01282 Get rid of useless common-functions
     REJECTED
* 7799248 Add a few lintian overrides
     PARTYALLY APPLIED
* ac74473 Change menu section of console-qt
     APPLIED
* 565acf7 Drop old (versions of) dependencies and conflicts
     APPLIED
* a3ab56a Fix a syntax error in example script
     APPLIED
* 5c32749 Make all maintainer scripts bash-independent
     APPLIED
* e7da5dc Add LSB Short-Description
     APPLIED
* 6fdee4f Override missing templates files check
* 1ab14b5 Fix typo in package descriptions
     APPLIED
* 380beef Document changes
     APPLIED
* 4b7fa18 Don't set passwords at build time but ask for them
     REJECTED
* a4382f0 Properly set logdir
     APPLIED
* c370db1 Create common maintainer scripts at build time
     APPLIED
* dfb1b77 Decruft maintainer scripts
     APPLIED + fixes
* f968df9 Install conffiles, don't mess with them
     REJECTED
* 2d1b1b3 Make use of /etc/default/bacula-{fd,sd,dir}
     APPLIED + fixes
* 97a548c Don't add useless call to ldconfig
     APPLIED
* 21014db Add missing build-dependency on procps
     REJECTED
* 621a064 Update Vcs-* in debian/control
     APPLIED
* d71e346 Stop shipping .la files
     APPLIED
* 0a8a3fc Simplify installation process
     APPLIED + fixes
* 83aef16 Provide debug packages
     APPLIED
* 71e13ae Don't depend on build-essential packages
     APPLIED
* c38b949 Don't pre-depend on debconf
     APPLIED
* 0138151 Remove unneeded versions in dependencies
     APPLIED
* 97ed708 Re-enable mysql upgrade patch
     REJECTED
* 2cdfcfe Dropping /usr/bin/bconsole as it's defective by design
     APPLIED
* 1b033cf Rewrite debian/rules to use debhelper 7
     APPLIED

-- 
with best regards,
Alexander Golovko
email: alexandro at ankalagon.ru
xmpp: alexandro at ankalagon.ru