[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-109-ga0cfd0f
Alexander Golovko
alexandro at ankalagon.ru
Sun May 27 00:35:23 UTC 2012
The following commit has been merged in the master branch:
commit 98f76ac3ecbb49ecfbf1bd66ef075faf824735e3
Merge: 0958b5a273ef2746b239d7cba21be90c1638afa8 d0e1b3d487ad56942062856b043e6a06d3df39ee
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Sat May 26 17:22:42 2012 +0400
Merge commit 'd0e1b3d'
112e36a - applied (+add missed simlink to old place)
b70a7d2 - applied
d77e917 - applied
8ea9585 - applied
543cf3c - applied
0f0ac94 - partially applied. This job already done for previously merged
patches
0e942e7 - rejected
d648252 - applied
b96eb25 - applied
d0e1b3d - applied
+ add records to changelog
diff --combined debian/bacula-common.install
index 0a5974d,3bb437b..eac8dd5
--- a/debian/bacula-common.install
+++ b/debian/bacula-common.install
@@@ -5,12 -5,4 +5,12 @@@ usr/lib/bacula/libbac.s
usr/lib/bacula/libbac-*.so
usr/lib/bacula/libbacpy*.so
usr/sbin/btraceback usr/lib/bacula
- usr/sbin/bsmtp usr/lib/bacula
+ usr/sbin/bsmtp
+debian/additions/common-functions.init usr/share/bacula-common
+debian/additions/common-functions.dpkg usr/share/bacula-common
+etc/bacula/tray-monitor.conf usr/share/bacula-common/defconfig
+etc/bacula/bat.conf usr/share/bacula-common/defconfig
+etc/bacula/bconsole.conf usr/share/bacula-common/defconfig
+etc/bacula/bacula-sd.conf usr/share/bacula-common/defconfig
+etc/bacula/bacula-fd.conf usr/share/bacula-common/defconfig
+etc/bacula/bacula-dir.conf usr/share/bacula-common/defconfig
diff --combined debian/bacula-common.links
index 6d3db3e,f795c45..2684796
--- a/debian/bacula-common.links
+++ b/debian/bacula-common.links
@@@ -1,3 -1,2 +1,3 @@@
usr/lib/bacula/btraceback usr/sbin/btraceback
- usr/lib/bacula/bsmtp usr/lib/bacula/smtp
- usr/lib/bacula/bsmtp usr/sbin/bsmtp
++usr/sbin/bsmtp usr/lib/bacula/bsmtp
+ usr/sbin/bsmtp usr/lib/bacula/smtp
diff --combined debian/changelog
index a826206,9891987..8ba133a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,91 -1,3 +1,104 @@@
+bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
+
+ [ Alexander Golovko ]
+ * debian/patches/switch-nonfree-sha1-to-openssl.patch
+ (Closes: #658326):
+ + switch from upstream nonfree SHA1 implementation to openssl
+ * debian/patches/fix-binutils-gold-linking.patch (Closes: #553956):
+ + fix linking with binutils-gold.
+ * debian/patches/fix-readline-ncurses-depends.patch
+ (Closes: #646730):
+ + fix ncurses requirement for readline-compiled bconsole, thanks
+ to Sven Joachim <svenjoac at gmx.de>.
+ * debian/*:
+ + Add seamless migrating from /etc/bacula/do_not_run to /etc/default/*.
+ + cleanup maintainer scripts.
+
+ [ Bartosz Cisek ]
+ * debian/rules:
+ + fix --with-dir-passowrd= typo.
+
+ [ Ben Hutchings ]
+ * debian/control:
+ + add autoconf to Build-Depends:.
+ * debian/patches/fix-mysql-autoconf.patch:
+ + fix FTBFS with multi-arch libmysqlclient-dev (Closes: #672765).
+ * debian/rules:
+ + recreate configure script on build.
+
+ [ Jan Hauke Rahm ]
+ * debian/*:
+ + rework patching to use 3.0 (quilt).
+ + rewrite to use debhelper.
+ + add init scripts /etc/default processing for enabling, config path
+ 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.
+ + make all maintainer scripts bash-independent.
+ * debian/bacula-director-mysql.script.5.0.0,
+ debian/rules:
+ - remove lenny->squeeze upgrade path.
+ + don't add useless call to ldconfig.
++ + Remove executable bit on config file and README.
+ * debian/bacula-director-sqlite3.config,
+ debian/bacula-director-sqlite3.postinst,
+ debian/control:
+ - remove sqlite->sqlite3 upgrade path (lenny->squeeze) (Closes: #612352).
+ + update git-repository url.
+ + fix bacula log dir.
+ + fix typo in package descriptions.
+ + drop old (versions of) dependencies and conflicts.
++ + White space and line breaks clean-up.
++ + Upper-case Bacula as it's a name.
++ + Remove reference to qwt.
+ * debian/bacula-traymonitor.links:
+ + also link the man page for traymonitor.
+ * debian/bacula-director-common.bacula-director.init,
+ debian/bacula-fd.init, debian/bacula-sd.init (Closes: #608600):
+ + Fix: init scripts fail if daemon already running
+ * debian/*.init, debian/*.bacula-director.init.in:
+ + Add LSB Short-Description.
+ * debian/patches/remove-use-statement-for-mysql:
+ + remove "use <dbname>" statement from database setup/update
+ scripts because we can't provide correct database name in it.
+ * debian/*bacula-director.init:
+ + move bacula-director init script from bacula-director-common
+ package into bacula-director-<dbtype> packages.
+ * debian/*.install (Closes: #621282):
+ + stop shipping .la files.
+ * debian/NEWS:
+ + Add significant changes since last release.
+ * debian/patches/fix-example-script-syntax, debian/patches/series:
+ + Fix a syntax error in example script.
+ * debian/bacula-console-qt.menu:
+ + Change menu section of console-qt Apps/System ->
+ Applications/System/Administration.
++ * debian/patches/fix-default-config, debian/bacula-common.links,
++ debian/bacula-common.install:
++ + Move bsmtp to /usr/sbin as intended by upstream. Symlinks in old place
++ provided.
++ * debian/patches/fix-manpages, debian/patches/series:
++ + Fix errors in manpages.
++ * debian/additions/bregex.8, debian/additions/bwild.8,
++ debian/bacula-director-common.manpages:
++ + Add manual pages for /usr/sbin/b{wild,regex}.
+
+ [ Luca Capello ]
+ * debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch:
+ + import from Git commit:fc7990a.
+ * debian/README.Debian:
+ + explain why upstream sources are not DFSG-free.
+
+ [ Martin Pitt ]
+ * debian/control (Closes: #639466):
+ + update libpq-dev Build-Depends: to 9.1.
+ + Build-Depends: on postgresql-server-dev-all.
+ + leave only the unversioned postgresql-client package in
+ bacula-director-pgsql's Depends: and Recommends:.
+
+ --
+
bacula (5.0.3-1) unstable; urgency=low
* [27362ff7] Adopted by bacula packaging group (Closes: #612296)
diff --combined debian/control
index 663dcc0,d66f36f..12a9ae5
--- a/debian/control
+++ b/debian/control
@@@ -3,14 -3,11 +3,11 @@@ Section: admi
Priority: optional
Maintainer: Debian Bacula packaging Group <pkg-bacula-devel at lists.alioth.debian.org>
Uploaders: Jan Hauke Rahm <jhr at debian.org>
-Build-Depends: autotools-dev, debhelper (>= 8.1.3), po-debconf, zlib1g-dev,
- libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev
- (>= 8.4), postgresql-server-dev-8.4, libwrap0-dev, python-dev, libgtk2.0-dev,
+Build-Depends: autotools-dev, autoconf, debhelper (>= 8.1.3), po-debconf,
- zlib1g-dev, libreadline-dev, libjconv-dev,
- libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 9.1),
- 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
++ zlib1g-dev, libreadline-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev
++ (>= 9.1), 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, procps
++ libxt-dev, libqt4-dev, libssl-dev
Build-Conflicts: python2.4
Standards-Version: 3.9.2
Vcs-Browser: http://git.debian.org/?p=pkg-bacula/bacula.git;a=summary
@@@ -49,7 -46,7 +46,7 @@@ Package: bacula-common-db
Section: debug
Priority: extra
Architecture: any
- Depends: ${misc:Depends}, bacula-common (= ${binary:Version})
+ Depends: bacula-common (= ${binary:Version}), ${misc:Depends}
Description: backup system - debug symbols for the 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.
@@@ -135,7 -132,7 +132,7 @@@ Description: backup system - debug symb
Package: bacula-director-common
Architecture: any
Pre-Depends: bacula-common (= ${binary:Version})
- Depends: ${shlibs:Depends}, adduser, mailx, lsb-base, ${misc:Depends}
+ Depends: adduser, mailx, lsb-base, ${shlibs:Depends}, ${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.
@@@ -150,7 -147,7 +147,7 @@@ Package: bacula-director-common-db
Section: debug
Priority: extra
Architecture: any
- Depends: ${misc:Depends}, bacula-director-common (= ${binary:Version})
+ Depends: bacula-director-common (= ${binary:Version}), ${misc:Depends}
Description: backup system - debug symbols for the 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.
@@@ -164,7 -161,9 +161,9 @@@
Package: bacula-director-sqlite3
Architecture: any
- Depends: bacula-director-common (= ${binary:Version}), sqlite3, ${shlibs:Depends}, bacula-common-sqlite3 (>= ${binary:Version}), file, dbconfig-common, ucf, ${misc:Depends}
+ Depends: bacula-director-common (= ${binary:Version}), bacula-common-sqlite3
- (>= ${binary:Version}), sqlite3, file, dbconfig-common, ${shlibs:Depends},
- ${misc:Depends}
++ (>= ${binary:Version}), sqlite3, file, dbconfig-common, ucf,
++ ${shlibs:Depends}, ${misc:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
@@@ -199,7 -198,9 +198,9 @@@ Description: backup system - debug symb
Package: bacula-director-mysql
Architecture: any
- Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, mysql-client, ${shlibs:Depends}, bacula-common-mysql (>= ${binary:Version}), ucf, ${misc:Depends}
+ Depends: bacula-director-common (= ${binary:Version}), bacula-common-mysql
- (>= ${binary:Version}), dbconfig-common, mysql-client, ${shlibs:Depends},
- ${misc:Depends}
++ (>= ${binary:Version}), dbconfig-common, mysql-client, ucf,
++ ${shlibs:Depends}, ${misc:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
@@@ -235,11 -236,13 +236,13 @@@ Description: backup system - debug symb
Package: bacula-director-pgsql
Architecture: any
- Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, postgresql-client (>= 7.4), ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ucf, ${misc:Depends}
+ Depends: bacula-director-common (= ${binary:Version}), bacula-common-pgsql
- (>= ${binary:Version}), dbconfig-common, postgresql-client-8.4,
++ (>= ${binary:Version}), dbconfig-common, postgresql-client (>= 7.4), ucf,
+ ${shlibs:Depends}, ${misc:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
-Recommends: postgresql-8.4
+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
@@@ -272,7 -275,8 +275,8 @@@ Description: backup system - debug symb
Package: bacula-client
Architecture: all
- Depends: bacula-console (>= ${source:Version}), bacula-fd (>= ${source:Version}), ${misc:Depends}
+ Depends: bacula-console (>= ${source:Version}), bacula-fd
+ (>= ${source:Version}), ${misc:Depends}
Recommends: bacula-traymonitor
Description: network backup, recovery and verification - client metapackage
Bacula is a set of programs to manage backup, recovery and verification of
@@@ -287,7 -291,8 +291,8 @@@
Package: bacula-fd
Architecture: any
- Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends}, ucf, lsb-base, ${misc:Depends}
-Depends: bacula-common (= ${binary:Version}), lsb-base, ${shlibs:Depends},
++Depends: bacula-common (= ${binary:Version}), lsb-base, ucf, ${shlibs:Depends},
+ ${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
@@@ -310,11 -315,13 +315,13 @@@ Description: backup system - debug symb
responsible for providing the file attributes and data when requested by
the Director, and also for the file system-dependent part of restoration.
.
- This package contains the file director's debugging symbols.
+ This package contains the file daemon's debugging symbols.
Package: bacula-server
Architecture: all
- Depends: bacula-director-sqlite3 (>= ${source:Version})|bacula-director, bacula-sd (>= ${source:Version}), bacula-sd-sqlite3 (>= ${source:Version})|bacula-sd-tools, ${misc:Depends}
+ Depends: bacula-director-sqlite3 (>= ${source:Version}) | bacula-director,
+ bacula-sd (>= ${source:Version}), bacula-sd-sqlite3 (>= ${source:Version}) |
+ bacula-sd-tools, ${misc:Depends}
Recommends: bacula-fd
Description: network backup, recovery and verification - server metapackage
Bacula is a set of programs to manage backup, recovery and verification of
@@@ -326,8 -333,8 +333,8 @@@
Package: bacula-sd
Architecture: any
Pre-Depends: bacula-common (= ${binary:Version})
- Depends: ${shlibs:Depends}, mtx, python, lsb-base, ${misc:Depends}, ucf
- Recommends: mt-st, bacula-sd-sqlite3 (>= ${source:Version})|bacula-sd-tools
-Depends: mtx, python, lsb-base, ${shlibs:Depends}, ${misc:Depends}
++Depends: mtx, python, lsb-base, ucf, ${shlibs:Depends}, ${misc:Depends}
+ Recommends: mt-st, bacula-sd-sqlite3 (>= ${source:Version}) | bacula-sd-tools
Suggests: dds2tar, scsitools, sg3-utils
Description: network backup, recovery and verification - storage daemon
Bacula is a set of programs to manage backup, recovery and verification of
@@@ -360,7 -367,8 +367,8 @@@ Description: backup system - debug symb
Package: bacula-sd-sqlite3
Architecture: any
- Depends: bacula-sd (= ${binary:Version}), ${shlibs:Depends}, bacula-common-sqlite3 (>= ${binary:Version}), ${misc:Depends}
+ Depends: bacula-sd (= ${binary:Version}), ${shlibs:Depends},
+ bacula-common-sqlite3 (>= ${binary:Version}), ${misc:Depends}
Conflicts: bacula-sd-tools
Replaces: bacula-sd-tools
Provides: bacula-sd-tools
@@@ -395,7 -403,8 +403,8 @@@ Description: backup system - debug symb
Package: bacula-sd-mysql
Architecture: any
- Depends: bacula-sd (= ${binary:Version}), ${shlibs:Depends}, bacula-common-mysql (>= ${binary:Version}), ${misc:Depends}
+ Depends: bacula-sd (= ${binary:Version}), bacula-common-mysql
+ (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: bacula-sd-tools
Replaces: bacula-sd-tools
Provides: bacula-sd-tools
@@@ -430,7 -439,8 +439,8 @@@ Description: backup system - debug symb
Package: bacula-sd-pgsql
Architecture: any
- Depends: bacula-sd (= ${binary:Version}), ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ${misc:Depends}
+ Depends: bacula-sd (= ${binary:Version}), bacula-common-pgsql
+ (>= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Conflicts: bacula-sd-tools
Replaces: bacula-sd-tools
Provides: bacula-sd-tools
@@@ -465,7 -475,8 +475,8 @@@ Description: backup system - debug symb
Package: bacula-console
Architecture: any
- Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+ 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.
@@@ -493,7 -504,8 +504,8 @@@ Description: backup system - debug symb
Package: bacula-console-qt
Section: utils
Architecture: any
- Depends: bacula-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+ 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.
@@@ -501,7 -513,7 +513,7 @@@
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
+ 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
@@@ -519,7 -531,7 +531,7 @@@ Description: Bacula Administration Too
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
+ 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
@@@ -529,8 -541,9 +541,9 @@@
Package: bacula-traymonitor
Architecture: any
- Depends: ${shlibs:Depends}, bacula-common (= ${binary:Version}), ${misc:Depends}
- Suggests: kde|gnome-desktop-environment
+ 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.
diff --combined debian/patches/fix-example-script-syntax
index 78004b7,373883a..63395cb
--- a/debian/patches/fix-example-script-syntax
+++ b/debian/patches/fix-example-script-syntax
@@@ -1,8 -1,5 +1,9 @@@
- Description: fix syntax in example script for tape autochanger
-Fix a simple syntax error in an example script. It's not critical but might be
-annoying to user who want to simply run it.
++Description: Fix a simple syntax error in example script. It's not critical
++ but might be annoying to user who want to simply run it.
+Author: Jan Hauke Rahm <jhr at debian.org>
+Reviewed-by: Alexander Golovko <alexandro at ankalagon.ru>
+Last-Update: 2012-05-25
+
--- a/examples/autochangers/locking-mtx-changer
+++ b/examples/autochangers/locking-mtx-changer
@@ -61,7 +61,7 @@
diff --combined debian/patches/remove-use-statement-for-mysql
index 3e7f546,0a86fe1..fa565f8
--- a/debian/patches/remove-use-statement-for-mysql
+++ b/debian/patches/remove-use-statement-for-mysql
@@@ -1,3 -1,7 +1,7 @@@
+ Since SQL installations and upgrade are handled by dbconfig and these scripts
+ provided by upstream are simply processed and installed for dbconfig, the USE
+ statement they include needs to be dropped. dbconfig keeps track of what
+ database the user uses.
--- a/src/cats/make_mysql_tables.in
+++ b/src/cats/make_mysql_tables.in
@@ -7,7 +7,6 @@
@@@ -18,13 -22,3 +22,13 @@@
ALTER TABLE JobMedia DROP Stripe ;
ALTER TABLE JobMedia DROP Copy ;
+--- a/updatedb/update_mysql_tables_10_to_11.in
++++ b/updatedb/update_mysql_tables_10_to_11.in
+@@ -10,7 +10,6 @@
+ db_name=@db_name@
+
+ if $bindir/mysql $* -f <<END-OF-DATA
+-USE ${db_name};
+
+ -- Fix bad index on Media table
+ DROP INDEX inx8 ON Media;
diff --combined debian/patches/series
index 876f8a9,1362947..86451d6
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,7 +1,10 @@@
-fix-binutils-gold
+upstream-1623_debian-591293___file_jpfid_idx.patch
fix-default-config
fix-sql-bindir
+switch-nonfree-sha1-to-openssl.patch
+fix-binutils-gold-linking.patch
+fix-mysql-autoconf.patch
+fix-readline-ncurses-depends.patch
remove-use-statement-for-mysql
-fix-mysql-upgrade
fix-example-script-syntax
+ fix-manpages
diff --combined debian/rules
index ffd4f98,2dadb41..9fc8252
--- a/debian/rules
+++ b/debian/rules
@@@ -7,38 -7,37 +7,42 @@@ DBGPKGS := $(shell sed -n -e 's/Package
VARIANTS := pgsql mysql sqlite3
-# auto-generated files in debian/
-FILETYPES := install manpages config postinst postrm preinst prerm bacula-director.init templates lintian-overrides
-PACKAGES := director sd
-
######################################################################
DBC := usr/share/dbconfig-common/data/
- CONF_ALL = --enable-smartalloc \
- --with-python --with-tcp-wrappers \
+ CONF_ALL = \
+ --enable-smartalloc \
+ --with-python \
+ --with-tcp-wrappers \
--with-openssl \
- --with-libiconv-prefix=/usr/include --with-readline=/usr/include/readline \
+ --with-libiconv-prefix=/usr/include \
+ --with-readline=/usr/include/readline \
--disable-conio \
--with-libintl-prefix=/usr/include \
- --docdir=\$${prefix}/share/doc/bacula-common \
- --htmldir=\$${prefix}/share/doc/bacula-common/html \
- --libdir=\$${prefix}/lib/bacula \
+ --docdir=\$${prefix}/share/doc/bacula-common \
+ --htmldir=\$${prefix}/share/doc/bacula-common/html \
+ --libdir=\$${prefix}/lib/bacula \
--enable-batch-insert \
- --without-qwt \
--enable-ipv6 \
+ --with-dir-password=XXX_DIRPASSWORD_XXX \
+ --with-fd-password=XXX_FDPASSWORD_XXX \
+ --with-sd-password=XXX_SDPASSWORD_XXX \
+ --with-mon-dir-password=XXX_MONDIRPASSWORD_XXX \
+ --with-mon-fd-password=XXX_MONFDPASSWORD_XXX \
+ --with-mon-sd-password=XXX_MONSDPASSWORD_XXX \
+ --with-db-name=XXX_DBNAME_XXX \
+ --with-db-user=XXX_DBUSER_XXX \
+ --with-db-password=XXX_DBPASSWORD_XXX \
--config-cache \
--with-archivedir=/nonexistant/path/to/file/archive/dir \
- --sysconfdir=/etc/bacula --with-scriptdir=/etc/bacula/scripts \
+ --sysconfdir=/etc/bacula \
+ --with-scriptdir=/etc/bacula/scripts \
--sharedstatedir=/var/lib/bacula \
--localstatedir=/var/lib/bacula \
- --with-pid-dir=/var/run/bacula --with-smtp-host=localhost \
--with-logdir=/var/log/bacula \
+ --with-pid-dir=/var/run/bacula \
+ --with-smtp-host=localhost \
--with-working-dir=/var/lib/bacula \
--with-subsys-dir=/var/lock
@@@ -60,32 -59,6 +64,32 @@@ LONGNAME_sqlite3 = sqlite
###########################################################################
+# Macro for generate file for specified database from specified template
+# args: 1 -- template file
+# 2 -- db type
+define template-subst
+sed -e 's/XX_DB_XX/$(2)/' '$(1)' > '$(patsubst %.in,%,$(subst -db.,-$(2).,$(1)))';
+endef
+
+# Macro for cleanup file generated for specified database from specified template
+# args: 1 -- template file
+# 2 -- db type
+define template-cleanup
+rm -f '$(patsubst %.in,%,$(subst -db.,-$(2).,$(1)))';
+endef
+
+# Macro for generate from all templates files for specified database
+# args: 1 -- db type
+define db-templates-subst
+$(foreach template,$(wildcard debian/*-db.*.in),$(call template-subst,$(template),$(1)))
+endef
+
+# Macro for cleanup all files generated for specified database from templates
+# args: 1 -- db type
+define db-templates-cleanup
+$(foreach template,$(wildcard debian/*-db.*.in),$(call template-cleanup,$(template),$(1)))
+endef
+
%:
dh $@ --with autotools_dev
@@@ -106,17 -79,13 +110,17 @@@ override_dh_shlibdeps
override_dh_installinit:
dh_installinit -pbacula-sd -- defaults 90 10
dh_installinit -pbacula-fd -- defaults 91 9
- dh_installinit --name=bacula-director -pbacula-director-pgsql --no-start -- defaults 92 8
- dh_installinit --name=bacula-director -pbacula-director-mysql --no-start -- defaults 92 8
- dh_installinit --name=bacula-director -pbacula-director-sqlite3 --no-start -- defaults 92 8
+ dh_installinit -pbacula-director-pgsql --name=bacula-director -- defaults 92 8
+ dh_installinit -pbacula-director-mysql --name=bacula-director -- defaults 92 8
+ dh_installinit -pbacula-director-sqlite3 --name=bacula-director -- defaults 92 8
override_dh_install:
+ chmod 755 debian/additions/postinst-common
chmod 755 debian/scripts/install-dbconfig
- dh_install
+ dh_install \
+ -Nbacula-director-pgsql -Nbacula-sd-pgsql -Nbacula-common-pgsql \
+ -Nbacula-director-mysql -Nbacula-sd-mysql -Nbacula-common-mysql \
+ -Nbacula-director-sqlite3 -Nbacula-sd-sqlite3 -Nbacula-common-sqlite3
chmod 755 debian/bacula-common/usr/lib/bacula/btraceback
######### dbconfig-common stuff
# Sometimes the latest release doesn't have a copy of the data in updatedb.
@@@ -135,7 -104,6 +139,7 @@@ override_dh_installdocs
dh_installdocs -Nbacula
override_dh_auto_build: maintfiles
+ autoconf -I autoconf/ -o configure autoconf/configure.in
dh_prep
dh_installdirs
dh_auto_configure -- $(CONF_ALL) $(CONF_pgsql)
@@@ -143,13 -111,11 +147,13 @@@
dh_auto_install
dh_install -pbacula-director-pgsql -pbacula-sd-pgsql -pbacula-common-pgsql
dh_auto_clean
+ rm -rf debian/tmp
dh_auto_configure -- $(CONF_ALL) $(CONF_mysql)
dh_auto_build --parallel
dh_auto_install
dh_install -pbacula-director-mysql -pbacula-sd-mysql -pbacula-common-mysql
dh_auto_clean
+ rm -rf debian/tmp
dh_auto_configure -- $(CONF_ALL) $(CONF_sqlite3)
dh_auto_build --parallel
dh_auto_install
@@@ -164,14 -130,23 +168,19 @@@ override_dh_strip
override_dh_makeshlibs:
dh_makeshlibs -n
+override_dh_clean:
+ $(foreach db,$(VARIANTS),$(call db-templates-cleanup,$(db)))
+ dh_clean
+
+ override_dh_fixperms:
+ dh_fixperms
+ chmod -x debian/bacula-sd/etc/bacula/scripts/mtx-changer.conf
+ chmod -x debian/bacula-common/usr/share/doc/bacula-common/examples/nagios/check_bacula/README
+
+override_dh_prep:
override_dh_auto_configure:
override_dh_auto_test:
override_dh_auto_install:
maintfiles:
- for pkg in $(PACKAGES); do \
- for ft in $(FILETYPES); do \
- for var in $(VARIANTS); do \
- [ ! -f debian/bacula-$$pkg-db.$$ft.in ] || \
- sed -e "s/XX_DB_XX/$$var/g" debian/bacula-$$pkg-db.$$ft.in > debian/bacula-$$pkg-$$var.$$ft; \
- [ ! -f debian/bacula-$$pkg-$$var.$$ft.in ] || \
- cat debian/bacula-$$pkg-$$var.$$ft.in >> debian/bacula-$$pkg-$$var.$$ft; \
- done; \
- done; \
- done
+ $(foreach db,$(VARIANTS),$(call db-templates-subst,$(db)))
--
Bacula, a network backup, recovery and verification program
More information about the pkg-bacula-commits
mailing list