Commit f89a51b3 authored by Alastair McKinstry's avatar Alastair McKinstry

Include Joey Hess' patch that was not in CVS, and give him credit for his NMU.

parent b1c5bada
......@@ -8,7 +8,6 @@ configure
config.*
aclocal.m4
Makefile
Makefile.in
*.cache
mkinstalldirs
iso-codes.pc
......
......@@ -18,7 +18,7 @@ SHELL = /bin/sh
srcdir = .
top_srcdir = .
prefix = /usr/local
prefix = /usr/local/src/iso-codes/iso-codes-cvs/debian/iso-codes/usr
exec_prefix = ${prefix}
bindir = ${exec_prefix}/bin
......
iso-codes (0.44-2) UNRELEASED; urgency=low
* Acknowledge NMU by Joey Hess with Thanks. Closes: #289765.
-- Alastair McKinstry <mckinstry@debian.org> Mon, 7 Feb 2005 18:50:58 +0000
iso-codes (0.44-1) unstable; urgency=low
* iso_3166
......@@ -13,12 +19,17 @@ iso-codes (0.44-1) unstable; urgency=low
-- Alastair McKinstry <mckinstry@debian.org> Thu, 3 Feb 2005 20:56:14 +0000
iso-codes (0.43-1) unstable; urgency=low
x+iso-codes (0.42-1.1) unstable; urgency=low
* iso_3166/Makefile: makefile dropped necessary argument for iso3166tab.py,
which caused zero-byte iso_3166.tab files. Closes: #289681.
* Emergency NMU to fix d-i.
* Fix call to iso3166tab.py (it needs a parameter), so iso_3166.tab
is no longer an empty file. Closes: #289765
* Decouple sort from iso3166tab.py call, so if the script fails in the
future, the build will fail too.
* Set LC_ALL=C when calling sort, just in case the build locale is
different.
-- Alastair McKinstry <mckinstry@debian.org> Mon, 10 Jan 2005 21:19:17 +0000
-- Joey Hess <joeyh@debian.org> Mon, 10 Jan 2005 17:19:41 -0500
iso-codes (0.42-1) unstable; urgency=low
......
......@@ -9,8 +9,10 @@ xml_DATA = $(DOMAIN).xml
tabdir = $(datadir)/iso-codes
tab_DATA = $(DOMAIN).tab
%.tab: %.xml
$(srcdir)/iso3166tab.py $< | sort > $@
iso_3166.tab: iso_3166.xml
./iso3166tab.py $< > iso_3166.tab.new
LC_ALL=C sort < iso_3166.tab.new > iso_3166.tab
rm -f iso_3166.tab.new
pofiles = $(wildcard $(srcdir)/*.po)
mofiles = $(patsubst $(srcdir)/%.po,%.mo, $(pofiles))
......
......@@ -385,8 +385,10 @@ uninstall-info: uninstall-info-recursive
uninstall-recursive uninstall-tabDATA uninstall-xmlDATA
%.tab: %.xml
$(srcdir)/iso3166tab.py $< | sort > $@
iso_3166.tab: iso_3166.xml
./iso3166tab.py $< > iso_3166.tab.new
LC_ALL=C sort < iso_3166.tab.new > iso_3166.tab
rm -f iso_3166.tab.new
iso_3166.pot: iso_3166.xml
../iso2pot.py --is-version $(VERSION) --comments alpha_3_code \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment