From 51d48c7629932c077465fdba85a7f1fa899a9702 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 21 Aug 2014 18:52:21 +0200
Subject: [PATCH 1/5] CDB-3656 Removes revision from the extension version

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 98524ff..c8cf7a4 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,6 @@ UPGRADES = \
      $(SED) 's/$$/--$(EXTVERSION).sql/' | \
      $(SED) 's/ /--$(EXTVERSION).sql $(EXTENSION)--/g')
 
-REV=$(shell git describe)
 GITDIR=$(shell test -d .git && echo '.git' || cat .git | $(SED) 's/^gitdir: //')
 
 DATA_built = \
@@ -78,7 +77,7 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile
 	$(SED) -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@
 
 cartodb_version.sql: cartodb_version.sql.in Makefile $(GITDIR)/index
-	$(SED) -e 's/@@VERSION@@/$(EXTVERSION) $(REV)/' $< > $@
+	$(SED) -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@
 
 legacy_regress: $(REGRESS_OLD) Makefile
 	mkdir -p sql/test/

From 3d37b3646ec6ff13fe887c416fa62ad62caa8b6d Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 21 Aug 2014 19:01:19 +0200
Subject: [PATCH 2/5] Renames files to take advantage of markdown

---
 CONTRIBUTING => CONTRIBUTING.md | 0
 NEWS => NEWS.md                 | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename CONTRIBUTING => CONTRIBUTING.md (100%)
 rename NEWS => NEWS.md (100%)

diff --git a/CONTRIBUTING b/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING
rename to CONTRIBUTING.md
diff --git a/NEWS b/NEWS.md
similarity index 100%
rename from NEWS
rename to NEWS.md

From 2ef6d5901e95b597ba6b288d74c7b17cbc894fa5 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 21 Aug 2014 19:05:04 +0200
Subject: [PATCH 3/5] Fixes typos

---
 CONTRIBUTING.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 16843cc..affc544 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ in which those scripts are loaded.
 
 Scripts would be best coded in a way to be usable both for creation
 and upgrade of the objects. This means using CREATE OR REPLACE for
-the functions, and whatever it takes to check existance of any previous
+the functions, and whatever it takes to check existence of any previous
 version of objects in other cases.
 
 When used as an extension (probably always from version 0.2.0 onwards)
@@ -27,8 +27,8 @@ all the objects will be installed in a "cartodb" schema. Take this into
 account to fully-qualify internal calls to avoid (possibly dangerous)
 name clashes.
 
-Every new feature (as well as bugfixes) should come with a testcase,
-see next session.
+Every new feature (as well as bugfixes) should come with a test case,
+see next section.
 
 Writing testcases
 -----------------
@@ -58,4 +58,3 @@ Starting with 0.2.0, the in-place reload can be done with an ad-hoc function:
 ```sql
 SELECT cartodb.cdb_extension_reload();
 ```
-

From 5b0a7bf9ad77aadd7884fed61e9ac98fbbcb9013 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Thu, 21 Aug 2014 19:05:15 +0200
Subject: [PATCH 4/5] Adds highlighting

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4e710f9..ed38bff 100644
--- a/README.md
+++ b/README.md
@@ -20,12 +20,16 @@ Dependencies
 Install
 -------
 
- make all install
+```sh
+make all install
+```
 
 Test installation
 -----------------
 
- make installcheck
+```sh
+make installcheck
+```
 
 NOTE: if ``test_ddl_triggers`` fails it's likely due to an incomplete
       installation of schema_triggers: you need to add ``schema_triggers.so``

From 7840e7c50bf5618cc02105d7b3d44186f954c4e0 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 25 Aug 2014 12:00:45 +0200
Subject: [PATCH 5/5] Prepares version 0.4.0 with new versioning mechanism

---
 Makefile | 3 ++-
 NEWS.md  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c8cf7a4..af13296 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # cartodb/Makefile
 
 EXTENSION = cartodb
-EXTVERSION = 0.3.6
+EXTVERSION = 0.4.0
 
 SED = sed
 
@@ -26,6 +26,7 @@ UPGRADABLE = \
   0.3.3 \
   0.3.4 \
   0.3.5 \
+  0.3.6 \
   $(EXTVERSION)dev \
   $(EXTVERSION)next \
   $(END)
diff --git a/NEWS.md b/NEWS.md
index 4c01d7c..d86cc34 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,7 @@
 0.4.0 (2014-mm-dd)
 ------------------
 Added CDB_Math_Mode function
+Changes in versioning: no revision is attached so it no longer uses `git describe` for the version.
 
 0.3.6 (2014-08-11)
 ------------------