Rename some encoding conversion modules to keep pathnames in our source

tarballs under 100 characters.  This should avoid failures with certain
untarring tools (WinZip and Midnight Commander have been mentioned as
likely suspects).  Per my proposal of yesterday.
catversion bumped since the initial contents of pg_proc change.

diff --git a/src/backend/utils/mb/conversion_procs/Makefile b/src/backend/utils/mb/conversion_procs/Makefile
index 7bdd9f1f243864edd393aba493d015af2a8a37ae..33fc6b9f3a8890c01f429c51abcfc5175eda0af2 100644 (file)
--- a/src/backend/utils/mb/conversion_procs/Makefile
+++ b/src/backend/utils/mb/conversion_procs/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/mb/conversion_procs
 #
 # IDENTIFICATION
-#    $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.23 2009/08/26 22:24:43 petere Exp $
+#    $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/Makefile,v 1.24 2009/11/04 23:47:04 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 SQLSCRIPT = conversion_create.sql
 
-# This file can be placed as src/test/regress/conversion.sql
+# This file can be placed as src/test/regress/sql/conversion.sql
 REGRESSION_SCRIPT = conversion.sql
 
 SUBDIRS = \
@@ -24,7 +24,7 @@ SUBDIRS = \
        utf8_and_euc_jp utf8_and_euc_kr utf8_and_euc_tw utf8_and_gb18030 \
        utf8_and_gbk utf8_and_iso8859 utf8_and_iso8859_1 utf8_and_johab \
        utf8_and_sjis utf8_and_win utf8_and_uhc \
-       utf8_and_euc_jis_2004 utf8_and_shift_jis_2004 euc_jis_2004_and_shift_jis_2004
+       utf8_and_euc2004 utf8_and_sjis2004 euc2004_sjis2004
 
 # conversion_name source_encoding destination_encoding function object
 CONVERSIONS = \
@@ -154,12 +154,12 @@ CONVERSIONS = \
                utf8_to_sjis UTF8 SJIS utf8_to_sjis utf8_and_sjis \
                uhc_to_utf8 UHC UTF8 uhc_to_utf8 utf8_and_uhc \
                utf8_to_uhc UTF8 UHC utf8_to_uhc utf8_and_uhc \
-               euc_jis_2004_to_utf8 EUC_JIS_2004 UTF8 euc_jis_2004_to_utf8 utf8_and_euc_jis_2004 \
-               utf8_to_euc_jis_2004 UTF8 EUC_JIS_2004 utf8_to_euc_jis_2004 utf8_and_euc_jis_2004 \
-               shift_jis_2004_to_utf8 SHIFT_JIS_2004 UTF8 shift_jis_2004_to_utf8 utf8_and_shift_jis_2004 \
-               utf8_to_shift_jis_2004 UTF8 SHIFT_JIS_2004 utf8_to_shift_jis_2004 utf8_and_shift_jis_2004 \
-               euc_jis_2004_to_shift_jis_2004 EUC_JIS_2004 SHIFT_JIS_2004 euc_jis_2004_to_shift_jis_2004 euc_jis_2004_and_shift_jis_2004 \
-               shift_jis_2004_to_euc_jis_2004 SHIFT_JIS_2004 EUC_JIS_2004 shift_jis_2004_to_euc_jis_2004 euc_jis_2004_and_shift_jis_2004
+               euc_jis_2004_to_utf8 EUC_JIS_2004 UTF8 euc_jis_2004_to_utf8 utf8_and_euc2004 \
+               utf8_to_euc_jis_2004 UTF8 EUC_JIS_2004 utf8_to_euc_jis_2004 utf8_and_euc2004 \
+               shift_jis_2004_to_utf8 SHIFT_JIS_2004 UTF8 shift_jis_2004_to_utf8 utf8_and_sjis2004 \
+               utf8_to_shift_jis_2004 UTF8 SHIFT_JIS_2004 utf8_to_shift_jis_2004 utf8_and_sjis2004 \
+               euc_jis_2004_to_shift_jis_2004 EUC_JIS_2004 SHIFT_JIS_2004 euc_jis_2004_to_shift_jis_2004 euc2004_sjis2004 \
+               shift_jis_2004_to_euc_jis_2004 SHIFT_JIS_2004 EUC_JIS_2004 shift_jis_2004_to_euc_jis_2004 euc2004_sjis2004
 
 all: $(SQLSCRIPT)
        @for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit; done

diff --git a/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/Makefile b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile
similarity index 50%
rename from src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/Makefile
rename to src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile
index 7d0251932167aee46b379cb14f78a366c41258e4..e12c8dd9055487b19a1071664bc9dc7f254b15e1 100644 (file)
--- a/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/Makefile
+++ b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile
@@ -1,12 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/Makefile,v 1.2 2007/03/27 14:29:51 momjian Exp $
+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $
 #
 #-------------------------------------------------------------------------
-subdir = src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004
+subdir = src/backend/utils/mb/conversion_procs/euc2004_sjis2004
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-NAME           = euc_jis_2004_and_shift_jis_2004
+NAME           = euc2004_sjis2004
 
 include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
similarity index 98%
rename from src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c
rename to src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
index e65d755368fc81388af7fd1ac5dd72bd4e435feb..d0914c2eb1f8d72a9f040d0af81985f7fe754d03 100644 (file)
--- a/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c
+++ b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
@@ -5,7 +5,7 @@
  * Copyright (c) 2007-2009, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jis_2004_and_shift_jis_2004/euc_jis_2004_and_shift_jis_2004.c,v 1.6 2009/01/29 19:23:39 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c,v 1.1 2009/11/04 23:47:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile
similarity index 66%
rename from src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/Makefile
rename to src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile
index ff97965a6a64dd12f4c398b356ed336a4aa2bbb4..7abd09424e005c65458456da4c4e67c4545da11a 100644 (file)
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile
@@ -1,12 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/Makefile,v 1.1 2007/03/25 11:56:02 ishii Exp $
+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $
 #
 #-------------------------------------------------------------------------
-subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc2004
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-NAME           = utf8_and_euc_jis_2004
+NAME           = utf8_and_euc2004
 
 include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/utf8_and_euc_jis_2004.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c
similarity index 96%
rename from src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/utf8_and_euc_jis_2004.c
rename to src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c
index efc01536320247722a59a6459f16ca01d975f17d..59c540f1e3480e7526f2e74774b94f4437c9d633 100644 (file)
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/utf8_and_euc_jis_2004.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jis_2004/utf8_and_euc_jis_2004.c,v 1.5 2009/01/29 19:23:40 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c,v 1.1 2009/11/04 23:47:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile
similarity index 65%
rename from src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/Makefile
rename to src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile
index 8a2d052441a69ba06a0f8a79131e1a9b34ea011b..ea471286f3a23f6584361d64d2aeb91f94d57d49 100644 (file)
--- a/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile
@@ -1,12 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/Makefile,v 1.1 2007/03/25 11:56:03 ishii Exp $
+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/Makefile,v 1.1 2009/11/04 23:47:04 tgl Exp $
 #
 #-------------------------------------------------------------------------
-subdir = src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_sjis2004
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
-NAME           = utf8_and_shift_jis_2004
+NAME           = utf8_and_sjis2004
 
 include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/utf8_and_shift_jis_2004.c b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c
similarity index 96%
rename from src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/utf8_and_shift_jis_2004.c
rename to src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c
index c006a11e9d13152fb14275d9e6e7609589690ebf..e10a9a8417c7e4357a55287e3cf40dd23d236e2d 100644 (file)
--- a/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/utf8_and_shift_jis_2004.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *       $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_shift_jis_2004/utf8_and_shift_jis_2004.c,v 1.5 2009/01/29 19:23:42 tgl Exp $
+ *       $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c,v 1.1 2009/11/04 23:47:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 74bf01d29c5d3ddfc347d2a33618a9a42090b89a..fca4e8f608afd35b4976a02e1e76b22c0e297ceb 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -37,7 +37,7 @@
  * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.548 2009/10/28 14:55:44 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/catalog/catversion.h,v 1.549 2009/11/04 23:47:04 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     200910281
+#define CATALOG_VERSION_NO     200911041
 
 #endif