From bd06ec00910b34429ad8684c8fed23d5d87659f2 Mon Sep 17 00:00:00 2001
From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Sat, 10 Nov 2012 16:08:19 +0000
Subject: [PATCH] Program metadata version moved to 1.2dev0

---
 META.json                                           |  4 ++--
 lib/.gitignore                                      |  3 ++-
 lib/Makefile                                        | 13 ++++++++++---
 ...ged--1.0.sql => pg_reorg--unpackaged--1.1.8.sql} |  2 +-
 lib/pg_reorg.control                                |  2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)
 rename lib/{pg_reorg--unpackaged--1.0.sql => pg_reorg--unpackaged--1.1.8.sql} (97%)

diff --git a/META.json b/META.json
index cf96247..bb2f415 100644
--- a/META.json
+++ b/META.json
@@ -2,7 +2,7 @@
    "name": "pg_reorg",
    "abstract": "PostgreSQL module for data reorganization",
    "description": "pg_reorg is a PostgreSQL module allowing to reorganize a table without any locks.",
-   "version": "1.1.7",
+   "version": "1.2dev0",
    "maintainer": "Takahiro Itagaki",
    "tags": [ "bloat", "maintenance", "vacuum", "cluster" ],
    "release_status": "stable",
@@ -10,7 +10,7 @@
    "provides": {
       "pg_reorg": {
          "file": "lib/pg_reorg.sql",
-         "version": "1.1.7",
+         "version": "1.2dev0",
          "abstract": "PostgreSQL module for data reorganization"
       }
    },
diff --git a/lib/.gitignore b/lib/.gitignore
index 0903fca..1edd29c 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,3 +1,4 @@
 /.deps/
 /pg_reorg.sql
-/pg_reorg--1.0.sql
+/pg_reorg--[0-9.]*.sql
+/pg_reorg--unpackaged--[0-9.]*.sql
diff --git a/lib/Makefile b/lib/Makefile
index 307562c..4aeb754 100755
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,9 +9,16 @@ OBJS = reorg.o pgut/pgut-be.o pgut/pgut-spi.o
 
 EXTENSION = pg_reorg
 
+# The version of the extension, read from the .control file.
+# Note that it doesn't need to be the same of the library version: it should
+# be increased only when the sql changes.
+EXTVER = $(shell grep -e '^default_version' $(EXTENSION).control \
+	| sed -e "s/[^']*'\([^']*\)'.*/\1/")
+
 #supports both EXTENSION (for >=9.1) and without_EXTENSION (for <PG 9.1)
-DATA_built = pg_reorg.sql pg_reorg--1.0.sql
-DATA = pg_reorg--unpackaged--1.0.sql uninstall_pg_reorg.sql
+DATA_built = pg_reorg.sql pg_reorg--$(EXTVER).sql
+DATA = pg_reorg--unpackaged--1.1.8.sql uninstall_pg_reorg.sql
+
 ifndef USE_PGXS
 top_builddir = ../../..
 makefile_global = $(top_builddir)/src/Makefile.global
@@ -40,6 +47,6 @@ pg_reorg.sql: pg_reorg.sql.in
 	sed 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< >> $@; \
 	echo "\nCOMMIT;" >> $@;
 
-pg_reorg--1.0.sql: pg_reorg.sql.in
+pg_reorg--$(EXTVER).sql: pg_reorg.sql.in
 	echo '\echo Use "CREATE EXTENSION pg_reorg" to load this file. \quit' > $@; \
 	cat $< >> $@;
diff --git a/lib/pg_reorg--unpackaged--1.0.sql b/lib/pg_reorg--unpackaged--1.1.8.sql
similarity index 97%
rename from lib/pg_reorg--unpackaged--1.0.sql
rename to lib/pg_reorg--unpackaged--1.1.8.sql
index f695da6..f95d47d 100644
--- a/lib/pg_reorg--unpackaged--1.0.sql
+++ b/lib/pg_reorg--unpackaged--1.1.8.sql
@@ -1,4 +1,4 @@
-/* pg_reorg/pg_reorg--unpackaged--1.0.sql */
+/* pg_reorg/pg_reorg--unpackaged--1.1.8.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pg_reorg FROM unpackaged" to load this file. \quit
diff --git a/lib/pg_reorg.control b/lib/pg_reorg.control
index e001348..44420e9 100644
--- a/lib/pg_reorg.control
+++ b/lib/pg_reorg.control
@@ -1,6 +1,6 @@
 # pg_reorg extension
 comment = 're-organizes a PostgreSQL database'
-default_version = '1.0'
+default_version = '1.2dev0'
 module_pathname = '$libdir/pg_reorg'
 relocatable = false
 schema = reorg