Commit 5bfee821 authored by Alastair McKinstry's avatar Alastair McKinstry

- Fix build issues due to VERSION not being propagated properly; configure.ac not

substituting VERSION correctly for some auto* versions. Use VERSION=@PACKAGE_VERSION@
for the moment.
- automake1.4 doesn't grok --force. Drop the flag.
parent 35cdc725
......@@ -7,6 +7,6 @@ topdir=`pwd`
cd $srcdir
aclocal
autoconf
automake --add-missing --foreign --force --copy
automake --add-missing --foreign --copy
cd $topdir
$srcdir/configure $@
......@@ -20,8 +20,9 @@ AC_INIT([ISO Codes],[0.47],[],[iso-codes])
AC_REVISION([$Revision$])
AC_SUBST(VERSION, "${PACKAGE_VERSION}")
AC_PREREQ([2.59])
dnl FIXME debug why this doesn't work; it substs an '' for VERSION
dnl until then, use PACKAGE_VERSION instead.
dnl AC_PREREQ([2.59]i, "${PACKAGE_VERSION}")
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
......
iso-codes (0.47-1) unstable; urgency=low
* Set pkgconfig-dir to DATADIR to be multilib friendly. Thanks to
Christopher Aillon.
* autogen.sh: remove --force from automake, as it is not understood
by automake-1.4
* Fix build issues due to VERSION not being propagated to Makefiles
correctly. Reverted to using @PACKAGE_VERSION@ for the moment until the
configure magic is fixed (for all auto* versions...)
* iso_3166:
- de: spellchecked by Jens Seidel. Closes: #314029
- wo: added by Mouhamadou Mamoune Mbacke
- fr: case errors corrections. Closes: #319658
* Set pkgconfig-dir to DATADIR to be multilib friendly. Thanks to
Christopher Aillon.
* iso_3166_2:
* iso_3166_2:
- typo in Finnish placename: s/Ahvenanmasn/Ahvenanmaan/.
Correction thanks to Tommi Vainikainen.
- Updated Danish translations by Claus Hindsgaul
* iso_629:
- Portuguese translation correction thanks to Guilherme de S. Pastore.
Closes: #318346.
- Code change;
- Code change;
The official name for language gl is now Galician, not Gallegan.
Closes: #320182.
- Code change: add "alt" for Southern Altai.
-- Alastair McKinstry <mckinstry@debian.org> Thu, 28 Jul 2005 14:41:30 +0100
-- Alastair McKinstry <alastair.mckinstry@ildana.ie> Thu, 28 Jul 2005 12:26:17 +0100
iso-codes (0.46-2) unstable; urgency=low
......
......@@ -16,9 +16,10 @@ build: build-stamp
configure:
chmod +x ./autogen.sh
./autogen.sh
build-stamp:
build-stamp: configure
dh_testdir
./configure --prefix=/usr
$(MAKE)
......@@ -28,7 +29,7 @@ clean:
dh_testdir
dh_testroot
-$(MAKE) distclean
rm -f build-stamp
rm -f build-stamp configure
dh_clean
binary-arch:
......
......@@ -3,4 +3,4 @@ domains=@DOMAINS@
Name: iso-codes
Description: ISO country, language and currency codes and translations
Version: @VERSION@
Version: @PACKAGE_VERSION@
DOMAIN = iso_4217
VERSION = @PACKAGE_VERSION@
xmldir = $(datadir)/xml/iso-codes
xml_DATA = $(DOMAIN).xml
......
DOMAIN = iso_639
VERSION= @PACKAGE_VERSION@
xmldir = $(datadir)/xml/iso-codes
xml_DATA = $(DOMAIN).xml
......
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