[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-138-gc5680bf
Alexander Golovko
alexandro at ankalagon.ru
Fri Jun 1 18:44:23 UTC 2012
The following commit has been merged in the master branch:
commit c5680bf70bb1472458c0c3656771a41829f3e69e
Merge: 98b3c297418bc573d587725ec35eea904e0aec22 570e78a524649de0649b3b901784bc43cc4939ee
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Fri Jun 1 22:42:53 2012 +0400
Merge branch 'development2'
570e78a - applied
007c95d - applied
diff --combined debian/bacula-director-mysql.install
index 83fd407,0000000..d129c9f
mode 100644,000000..100644
--- a/debian/bacula-director-mysql.install
+++ b/debian/bacula-director-mysql.install
@@@ -1,6 -1,0 +1,7 @@@
+etc/bacula/scripts/make_mysql_tables usr/share/bacula-director
+etc/bacula/scripts/update_mysql* usr/share/bacula-director
+etc/bacula/scripts/*catalog_backup
+etc/bacula/scripts/*catalog_backup.pl
++debian/additions/mysql/make_catalog_backup_awk etc/bacula/scripts
+usr/sbin/bacula-dir
+usr/sbin/dbcheck
diff --combined debian/bacula-director-pgsql.install
index 0557e23,0000000..259103d
mode 100644,000000..100644
--- a/debian/bacula-director-pgsql.install
+++ b/debian/bacula-director-pgsql.install
@@@ -1,8 -1,0 +1,9 @@@
+etc/bacula/scripts/make_postgresql_tables usr/share/bacula-director
+etc/bacula/scripts/grant_postgresql_privileges usr/share/bacula-director
+etc/bacula/scripts/update_postgres* usr/share/bacula-director
+etc/bacula/scripts/*catalog_backup
+etc/bacula/scripts/*catalog_backup.pl
++debian/additions/pgsql/make_catalog_backup_awk etc/bacula/scripts
+usr/sbin/bacula-dir
+usr/sbin/dbcheck
- debian/additions/pgsql usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
++debian/additions/pgsql/database/pgsql usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
diff --combined debian/bacula-director-sqlite3.install
index 6d6e9f0,0000000..2dffcce
mode 100644,000000..100644
--- a/debian/bacula-director-sqlite3.install
+++ b/debian/bacula-director-sqlite3.install
@@@ -1,6 -1,0 +1,7 @@@
+etc/bacula/scripts/make_sqlite*tables usr/share/bacula-director
+etc/bacula/scripts/update_sqlite* usr/share/bacula-director
+etc/bacula/scripts/*catalog_backup
+etc/bacula/scripts/*catalog_backup.pl
++debian/additions/sqlite3/make_catalog_backup_awk etc/bacula/scripts
+usr/sbin/bacula-dir
+usr/sbin/dbcheck
diff --combined debian/rules
index 6ea808d,3a52b53..a174d91
--- a/debian/rules
+++ b/debian/rules
@@@ -7,6 -7,10 +7,6 @@@ 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/
@@@ -25,15 -29,6 +25,15 @@@ CONF_ALL =
--libdir=\$${prefix}/lib/bacula \
--enable-batch-insert \
--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 \
@@@ -44,9 -39,7 +44,9 @@@
--with-pid-dir=/var/run/bacula \
--with-smtp-host=localhost \
--with-working-dir=/var/lib/bacula \
- --with-subsys-dir=/var/lock
+ --with-subsys-dir=/var/lock \
+ --with-dump-email=root \
+ --with-job-email=root
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
CONF_ALL += --disable-acl --disable-xattr
@@@ -66,32 -59,6 +66,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
@@@ -112,17 -79,13 +112,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.
@@@ -141,7 -104,6 +141,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)
@@@ -149,13 -111,11 +149,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
@@@ -168,22 -128,26 +168,23 @@@ override_dh_strip
dh_strip
override_dh_makeshlibs:
- dh_makeshlibs -n
+ dh_makeshlibs -n -Xbpipe-fd.so
+
+override_dh_clean:
+ $(foreach db,$(VARIANTS),$(call db-templates-cleanup,$(db)))
+ dh_autotools-dev_restoreconfig
+ 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
+ chmod +x debian/bacula-sd/etc/bacula/scripts/make_catalog_backup_awk
+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