[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 954d7f7cacf449e5e4fef7e131734c17cdb1bfc8
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sat May 19 13:48:34 2012 +0400

    Fix dbconfig-common regression
    
    After merging "1b033cf Rewrite debian/rules to use debhelper 7" there was
    troubles with incorrect files for dbconfig-common
    Now this problems solved, installed files differ from pre-merged only in
    empty line.
    
    Add removing "USE .." statement, missed in remove-use-statement-for-mysql patch

diff --git a/debian/patches/remove-use-statement-for-mysql b/debian/patches/remove-use-statement-for-mysql
index 6682294..3e7f546 100644
--- a/debian/patches/remove-use-statement-for-mysql
+++ b/debian/patches/remove-use-statement-for-mysql
@@ -18,3 +18,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 --git a/debian/rules b/debian/rules
index 5fa3643..ea253ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,9 +128,9 @@ override_dh_install:
 	# 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

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