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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 5b0de43005053d61aced6aba17656d7741dbb404
Merge: 954d7f7cacf449e5e4fef7e131734c17cdb1bfc8 2cdfcfec4764ae6cde77c44f474bd521f7562e1d
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sat May 19 13:58:16 2012 +0400

    Merge commit '2cdfcfe'
    
    Differences from pre-merge commit 0f4409a:
     - init.d script moved from bacula-director to bacula-director-<dbtype>
       - differences in init.d scripts for pgsql and mysql
     - dbconfig-common data files for mysql differ only in one empty line
     - from make_mysql_tables and update_mysql_tables removed USE statement
     - /usr/bin/bconsole script replaced by vanilla /usr/sbin/bconsole
       /usr/sbin/bacula-console linked to /usr/sbin/bconsole

diff --combined debian/bacula-console.install
index 57963f9,0000000..7234b56
mode 100644,000000..100644
--- a/debian/bacula-console.install
+++ b/debian/bacula-console.install
@@@ -1,2 -1,0 +1,2 @@@
- debian/additions/bconsole		usr/bin
- debian/tmp-install-sqlite3/usr/sbin/bconsole usr/sbin/bacula-console
++debian/tmp-install-sqlite3/usr/sbin/bconsole usr/sbin
++debian/tmp-install-sqlite3/etc/bacula/bconsole.conf etc/bacula
diff --combined debian/rules
index ea253ae,6a01dd8..1d816aa
--- a/debian/rules
+++ b/debian/rules
@@@ -24,7 -24,7 +24,7 @@@ CONF_ALL	= --enable-smartalloc 
  	--disable-bwx-console \
  	--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 \
@@@ -119,7 -119,6 +119,6 @@@ override_dh_installinit
  override_dh_install:
  	chmod 755 debian/additions/postinst-common
  	chmod 755 debian/scripts/extract_here
- 	chmod 755 debian/additions/bconsole
  	dh_install
  	chmod 755 debian/bacula-common/usr/lib/bacula/btraceback
  	######### dbconfig-common stuff
@@@ -128,16 -127,15 +127,16 @@@
  	# 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
  	dh_installdocs -Nbacula
  
  override_dh_auto_build:
 +	autoconf -I autoconf/ -o configure autoconf/configure.in
  	dh_auto_configure -- $(CONF_ALL) $(CONF_pgsql)
  	dh_auto_build --parallel
  	dh_auto_install -- DESTDIR=$(INSTALLDIR)-pgsql

-- 
Bacula, a network backup, recovery and verification program