From 0f8c33f72fdbb0edfa0531c94388ded496f9468a Mon Sep 17 00:00:00 2001
From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Sat, 10 Nov 2012 21:51:17 +0000
Subject: [PATCH] Don't use a generic 'unpackaged' version

The behaviour of the script is not really predictable if it is run on the
loose objects of pg_reorg >= 1.1.8. So let's be explicit about what version
we expect as starting point.
---
 lib/.gitignore                                                | 1 -
 lib/Makefile                                                  | 2 +-
 ...eorg--unpackaged--1.1.8.sql => pg_reorg--1.1.7--1.1.8.sql} | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename lib/{pg_reorg--unpackaged--1.1.8.sql => pg_reorg--1.1.7--1.1.8.sql} (91%)

diff --git a/lib/.gitignore b/lib/.gitignore
index 1edd29c..255dcb7 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,4 +1,3 @@
 /.deps/
 /pg_reorg.sql
 /pg_reorg--[0-9.]*.sql
-/pg_reorg--unpackaged--[0-9.]*.sql
diff --git a/lib/Makefile b/lib/Makefile
index 4aeb754..0e18238 100755
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -17,7 +17,7 @@ EXTVER = $(shell grep -e '^default_version' $(EXTENSION).control \
 
 #supports both EXTENSION (for >=9.1) and without_EXTENSION (for <PG 9.1)
 DATA_built = pg_reorg.sql pg_reorg--$(EXTVER).sql
-DATA = pg_reorg--unpackaged--1.1.8.sql uninstall_pg_reorg.sql
+DATA = pg_reorg--1.1.7--1.1.8.sql uninstall_pg_reorg.sql
 
 ifndef USE_PGXS
 top_builddir = ../../..
diff --git a/lib/pg_reorg--unpackaged--1.1.8.sql b/lib/pg_reorg--1.1.7--1.1.8.sql
similarity index 91%
rename from lib/pg_reorg--unpackaged--1.1.8.sql
rename to lib/pg_reorg--1.1.7--1.1.8.sql
index f95d47d..412cca2 100644
--- a/lib/pg_reorg--unpackaged--1.1.8.sql
+++ b/lib/pg_reorg--1.1.7--1.1.8.sql
@@ -1,7 +1,7 @@
-/* pg_reorg/pg_reorg--unpackaged--1.1.8.sql */
+/* Create the pg_reorg extension from a loose set of objects */
 
 -- 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
+\echo Use "CREATE EXTENSION pg_reorg FROM 1.1.7" to load this file. \quit
 
 ALTER EXTENSION pg_reorg ADD FUNCTION reorg.version();
 ALTER EXTENSION pg_reorg ADD AGGREGATE reorg.array_accum(anyelement);