* Applied patch from Guillem Jover <guillem.jover@nokia.com> to use

  dpkg-architecture to get the host architecture (closes: #407187)
      * vi.po: completed to 532t, again. Closes: #429899
      * gl.po: completed to 532t. Closes: #429506
      * vi.po: completed to 532t. Closes: #428672

7 files changed, 17 insertions, 80 deletions

diff --git a/buildlib/archtable b/buildlib/archtable
deleted file mode 100644
index eacc9889f..000000000
--- a/buildlib/archtable
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file contains a table of known architecture strings, with
-# things to map them to. `configure' will take the output of the
-# autoconf cannon macros and look in here. This only deals with architecture
-# (CPU) names.
-
-# The left side is a regex for awk
-
-i.86	i386
-pentium	i386
-sparc	sparc
-sparc64	sparc
-alpha.*	alpha
-m68k	m68k
-arm.*b	armeb
-arm.*	arm
-powerpc	powerpc
-ppc	powerpc
-powerpc64	ppc64
-mipsel  mipsel
-mipseb	mips
-mips	mips
-sheb	sheb
-shel	sh
-sh	sh
-sh3	sh3
-sh4	sh4
-m32r	m32r
-hppa.*	hppa
-ia64	ia64
-s390	s390
-s390x	s390x
-x86_64	amd64
-# lipa has gnulp-linux-i.86 (see dpkg archtable and ostable)
diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in
index 2d28e1c67..4e47692f5 100644
--- a/buildlib/environment.mak.in
+++ b/buildlib/environment.mak.in
@@ -64,7 +64,7 @@ NEED_SOCKLEN_T_DEFINE = @NEED_SOCKLEN_T_DEFINE@
 
 # Shared library things
 HOST_OS = @host_os@
-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
+ifneq ($(words $(filter gnu% linux-gnu% kfreebsd-gnu% %-gnu,$(HOST_OS))),0)
    SONAME_MAGIC=-Wl,-soname -Wl,
    LFLAGS_SO=
 else
diff --git a/buildlib/ostable b/buildlib/ostable
deleted file mode 100644
index ead7d771c..000000000
--- a/buildlib/ostable
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file contains a table of known vendor-os strings, with
-# things to map them to. `configure' will take the output of the
-# autoconf cannon macros and look in here. This only deals with
-# OS names. The right should be a common name like the arch table
-# generates
-# The final bit to build the Debian Architecture is done in init.cc
-# The left side is a regex for awk, and the first match is used.
-
-# These are used by Debian
-[^-]*-linux-.*   linux
-[^-]*-kfreebsd.*-gnu   kfreebsd
-[^-]*-knetbsd.*-gnu   knetbsd
-[^-]*-gnu[^-]*   hurd
-
-# These are samples. 
-hp-hpux[^-]*	    hp-ux
-sun-solaris[^-]*    solaris
-[^-]*-openbsd[^-]*  openbsd
-
-# Catch all
-.*	unknown
diff --git a/buildlib/systemtable b/buildlib/systemtable
deleted file mode 100644
index 64c176b50..000000000
--- a/buildlib/systemtable
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file contains a table of known canonical system strings, with
-# things to map them to. `configure' will take the output of the
-# autoconf cannon macros and look in here. It will check for
-# the full canonical system name (required for e.g. lpia) and if that 
-# fails it will configure.in will fallback to just checking for the CPU
-# in buildlib/archtable
-
-# The left side is a regex for awk against the canonical system name
-
-# config.guess reports lpia as i386-unknown-linux-gnulp
-i.86-.*-linux-gnulp	lpia
diff --git a/configure.in b/configure.in
index 9bb1a8baf..ad913f53e 100644
--- a/configure.in
+++ b/configure.in
@@ -81,12 +81,9 @@ dnl This is often the dpkg architecture string.
 dnl First check against the full canonical canoncial-system-type in $target
 dnl and if that fails, just look for the cpu
 AC_MSG_CHECKING(system architecture)
-archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/systemtable`"
+archset="`dpkg-architecture -qDEB_HOST_ARCH`"
 if test "x$archset" = "x"; then
- archset="`awk \" ! /^#|^\\\$/ { if(match(\\\"$target_cpu\\\",\\\"^\\\"\\\$1\\\"\\\$\\\")) {print \\\$2; exit}}\" $srcdir/buildlib/archtable`"
- if test "x$archset" = "x"; then
-  AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)
- fi
+   AC_MSG_ERROR([failed: use --host= or output from dpkg-architecture])
 fi
 AC_MSG_RESULT($archset)
 AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
@@ -94,7 +91,7 @@ AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
 dnl Get a common name for the host OS - this is primarily only for HURD and is
 dnl non fatal if it fails
 AC_MSG_CHECKING(system OS)
-osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`"
+osset="`dpkg-architecture -qDEB_HOST_ARCH_OS`"
 AC_MSG_RESULT($osset)
 AC_DEFINE_UNQUOTED(COMMON_OS,"$osset")
 
diff --git a/debian/changelog b/debian/changelog
index c83dc3a8b..8961a0257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,18 @@
 apt (0.7.5) UNRELEASED; urgency=low
 
+  [ Otavio Salvador ]
+  * Applied patch from Guillem Jover <guillem.jover@nokia.com> to use
+    dpkg-architecture to get the host architecture (closes: #407187)
+
+  [ Michael Vogt ]
   * apt-pkg/depcache.cc:
     - support a list of sections for:
       APT::Install-Recommends-Sections
       APT::Never-MarkAuto-Sections
 
- --
+ -- Otavio Salvador <otavio@ossystems.com.br>  Wed, 25 Jul 2007 20:16:46 -0300
 
-apt (0.7.4) UNRELEASED; urgency=low
+apt (0.7.4) unstable; urgency=low
 
   [ Michael Vogt ]
   * cmdline/apt-get.cc:
@@ -33,7 +38,7 @@ apt (0.7.4) UNRELEASED; urgency=low
   * Fix example for Install-{Recommends,Suggests} options on
     configure-index example file. Thanks to Peter Eisentraut
     <peter_e@gmx.net> by the patch (closes: #432223)
-  
+
   [ Christian Perrier ]
   * Basque translation update. Closes: ##423766
   * Unfuzzy formerly complete translations
@@ -42,7 +47,7 @@ apt (0.7.4) UNRELEASED; urgency=low
   * Spanish translation update
   * Swedish translation update
 
- -- Otavio Salvador <otavio@ossystems.com.br>  Sat, 14 Jul 2007 15:52:15 -0300
+ -- Otavio Salvador <otavio@debian.org>  Tue, 24 Jul 2007 09:55:50 -0300
 
 apt (0.7.3) unstable; urgency=low
 
@@ -56,9 +61,9 @@ apt (0.7.3) unstable; urgency=low
     - fix InstallTask code when a pkgRecord ends 
       with a single '\n' (thanks to Soren Hansen for reporting)
   * merged from Christian Perrier:
-	* vi.po: completed to 532t, again. Closes: #429899
-	* gl.po: completed to 532t. Closes: #429506
-	* vi.po: completed to 532t. Closes: #428672
+        * vi.po: completed to 532t, again. Closes: #429899
+        * gl.po: completed to 532t. Closes: #429506
+        * vi.po: completed to 532t. Closes: #428672
         * Update all PO and the POT. Gives 514t14f4u for formerly
           complete translations
         * fr.po: completed to 532t
diff --git a/debian/control b/debian/control
index 7939e1bca..76e5b1a19 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: apt
 Section: admin
 Priority: important
 Maintainer: APT Development Team <deity@lists.debian.org>
-Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
+Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>
 Standards-Version: 3.7.2.2
 Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5)
 Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)