[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-109-ga0cfd0f

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 46ab93fcd0296d397c96eac8a057451e37896766
Merge: bbe3dd63a7a545a58696d69eee865087531bba56 a4382f047fcbd7d321e63fe323ef8f17504789a8
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Thu May 24 23:06:20 2012 +0400

    Merge commit 'a4382f0'

diff --combined debian/rules
index 5792acc,c598b52..3b6eb28
--- a/debian/rules
+++ b/debian/rules
@@@ -27,7 -27,7 +27,7 @@@ CONF_ALL	= --enable-smartalloc 
  	--enable-batch-insert \
  	--without-qwt \
  	--enable-ipv6 \
 -	--with-dir-passowrd=XXX_DIRPASSWORD_XXX \
 +	--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 \
@@@ -42,6 -42,7 +42,7 @@@
  	--sharedstatedir=/var/lib/bacula \
  	--localstatedir=/var/lib/bacula \
  	--with-pid-dir=/var/run/bacula --with-smtp-host=localhost \
+ 	--with-logdir=/var/log/bacula \
  	--with-working-dir=/var/lib/bacula \
  	--with-subsys-dir=/var/lock
  
@@@ -90,32 -91,6 +91,32 @@@ define ext-install-d
  mkdir -p debian/bacula-director-$(1)/$(DBC)/bacula-director-$(1)/install && debian/scripts/extract_here < $(CURDIR)/src/cats/make_$(LONGNAME_$(1))_tables.in > debian/bacula-director-$(1)/$(DBC)/bacula-director-$(1)/install/$(1)
  endef
  
 +# 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
  
@@@ -136,17 -111,13 +137,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/extract_here
 -	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.
@@@ -154,9 -125,9 +155,9 @@@
  	# versions to an ext-upgrade-db line.
  	#
  	# lenny -> squeeze is 10 -> 12
 -	$(foreach db,$(VARIANTS),$(call ext-upgrade-db,$(db),10_to_11,3.0.0))
 -	$(foreach db,$(VARIANTS),$(call ext-upgrade-latest-db,$(db),5.0.0))   # 5.0.0 upgrade 11 to 12
 -	$(foreach db,$(VARIANTS),$(call ext-install-db,$(db)))
 +	$(foreach db,$(VARIANTS),$(call ext-upgrade-db,$(db),10_to_11,3.0.0);)
 +	$(foreach db,$(VARIANTS),$(call ext-upgrade-latest-db,$(db),5.0.0);)   # 5.0.0 upgrade 11 to 12
 +	$(foreach db,$(VARIANTS),$(call ext-install-db,$(db));)
  
  override_dh_installdocs:
  	dh_installdocs -pbacula --link-doc=bacula-common
@@@ -166,7 -137,6 +167,7 @@@
  	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)
@@@ -174,13 -144,11 +175,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
@@@ -195,14 -163,18 +196,14 @@@ override_dh_strip
  override_dh_makeshlibs:
  	dh_makeshlibs -n
  
 +override_dh_clean:
 +	$(foreach db,$(VARIANTS),$(call db-templates-cleanup,$(db)))
 +	dh_clean
 +
 +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