[Pkg-isocodes-devel] [iso-codes] 02/13: Rename ISO 3166 to ISO 3166-1
Tobias Quathamer
toddy at moszumanska.debian.org
Tue Apr 1 15:53:50 UTC 2014
This is an automated email from the git hooks/post-receive script.
toddy pushed a commit to branch new_xml_structure
in repository iso-codes.
commit edfedcf7c998e3342bba014691296f74c1bb14d4
Author: Tobias Quathamer <toddy at debian.org>
Date: Mon Nov 11 12:49:44 2013 +0100
Rename ISO 3166 to ISO 3166-1
---
Makefile.am | 2 +-
Makefile.in | 2 +-
configure | 6 +++---
configure.ac | 4 ++--
iso2pot.py | 2 +-
iso_3166/Makefile.am | 8 ++++----
iso_3166/Makefile.in | 14 +++++++-------
iso_3166/{iso_3166.pot => iso_3166_1.pot} | 0
iso_3166/{iso_3166.xml => iso_3166_1.xml} | 0
9 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 460ca16..3a0ad86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3
+SUBDIRS = iso_15924 iso_3166_1 iso_3166_2 iso_4217 iso_639 iso_639_3
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = iso-codes.pc
diff --git a/Makefile.in b/Makefile.in
index bce99fe..e6fc24a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -234,7 +234,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639 iso_639_3
+SUBDIRS = iso_15924 iso_3166_1 iso_3166_2 iso_4217 iso_639 iso_639_3
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = iso-codes.pc
EXTRA_DIST = \
diff --git a/configure b/configure
index cacea6c..a3fbd8a 100755
--- a/configure
+++ b/configure
@@ -2447,10 +2447,10 @@ fi
$as_echo "$gnu_msgfmt" >&6; }
-DOMAINS="iso_15924 iso_3166 iso_4217 iso_639 iso_3166_2 iso_639_3"
+DOMAINS="iso_15924 iso_3166_1 iso_4217 iso_639 iso_3166_2 iso_639_3"
-ac_config_files="$ac_config_files Makefile iso-codes.pc iso_15924/Makefile iso_3166/Makefile iso_3166_2/Makefile iso_4217/Makefile iso_639/Makefile iso_639_3/Makefile"
+ac_config_files="$ac_config_files Makefile iso-codes.pc iso_15924/Makefile iso_3166_1/Makefile iso_3166_2/Makefile iso_4217/Makefile iso_639/Makefile iso_639_3/Makefile"
cat >confcache <<\_ACEOF
@@ -3169,7 +3169,7 @@ do
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"iso-codes.pc") CONFIG_FILES="$CONFIG_FILES iso-codes.pc" ;;
"iso_15924/Makefile") CONFIG_FILES="$CONFIG_FILES iso_15924/Makefile" ;;
- "iso_3166/Makefile") CONFIG_FILES="$CONFIG_FILES iso_3166/Makefile" ;;
+ "iso_3166_1/Makefile") CONFIG_FILES="$CONFIG_FILES iso_3166_1/Makefile" ;;
"iso_3166_2/Makefile") CONFIG_FILES="$CONFIG_FILES iso_3166_2/Makefile" ;;
"iso_4217/Makefile") CONFIG_FILES="$CONFIG_FILES iso_4217/Makefile" ;;
"iso_639/Makefile") CONFIG_FILES="$CONFIG_FILES iso_639/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 78397d5..3dacbe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,14 +38,14 @@ fi
AC_MSG_RESULT($gnu_msgfmt)
AC_SUBST(MSGFMT_FLAGS)
-DOMAINS="iso_15924 iso_3166 iso_4217 iso_639 iso_3166_2 iso_639_3"
+DOMAINS="iso_15924 iso_3166_1 iso_4217 iso_639 iso_3166_2 iso_639_3"
AC_SUBST([DOMAINS])
AC_CONFIG_FILES([
Makefile
iso-codes.pc
iso_15924/Makefile
-iso_3166/Makefile
+iso_3166_1/Makefile
iso_3166_2/Makefile
iso_4217/Makefile
iso_639/Makefile
diff --git a/iso2pot.py b/iso2pot.py
index 99d651d..eb789f3 100755
--- a/iso2pot.py
+++ b/iso2pot.py
@@ -138,7 +138,7 @@ iso_number = '-'.join(iso_number)
if iso_number == '639' or iso_number == '639-3':
iso_desc = 'language names'
-elif iso_number == '3166':
+elif iso_number == '3166-1':
iso_desc = 'country names'
elif iso_number == '3166-2':
iso_desc = 'country subdivision names'
diff --git a/iso_3166/Makefile.am b/iso_3166/Makefile.am
index 6ffe6cb..2bafc90 100644
--- a/iso_3166/Makefile.am
+++ b/iso_3166/Makefile.am
@@ -1,4 +1,4 @@
-DOMAIN = iso_3166
+DOMAIN = iso_3166_1
VERSION = @PACKAGE_VERSION@
xmldir = $(datadir)/xml/iso-codes
@@ -8,14 +8,14 @@ pofiles = $(wildcard $(srcdir)/*.po)
mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles))
noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot)
-iso_3166.pot: iso_3166.xml
+iso_3166_1.pot: iso_3166_1.xml
../iso2pot.py --is-version $(VERSION) --comments alpha_3_code \
- --fields name,names,official_name,common_name --outfile $@ $<
+ --fields name,official_name,common_name --outfile $@ $<
EXTRA_DIST = \
$(pofiles) \
$(xml_DATA) \
- iso_3166.pot
+ iso_3166_1.pot
MOSTLYCLEANFILES = \
$(mofiles)
diff --git a/iso_3166/Makefile.in b/iso_3166/Makefile.in
index dc475f8..943bc6e 100644
--- a/iso_3166/Makefile.in
+++ b/iso_3166/Makefile.in
@@ -51,7 +51,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/rules.make
-subdir = iso_3166
+subdir = iso_3166_1
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -176,7 +176,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-DOMAIN = iso_3166
+DOMAIN = iso_3166_1
xmldir = $(datadir)/xml/iso-codes
xml_DATA = $(DOMAIN).xml
pofiles = $(wildcard $(srcdir)/*.po)
@@ -185,7 +185,7 @@ noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot)
EXTRA_DIST = \
$(pofiles) \
$(xml_DATA) \
- iso_3166.pot
+ iso_3166_1.pot
MOSTLYCLEANFILES = \
$(mofiles)
@@ -202,9 +202,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign iso_3166/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign iso_3166_1/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign iso_3166/Makefile
+ $(AUTOMAKE) --foreign iso_3166_1/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -404,9 +404,9 @@ uninstall-am: uninstall-xmlDATA
uninstall-xmlDATA
-iso_3166.pot: iso_3166.xml
+iso_3166_1.pot: iso_3166_1.xml
../iso2pot.py --is-version $(VERSION) --comments alpha_3_code \
- --fields name,names,official_name,common_name --outfile $@ $<
+ --fields name,official_name,common_name --outfile $@ $<
check-local: check-content
diff --git a/iso_3166/iso_3166.pot b/iso_3166/iso_3166_1.pot
similarity index 100%
rename from iso_3166/iso_3166.pot
rename to iso_3166/iso_3166_1.pot
diff --git a/iso_3166/iso_3166.xml b/iso_3166/iso_3166_1.xml
similarity index 100%
rename from iso_3166/iso_3166.xml
rename to iso_3166/iso_3166_1.xml
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-isocodes/iso-codes.git
More information about the Pkg-isocodes-devel
mailing list