xml/version (etal) - Renumber 4.7.29 as 4.7.30

diff --git a/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl
index 228b4453f87700e9c277b01f4bff11d282b5b8f1..444a0ba0e1ee5cdb9d8ea2785bb33615ccc2c9ab 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl
@@ -1,16 +1 @@
 {* file to handle db changes in 4.7.29 during upgrade *}
-
--- CRM-21407 ISO compliance for German counties
-UPDATE `civicrm_state_province` SET `name` = 'Baden-Württemberg' WHERE `name` = 'Baden-Wuerttemberg' AND `country_id` = 1082;
-UPDATE `civicrm_state_province` SET `abbreviation` = 'BE' WHERE `name` = 'Berlin' AND `abbreviation` = 'BR' AND `country_id` = 1082;
-UPDATE `civicrm_state_province` SET `name` = 'Thüringen' WHERE `name` = 'Thueringen' AND `country_id` = 1082;
-
--- CRM-21378 Ensure that email abuse reports are treated as spam
-SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Spam';
-INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) VALUES (@bounceTypeID, 'abuse report');
-
-
--- CRM-21532 Add French state/departments
-SELECT @country_id := id from civicrm_country where name = 'France' AND iso_code = 'FR';
-INSERT INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES
-(NULL, @country_id, "52", "Haute-Marne");
\ No newline at end of file

diff --git a/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl
new file mode 100644 (file)
index 0000000..bd097d6
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/4.7.30.mysql.tpl
@@ -0,0 +1,16 @@
+{* file to handle db changes in 4.7.30 during upgrade *}
+
+-- CRM-21407 ISO compliance for German counties
+UPDATE `civicrm_state_province` SET `name` = 'Baden-Württemberg' WHERE `name` = 'Baden-Wuerttemberg' AND `country_id` = 1082;
+UPDATE `civicrm_state_province` SET `abbreviation` = 'BE' WHERE `name` = 'Berlin' AND `abbreviation` = 'BR' AND `country_id` = 1082;
+UPDATE `civicrm_state_province` SET `name` = 'Thüringen' WHERE `name` = 'Thueringen' AND `country_id` = 1082;
+
+-- CRM-21378 Ensure that email abuse reports are treated as spam
+SELECT @bounceTypeID := max(id) FROM civicrm_mailing_bounce_type WHERE name = 'Spam';
+INSERT INTO civicrm_mailing_bounce_pattern (bounce_type_id, pattern) VALUES (@bounceTypeID, 'abuse report');
+
+
+-- CRM-21532 Add French state/departments
+SELECT @country_id := id from civicrm_country where name = 'France' AND iso_code = 'FR';
+INSERT INTO `civicrm_state_province` (`id`, `country_id`, `abbreviation`, `name`) VALUES
+(NULL, @country_id, "52", "Haute-Marne");
\ No newline at end of file

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index c0783b4acfd1a5e6b6cad3b292f270629580b159..c1e212b1991c4ff1f67b480c3e102540e3bb1374 100644 (file)
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -399,7 +399,7 @@ UNLOCK TABLES;
 
 LOCK TABLES `civicrm_domain` WRITE;
 /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.29',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'4.7.30',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
 /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/xml/version.xml b/xml/version.xml
index 2d9306a70e71fa75a5be44503acdbd1982f711a0..6b6cf1f35d9c1efe17ae8db4f27bc9edbf54c31f 100644 (file)
--- a/xml/version.xml
+++ b/xml/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>4.7.29</version_no>
+  <version_no>4.7.30</version_no>
 </version>