[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. iso-codes/3.9-57-g525ee87

Tobias Quathamer toddy at debian.org
Sun May 31 09:56:24 UTC 2009 

The following commit has been merged in the master branch:
commit be81ef1ff889562d878e10edfbc085030c5ba3ae
Author: Tobias Quathamer <toddy at debian.org>
Date:   Sun May 31 11:38:01 2009 +0200

    Move iso_3166_2 directory into top source directory

diff --git a/ChangeLog b/ChangeLog
index 2fd81e8..671de5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ iso-codes trunk
 ---------------
 UNRELEASED
 
+  [ General ]
+  * Move directory iso_3166_2 from iso_3166 directory into
+    top source directory
+
   [ ISO-3166 ]
   * Changes from ISO-3166 MA Newsletter VI-6.
     - BO "short" name to "Bolivia, Plurinational State of"
diff --git a/Makefile.am b/Makefile.am
index 8e408eb..75f4e6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = iso_15924 iso_3166 iso_4217 iso_639
+SUBDIRS = iso_15924 iso_3166 iso_3166_2 iso_4217 iso_639
 
 pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = iso-codes.pc
@@ -36,3 +36,4 @@ upload:
 		scp iso-codes-$(VERSION).tar.* \
 		$(ALIOTH_USERNAME)@alioth.debian.org:/var/lib/gforge/chroot/ftproot/pub/pkg-isocodes; \
 	fi
+
diff --git a/configure.ac b/configure.ac
index 763fee8..e3b3cc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ Makefile
 iso-codes.pc
 iso_15924/Makefile
 iso_3166/Makefile
-iso_3166/iso_3166_2/Makefile
+iso_3166_2/Makefile
 iso_4217/Makefile
 iso_639/Makefile
 iso_639/iso_639_3/Makefile
diff --git a/iso_3166/Makefile.am b/iso_3166/Makefile.am
index b430307..6ffe6cb 100644
--- a/iso_3166/Makefile.am
+++ b/iso_3166/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS = iso_3166_2
 DOMAIN = iso_3166
 VERSION = @PACKAGE_VERSION@
 
diff --git a/iso_3166/iso_3166_2/Makefile.am b/iso_3166_2/Makefile.am
similarity index 88%
rename from iso_3166/iso_3166_2/Makefile.am
rename to iso_3166_2/Makefile.am
index 9cf34d9..42ebb30 100644
--- a/iso_3166/iso_3166_2/Makefile.am
+++ b/iso_3166_2/Makefile.am
@@ -4,13 +4,12 @@ VERSION = @PACKAGE_VERSION@
 xmldir = $(datadir)/xml/iso-codes
 xml_DATA = $(DOMAIN).xml
 
-
 pofiles = $(wildcard $(srcdir)/*.po)
 mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles))
 noinst_DATA = $(mofiles) $(xml_DATA:.xml=.pot) 
 
 iso_3166_2.pot: iso_3166_2.xml
-	../../iso2pot.py --is-version ${VERSION} --comment code \
+	../iso2pot.py --is-version ${VERSION} --comment code \
 		--fields name --outfile $@ $< 
 
 EXTRA_DIST = \
diff --git a/iso_3166/iso_3166_2/Makefile.in b/iso_3166_2/Makefile.in
similarity index 100%
rename from iso_3166/iso_3166_2/Makefile.in
rename to iso_3166_2/Makefile.in
diff --git a/iso_3166/iso_3166_2/az.po b/iso_3166_2/az.po
similarity index 100%
rename from iso_3166/iso_3166_2/az.po
rename to iso_3166_2/az.po
diff --git a/iso_3166/iso_3166_2/bg.po b/iso_3166_2/bg.po
similarity index 100%
rename from iso_3166/iso_3166_2/bg.po
rename to iso_3166_2/bg.po
diff --git a/iso_3166/iso_3166_2/bs.po b/iso_3166_2/bs.po
similarity index 100%
rename from iso_3166/iso_3166_2/bs.po
rename to iso_3166_2/bs.po
diff --git a/iso_3166/iso_3166_2/ca.po b/iso_3166_2/ca.po
similarity index 100%
rename from iso_3166/iso_3166_2/ca.po
rename to iso_3166_2/ca.po
diff --git a/iso_3166/iso_3166_2/crh.po b/iso_3166_2/crh.po
similarity index 100%
rename from iso_3166/iso_3166_2/crh.po
rename to iso_3166_2/crh.po
diff --git a/iso_3166/iso_3166_2/cs.po b/iso_3166_2/cs.po
similarity index 100%
rename from iso_3166/iso_3166_2/cs.po
rename to iso_3166_2/cs.po
diff --git a/iso_3166/iso_3166_2/da.po b/iso_3166_2/da.po
similarity index 100%
rename from iso_3166/iso_3166_2/da.po
rename to iso_3166_2/da.po
diff --git a/iso_3166/iso_3166_2/el.po b/iso_3166_2/el.po
similarity index 100%
rename from iso_3166/iso_3166_2/el.po
rename to iso_3166_2/el.po
diff --git a/iso_3166/iso_3166_2/en.po b/iso_3166_2/en.po
similarity index 100%
rename from iso_3166/iso_3166_2/en.po
rename to iso_3166_2/en.po
diff --git a/iso_3166/iso_3166_2/eo.po b/iso_3166_2/eo.po
similarity index 100%
rename from iso_3166/iso_3166_2/eo.po
rename to iso_3166_2/eo.po
diff --git a/iso_3166/iso_3166_2/es.po b/iso_3166_2/es.po
similarity index 100%
rename from iso_3166/iso_3166_2/es.po
rename to iso_3166_2/es.po
diff --git a/iso_3166/iso_3166_2/eu.po b/iso_3166_2/eu.po
similarity index 100%
rename from iso_3166/iso_3166_2/eu.po
rename to iso_3166_2/eu.po
diff --git a/iso_3166/iso_3166_2/fi.po b/iso_3166_2/fi.po
similarity index 100%
rename from iso_3166/iso_3166_2/fi.po
rename to iso_3166_2/fi.po
diff --git a/iso_3166/iso_3166_2/fr.po b/iso_3166_2/fr.po
similarity index 100%
rename from iso_3166/iso_3166_2/fr.po
rename to iso_3166_2/fr.po
diff --git a/iso_3166/iso_3166_2/ga.po b/iso_3166_2/ga.po
similarity index 100%
rename from iso_3166/iso_3166_2/ga.po
rename to iso_3166_2/ga.po
diff --git a/iso_3166/iso_3166_2/hu.po b/iso_3166_2/hu.po
similarity index 100%
rename from iso_3166/iso_3166_2/hu.po
rename to iso_3166_2/hu.po
diff --git a/iso_3166/iso_3166_2/id.po b/iso_3166_2/id.po
similarity index 100%
rename from iso_3166/iso_3166_2/id.po
rename to iso_3166_2/id.po
diff --git a/iso_3166/iso_3166_2/iso_3166_2.pot b/iso_3166_2/iso_3166_2.pot
similarity index 100%
rename from iso_3166/iso_3166_2/iso_3166_2.pot
rename to iso_3166_2/iso_3166_2.pot
diff --git a/iso_3166/iso_3166_2/iso_3166_2.xml b/iso_3166_2/iso_3166_2.xml
similarity index 100%
rename from iso_3166/iso_3166_2/iso_3166_2.xml
rename to iso_3166_2/iso_3166_2.xml
diff --git a/iso_3166/iso_3166_2/it.po b/iso_3166_2/it.po
similarity index 100%
rename from iso_3166/iso_3166_2/it.po
rename to iso_3166_2/it.po
diff --git a/iso_3166/iso_3166_2/ja.po b/iso_3166_2/ja.po
similarity index 100%
rename from iso_3166/iso_3166_2/ja.po
rename to iso_3166_2/ja.po
diff --git a/iso_3166/iso_3166_2/ko.po b/iso_3166_2/ko.po
similarity index 100%
rename from iso_3166/iso_3166_2/ko.po
rename to iso_3166_2/ko.po
diff --git a/iso_3166/iso_3166_2/lt.po b/iso_3166_2/lt.po
similarity index 100%
rename from iso_3166/iso_3166_2/lt.po
rename to iso_3166_2/lt.po
diff --git a/iso_3166/iso_3166_2/lv.po b/iso_3166_2/lv.po
similarity index 100%
rename from iso_3166/iso_3166_2/lv.po
rename to iso_3166_2/lv.po
diff --git a/iso_3166/iso_3166_2/nl.po b/iso_3166_2/nl.po
similarity index 100%
rename from iso_3166/iso_3166_2/nl.po
rename to iso_3166_2/nl.po
diff --git a/iso_3166/iso_3166_2/nso.po b/iso_3166_2/nso.po
similarity index 100%
rename from iso_3166/iso_3166_2/nso.po
rename to iso_3166_2/nso.po
diff --git a/iso_3166/iso_3166_2/oc.po b/iso_3166_2/oc.po
similarity index 100%
rename from iso_3166/iso_3166_2/oc.po
rename to iso_3166_2/oc.po
diff --git a/iso_3166/iso_3166_2/pl.po b/iso_3166_2/pl.po
similarity index 100%
rename from iso_3166/iso_3166_2/pl.po
rename to iso_3166_2/pl.po
diff --git a/iso_3166/iso_3166_2/sk.po b/iso_3166_2/sk.po
similarity index 100%
rename from iso_3166/iso_3166_2/sk.po
rename to iso_3166_2/sk.po
diff --git a/iso_3166/iso_3166_2/sl.po b/iso_3166_2/sl.po
similarity index 100%
rename from iso_3166/iso_3166_2/sl.po
rename to iso_3166_2/sl.po
diff --git a/iso_3166/iso_3166_2/sr.po b/iso_3166_2/sr.po
similarity index 100%
rename from iso_3166/iso_3166_2/sr.po
rename to iso_3166_2/sr.po
diff --git a/iso_3166/iso_3166_2/sv.po b/iso_3166_2/sv.po
similarity index 100%
rename from iso_3166/iso_3166_2/sv.po
rename to iso_3166_2/sv.po
diff --git a/iso_3166/iso_3166_2/th.po b/iso_3166_2/th.po
similarity index 100%
rename from iso_3166/iso_3166_2/th.po
rename to iso_3166_2/th.po
diff --git a/iso_3166/iso_3166_2/tr.po b/iso_3166_2/tr.po
similarity index 100%
rename from iso_3166/iso_3166_2/tr.po
rename to iso_3166_2/tr.po
diff --git a/iso_3166/iso_3166_2/uk.po b/iso_3166_2/uk.po
similarity index 100%
rename from iso_3166/iso_3166_2/uk.po
rename to iso_3166_2/uk.po
diff --git a/iso_3166/iso_3166_2/ve.po b/iso_3166_2/ve.po
similarity index 100%
rename from iso_3166/iso_3166_2/ve.po
rename to iso_3166_2/ve.po
diff --git a/iso_3166/iso_3166_2/vi.po b/iso_3166_2/vi.po
similarity index 100%
rename from iso_3166/iso_3166_2/vi.po
rename to iso_3166_2/vi.po
diff --git a/iso_3166/iso_3166_2/wa.po b/iso_3166_2/wa.po
similarity index 100%
rename from iso_3166/iso_3166_2/wa.po
rename to iso_3166_2/wa.po
diff --git a/iso_3166/iso_3166_2/zh_CN.po b/iso_3166_2/zh_CN.po
similarity index 100%
rename from iso_3166/iso_3166_2/zh_CN.po
rename to iso_3166_2/zh_CN.po
diff --git a/notes/check_l10n_status.py b/notes/check_l10n_status.py
index 488863c..1aff7ca 100644
--- a/notes/check_l10n_status.py
+++ b/notes/check_l10n_status.py
@@ -9,7 +9,7 @@ basedir = os.path.realpath(os.path.join(os.path.split(sys.argv[0])[0], ".."))
 iso_639_dir = os.path.join(basedir, "iso_639")
 iso_639_3_dir = os.path.join(iso_639_dir, "iso_639_3")
 iso_3166_dir = os.path.join(basedir, "iso_3166")
-iso_3166_2_dir = os.path.join(iso_3166_dir, "iso_3166_2")
+iso_3166_2_dir = os.path.join(basedir, "iso_3166_2")
 iso_4217_dir = os.path.join(basedir, "iso_4217")
 iso_15924_dir = os.path.join(basedir, "iso_15924")
 dirs = [iso_639_dir,

-- 
ISO language, territory, currency, script codes and their translations

More information about the Pkg-isocodes-devel mailing list