From b18348d854ec999c08d2cc431df871b9b4062b18 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Mon, 31 Jan 2011 00:40:12 +0100
Subject: [PATCH] Insert release date into ChangeLog, fix NL upgrade script.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---
 ChangeLog                                                   |  2 +-
 .../{1.1.0/20_newsletter.sql => 1.0.2/10_newsletter.sql}    |  4 ++--
 upgrade/1.0.2/update.sh                                     | 13 +++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)
 rename upgrade/{1.1.0/20_newsletter.sql => 1.0.2/10_newsletter.sql} (99%)
 create mode 100755 upgrade/1.0.2/update.sh

diff --git a/ChangeLog b/ChangeLog
index 86860f0..4b6ad77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ================================================================================
-VERSION 1.0.2                                                         XX XX XXXX
+VERSION 1.0.2                                                         31 01 2011
 
 Bug/Wish:
 
diff --git a/upgrade/1.1.0/20_newsletter.sql b/upgrade/1.0.2/10_newsletter.sql
similarity index 99%
rename from upgrade/1.1.0/20_newsletter.sql
rename to upgrade/1.0.2/10_newsletter.sql
index 24ced53..5ffc573 100644
--- a/upgrade/1.1.0/20_newsletter.sql
+++ b/upgrade/1.0.2/10_newsletter.sql
@@ -10,7 +10,7 @@ CREATE TABLE newsletters (
   group_id smallint(5) UNSIGNED NOT NULL,
   name varchar(255) NOT NULL,
   custom_css BOOL NOT NULL DEFAULT FALSE,
-  criteria SET('axid', 'promo', 'geo') DEFAUL NULL,
+  criteria SET('axid', 'promo', 'geo') DEFAULT NULL,
   PRIMARY KEY (id),
   UNIQUE KEY  (group_id),
   FOREIGN KEY (group_id) REFERENCES groups (id)
@@ -113,7 +113,7 @@ LEFT JOIN  newsletter_issues AS ni ON (ni.nlid = @idnl_xorg AND ni.short_name =
 
 ALTER TABLE newsletter_art ADD FOREIGN KEY (id) REFERENCES newsletter_issues (id)
                                                 ON UPDATE CASCADE
-                                                ON DELETE CASCADE
+                                                ON DELETE CASCADE;
 
 --------------------
 -- newsletter_ins --
diff --git a/upgrade/1.0.2/update.sh b/upgrade/1.0.2/update.sh
new file mode 100755
index 0000000..71bca66
--- /dev/null
+++ b/upgrade/1.0.2/update.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+. ../inc/pervasive.sh
+
+###########################################################
+[ "$DATABASE" != "x4dat" ] || die "Cannot target x4dat"
+copy_db
+
+confirm "* Running database upgrade scripts"
+mysql_run_directory .
+
+confirm "* Running upgrade scripts"
+script_run ./geocoding.php
-- 
2.1.4