From 09cf368d62134bdc06d4b02ef68b8455b5d9648f Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 23 May 2014 17:40:14 +0200
Subject: [PATCH] Move DDL triggers and extension postamble under
 scripts-available

Target 0.2.0
---
 Makefile                                                  | 8 ++++----
 NEWS                                                      | 4 ++++
 .../CDB_DDLTriggers.sql                                   | 0
 .../CDB_ExtensionPost.sql                                 | 0
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename cartodb_hooks.sql => scripts-available/CDB_DDLTriggers.sql (100%)
 rename cartodb_config_dump.sql => scripts-available/CDB_ExtensionPost.sql (100%)

diff --git a/Makefile b/Makefile
index 3aafbe9..2631263 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,14 @@
 # cartodb/Makefile
 
 EXTENSION = cartodb
-EXTVERSION = 0.1.0
+EXTVERSION = 0.2.0dev
 
 CDBSCRIPTS = \
   scripts-available/CDB_Roles.sql \
   scripts-enabled/*.sql \
   scripts-available/CDB_SearchPath.sql \
+  scripts-available/CDB_DDLTriggers.sql \
+  scripts-available/CDB_ExtensionPost.sql \
   $(END)
 
 DATA_built = \
@@ -25,15 +27,13 @@ PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
-$(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_hooks.sql cartodb_version.sql cartodb_config_dump.sql Makefile 
+$(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_version.sql Makefile 
 	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
 	cat $(CDBSCRIPTS) | \
     sed -e 's/\<public\./cartodb./g' \
         -e 's/:DATABASE_USERNAME/cdb_org_admin/g' >> $@
 	echo "GRANT USAGE ON SCHEMA cartodb TO public;" >> $@
-	cat cartodb_hooks.sql >> $@
 	cat cartodb_version.sql >> $@
-	cat cartodb_config_dump.sql >> $@
 
 $(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION)--$(EXTVERSION).sql util/create_from_unpackaged.sh Makefile
 	./util/create_from_unpackaged.sh $(EXTVERSION)
diff --git a/NEWS b/NEWS
index 530e3b5..7dc6e8d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.2.0dev - 2014-MM-DD
+------------------
+
+
 0.1.0 - 2014-05-23
 ------------------
 
diff --git a/cartodb_hooks.sql b/scripts-available/CDB_DDLTriggers.sql
similarity index 100%
rename from cartodb_hooks.sql
rename to scripts-available/CDB_DDLTriggers.sql
diff --git a/cartodb_config_dump.sql b/scripts-available/CDB_ExtensionPost.sql
similarity index 100%
rename from cartodb_config_dump.sql
rename to scripts-available/CDB_ExtensionPost.sql