diff -Nru /tmp/filebghkWu/apt-0.5.14/apt-pkg/clean.cc /tmp/file89GEHP/apt-0.5.14/apt-pkg/clean.cc
--- /tmp/filebghkWu/apt-0.5.14/apt-pkg/clean.cc	2001-02-20 02:03:17.000000000 -0500
+++ /tmp/file89GEHP/apt-0.5.14/apt-pkg/clean.cc	2003-09-27 16:39:25.000000000 -0400
@@ -31,7 +31,6 @@
 bool pkgArchiveCleaner::Go(string Dir,pkgCache &Cache)
 {
    bool CleanInstalled = _config->FindB("APT::Clean-Installed",true);
-   string MyArch = _config->Find("APT::Architecture");
       
    DIR *D = opendir(Dir.c_str());
    if (D == 0)
@@ -82,7 +81,7 @@
 	 continue;
       string Arch = DeQuoteString(string(Start,I-Start));
       
-      if (Arch != "all" && Arch != MyArch)
+      if (! _config->SupportedArch (Arch))
 	 continue;
       
       // Lookup the package
diff -Nru /tmp/filebghkWu/apt-0.5.14/apt-pkg/contrib/configuration.cc /tmp/file89GEHP/apt-0.5.14/apt-pkg/contrib/configuration.cc
--- /tmp/filebghkWu/apt-0.5.14/apt-pkg/contrib/configuration.cc	2003-07-25 20:27:36.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/apt-pkg/contrib/configuration.cc	2003-09-27 16:39:25.000000000 -0400
@@ -424,6 +424,48 @@
 }
 									/*}}}*/
 
+// Configuration::SupportedArch - test if testArch is valid for system  /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool Configuration::SupportedArch (const string testArch)
+{
+   string sysArch = Find("APT::Architecture");
+   /*std::cerr << "SupportedArch (" << testArch << ")        " 
+	   << "[" << sysArch << "]"
+	   << "\n";*/
+
+   if (testArch == "all" || testArch == sysArch)
+      return true;
+
+   string compatList = Find("APT::Architecture::compatlist");
+   //std::cerr << "   APT::Architecture::compatlist: " << compatList << "\n";
+
+   size_t ofs, seek_from=0;
+   size_t testArchLen = testArch.length();
+   size_t compatListLen = compatList.length();
+   while ((ofs = compatList.find(testArch,seek_from)) < compatListLen) {
+      // next time search past this point
+      seek_from = ofs+1;
+      // to match we must be at the start of the list or have a space
+      // preceeding the instace of testArch string in compatList string
+      if (ofs > 0 && compatList[ofs-1] != ' ')
+	      continue;
+      // to match we must be at the end of the list or have a space past the
+      // instace of testArch string in compatList string
+      int end = ofs+testArchLen;
+      if (end < compatListLen && compatList[end] != ' ')
+	      continue;
+
+      //std::cerr << "  matched\n";
+      return true;
+   }
+
+   //std::cerr << "   no match\n";
+   return false;
+}
+
+									/*}}}*/
+
 // Configuration::Item::FullTag - Return the fully scoped tag		/*{{{*/
 // ---------------------------------------------------------------------
 /* Stop sets an optional max recursion depth if this item is being viewed as
diff -Nru /tmp/filebghkWu/apt-0.5.14/apt-pkg/contrib/configuration.h /tmp/file89GEHP/apt-0.5.14/apt-pkg/contrib/configuration.h
--- /tmp/filebghkWu/apt-0.5.14/apt-pkg/contrib/configuration.h	2002-11-23 21:22:54.000000000 -0500
+++ /tmp/file89GEHP/apt-0.5.14/apt-pkg/contrib/configuration.h	2003-09-27 16:39:25.000000000 -0400
@@ -94,6 +94,9 @@
    inline void Dump() { Dump(std::clog); };
    void Dump(std::ostream& str);
 
+   // architecture specific
+   bool SupportedArch (const string testArch);
+
    Configuration(const Item *Root);
    Configuration();
    ~Configuration();
diff -Nru /tmp/filebghkWu/apt-0.5.14/apt-pkg/deb/debindexfile.cc /tmp/file89GEHP/apt-0.5.14/apt-pkg/deb/debindexfile.cc
--- /tmp/filebghkWu/apt-0.5.14/apt-pkg/deb/debindexfile.cc	2001-04-29 01:13:51.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/apt-pkg/deb/debindexfile.cc	2003-09-27 16:39:25.000000000 -0400
@@ -162,8 +162,9 @@
 // PackagesIndex::debPackagesIndex - Contructor				/*{{{*/
 // ---------------------------------------------------------------------
 /* */
-debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section) : 
-                  URI(URI), Dist(Dist), Section(Section)
+debPackagesIndex::debPackagesIndex(string URI,string Dist,string Section,
+		string Architecture) : 
+	URI(URI), Dist(Dist), Section(Section), Architecture(Architecture)
 {
 }
 									/*}}}*/
@@ -238,9 +239,16 @@
       else 
 	 Res = URI;
    }
+   else if (Architecture.size())
+   {
+      Res = URI + "dists/" + Dist + '/' + Section +
+      "/binary-" + Architecture + '/';
+   }
    else
+   {
       Res = URI + "dists/" + Dist + '/' + Section +
       "/binary-" + _config->Find("APT::Architecture") + '/';
+   }
    
    Res += Type;
    return Res;
@@ -427,7 +435,23 @@
 		   string Dist,string Section,
 		   pkgSourceList::Vendor const *Vendor) const
    {
-      List.push_back(new debPackagesIndex(URI,Dist,Section));
+      string realDist = Dist;
+      string realArch = "";			/* default */
+      size_t start = Dist.find ('(');
+      if (start && start < Dist.length()) {
+         realDist = Dist.substr (0, start);
+	 size_t end = Dist.find (')', start);
+         realArch = Dist.substr (start+1, end-start-1);
+      }
+
+      /* TODO: need error checking for the above () parser */
+#if 0
+      std::cerr << " deb ++ " 
+	      << realDist << ",  " 
+	      << Section << ",  " 
+	      << realArch << "\n";
+#endif
+      List.push_back(new debPackagesIndex(URI,realDist,Section,realArch));
       return true;
    };
 
@@ -446,7 +470,19 @@
 		   string Dist,string Section,
 		   pkgSourceList::Vendor const *Vendor) const 
    {      
-      List.push_back(new debSourcesIndex(URI,Dist,Section));
+      string realDist = Dist;
+      size_t start = Dist.find ('(');
+      if (start && start < Dist.length()) {
+         realDist = Dist.substr (0, start);
+      }
+
+      /* TODO: need error checking for the above () parser */
+#if 0
+      std::cerr << " src ++ " 
+	      << realDist << ",  " 
+	      << Section << "\n";
+#endif
+      List.push_back(new debSourcesIndex(URI,realDist,Section));
       return true;
    };  
    
diff -Nru /tmp/filebghkWu/apt-0.5.14/apt-pkg/deb/debindexfile.h /tmp/file89GEHP/apt-0.5.14/apt-pkg/deb/debindexfile.h
--- /tmp/filebghkWu/apt-0.5.14/apt-pkg/deb/debindexfile.h	2001-04-29 01:13:51.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/apt-pkg/deb/debindexfile.h	2003-09-27 16:39:25.000000000 -0400
@@ -48,6 +48,7 @@
    string URI;
    string Dist;
    string Section;
+   string Architecture;
    
    string Info(const char *Type) const;
    string IndexFile(const char *Type) const;
@@ -72,7 +73,8 @@
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress &Prog) const;
    virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const;
    
-   debPackagesIndex(string URI,string Dist,string Section);
+   debPackagesIndex(string URI,string Dist,string Section,
+		string Architecture = "");
 };
 
 class debSourcesIndex : public pkgIndexFile
diff -Nru /tmp/filebghkWu/apt-0.5.14/apt-pkg/deb/deblistparser.cc /tmp/file89GEHP/apt-0.5.14/apt-pkg/deb/deblistparser.cc
--- /tmp/filebghkWu/apt-0.5.14/apt-pkg/deb/deblistparser.cc	2003-09-22 00:16:26.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/apt-pkg/deb/deblistparser.cc	2003-09-27 16:39:25.000000000 -0400
@@ -555,6 +555,15 @@
       if (stringcmp(Start,Stop,"all") == 0)
 	 return true;
 
+      /* extract the string represending the architecture */
+      string debArch (Start,Stop-Start);
+
+      if (_config->SupportedArch (debArch))
+	 return true;
+
+      std::cerr << "incompatible arch deb='" << debArch 
+	      << "' to sys='" << Arch <<"'\n";
+
       iOffset = Tags.Offset();
    }   
    return false;
diff -Nru /tmp/filebghkWu/apt-0.5.14/apt-pkg/init.cc /tmp/file89GEHP/apt-0.5.14/apt-pkg/init.cc
--- /tmp/filebghkWu/apt-0.5.14/apt-pkg/init.cc	2003-04-20 12:48:55.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/apt-pkg/init.cc	2003-09-27 16:39:25.000000000 -0400
@@ -41,6 +41,9 @@
       Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
    Cnf.Set("APT::Build-Essential::", "build-essential");
    Cnf.Set("Dir","/");
+
+   Cnf.Set("APT::Architecture::compatlist", COMPAT_ARCHS);
+   std::cerr << "COMPAT_ARCHS: " << COMPAT_ARCHS << "\n";
    
    // State   
    Cnf.Set("Dir::State","var/lib/apt/");
diff -Nru /tmp/filebghkWu/apt-0.5.14/apt-pkg/pkgcache.cc /tmp/file89GEHP/apt-0.5.14/apt-pkg/pkgcache.cc
--- /tmp/filebghkWu/apt-0.5.14/apt-pkg/pkgcache.cc	2003-04-20 12:48:55.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/apt-pkg/pkgcache.cc	2003-09-27 16:39:25.000000000 -0400
@@ -143,7 +143,7 @@
 
    // Chcek the arhcitecture
    if (HeaderP->Architecture == 0 ||
-       _config->Find("APT::Architecture") != StrP + HeaderP->Architecture)
+	! _config->SupportedArch (StrP + HeaderP->Architecture))
       return _error->Error(_("The package cache was built for a different architecture"));
    return true;
 }
diff -Nru /tmp/filebghkWu/apt-0.5.14/apt-pkg/pkgcachegen.cc /tmp/file89GEHP/apt-0.5.14/apt-pkg/pkgcachegen.cc
--- /tmp/filebghkWu/apt-0.5.14/apt-pkg/pkgcachegen.cc	2003-04-20 12:48:55.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/apt-pkg/pkgcachegen.cc	2003-09-27 16:39:25.000000000 -0400
@@ -61,6 +61,8 @@
       // Starting header
       *Cache.HeaderP = pkgCache::Header();
       Cache.HeaderP->VerSysName = Map.WriteString(_system->VS->Label);
+      std::cerr << "!!! need to set the proper arch here..."
+	      << "using: " << _config->Find("APT::Architecture") << "\n";
       Cache.HeaderP->Architecture = Map.WriteString(_config->Find("APT::Architecture"));
       Cache.ReMap(); 
    }
diff -Nru /tmp/filebghkWu/apt-0.5.14/buildlib/archtable /tmp/file89GEHP/apt-0.5.14/buildlib/archtable
--- /tmp/filebghkWu/apt-0.5.14/buildlib/archtable	2002-11-09 14:59:10.000000000 -0500
+++ /tmp/file89GEHP/apt-0.5.14/buildlib/archtable	2003-09-27 16:39:25.000000000 -0400
@@ -5,8 +5,12 @@
 
 # The left side is a regex for awk
 
-i.86	i386
-pentium	i386
+i386	i386
+i486	i486
+i586	i586
+i686	i686
+x86_64	amd64
+pentium	i586
 sparc	sparc
 sparc64	sparc
 alpha.*	alpha
diff -Nru /tmp/filebghkWu/apt-0.5.14/buildlib/config.h.in /tmp/file89GEHP/apt-0.5.14/buildlib/config.h.in
--- /tmp/filebghkWu/apt-0.5.14/buildlib/config.h.in	2002-11-22 02:15:23.000000000 -0500
+++ /tmp/file89GEHP/apt-0.5.14/buildlib/config.h.in	2003-09-27 16:39:25.000000000 -0400
@@ -35,9 +35,12 @@
 /* Define the cpu name string */
 #undef COMMON_CPU
 
-/* Define the on name string */
+/* Define the OS name string */
 #undef COMMON_OS
 
+/* Define the compatible architectures string (space separated) */
+#undef COMPAT_ARCHS
+
 /* The version number string */
 #undef VERSION
 
diff -Nru /tmp/filebghkWu/apt-0.5.14/buildlib/program.mak /tmp/file89GEHP/apt-0.5.14/buildlib/program.mak
--- /tmp/filebghkWu/apt-0.5.14/buildlib/program.mak	2002-10-16 01:24:02.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/buildlib/program.mak	2003-09-27 16:39:42.000000000 -0400
@@ -43,13 +43,15 @@
 
 # The binary build rule
 $($(LOCAL)-BIN): $($(LOCAL)-OBJS) $($(LOCAL)-MKS)
-	echo Building program $@
+	echo Building program $@ "  [`pwd`]"
+	#echo $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(@F)-SLIBS) $(LEFLAGS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(LFLAGS) -o $@ $(filter %.o,$^) $($(@F)-SLIBS) $(LEFLAGS)
 
 # Compilation rules
 vpath %.cc $(SUBDIRS)
 $(OBJ)/%.o: %.cc
-	echo Compiling $< to $@
+	echo Compiling $< to $@ "  [`pwd`]"
+	#echo $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
 	$(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
 	$(DoDep)
 
diff -Nru /tmp/filebghkWu/apt-0.5.14/configure /tmp/file89GEHP/apt-0.5.14/configure
--- /tmp/filebghkWu/apt-0.5.14/configure	2003-09-23 23:47:52.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/configure	2003-09-27 17:08:09.000000000 -0400
@@ -563,7 +563,7 @@
 
 
 cat >> confdefs.h <<EOF
-#define VERSION "0.5.14"
+#define VERSION "0.5.14-subarch1"
 EOF
 
 PACKAGE="apt"
@@ -1486,21 +1486,30 @@
 EOF
 
 
+echo $ac_n "checking compatible architectures""... $ac_c" 1>&6
+echo "configure:1500: checking compatible architectures" >&5
+compatarchs="`if ( which dpkg-subarchitecture > /dev/null ) ; then dpkg-subarchitecture -a$archset -s ; fi`"
+echo "$ac_t""$compatarchs" 1>&6
+cat >> confdefs.h <<EOF
+#define COMPAT_ARCHS "$compatarchs"
+EOF
+
+
 echo $ac_n "checking for C99 integer types""... $ac_c" 1>&6
-echo "configure:1491: checking for C99 integer types" >&5
+echo "configure:1509: checking for C99 integer types" >&5
 if eval "test \"`echo '$''{'c9x_ints'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF
-#line 1497 "configure"
+#line 1515 "configure"
 #include "confdefs.h"
 #include <inttypes.h>
 int main() {
 uint8_t Foo1;uint16_t Foo2;uint32_t Foo3;
 ; return 0; }
 EOF
-if { (eval echo configure:1504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   c9x_ints=yes
 else
@@ -1515,12 +1524,12 @@
 echo "$ac_t""$c9x_ints" 1>&6
 
 echo $ac_n "checking for statvfs""... $ac_c" 1>&6
-echo "configure:1519: checking for statvfs" >&5
+echo "configure:1537: checking for statvfs" >&5
 if eval "test \"`echo '$''{'ac_cv_func_statvfs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1524 "configure"
+#line 1542 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char statvfs(); below.  */
@@ -1543,7 +1552,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_statvfs=yes"
 else
@@ -1566,7 +1575,7 @@
 
 if test x"$HAVE_STATVFS" != x"yes"; then
    cat > conftest.$ac_ext <<EOF
-#line 1570 "configure"
+#line 1588 "configure"
 #include "confdefs.h"
 #include <sys/vfs.h>
 EOF
@@ -1581,7 +1590,7 @@
   rm -rf conftest*
   
    cat > conftest.$ac_ext <<EOF
-#line 1585 "configure"
+#line 1603 "configure"
 #include "confdefs.h"
 #include <sys/mount.h>
 EOF
@@ -1605,12 +1614,12 @@
 fi
 
 echo $ac_n "checking for timegm""... $ac_c" 1>&6
-echo "configure:1609: checking for timegm" >&5
+echo "configure:1627: checking for timegm" >&5
 if eval "test \"`echo '$''{'ac_cv_func_timegm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1614 "configure"
+#line 1632 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char timegm(); below.  */
@@ -1633,7 +1642,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_timegm=yes"
 else
@@ -1677,14 +1686,14 @@
   { echo "configure: error: When cross compiling" 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:1681: checking whether byte ordering is bigendian" >&5
+echo "configure:1699: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 1688 "configure"
+#line 1706 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1695,11 +1704,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 1703 "configure"
+#line 1721 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1710,7 +1719,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -1730,7 +1739,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 1734 "configure"
+#line 1752 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -1743,7 +1752,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:1747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -1770,7 +1779,7 @@
 HAVE_C9X=yes
 if test x"$c9x_ints" = x"no"; then
    echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:1774: checking size of char" >&5
+echo "configure:1792: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1778,7 +1787,7 @@
   ac_cv_sizeof_char=$size_char
 else
   cat > conftest.$ac_ext <<EOF
-#line 1782 "configure"
+#line 1800 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -1790,7 +1799,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
 else
@@ -1810,7 +1819,7 @@
 
 
    echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1814: checking size of int" >&5
+echo "configure:1832: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1818,7 +1827,7 @@
   ac_cv_sizeof_int=$size_int
 else
   cat > conftest.$ac_ext <<EOF
-#line 1822 "configure"
+#line 1840 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -1830,7 +1839,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -1850,7 +1859,7 @@
 
 
    echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:1854: checking size of short" >&5
+echo "configure:1872: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1858,7 +1867,7 @@
   ac_cv_sizeof_short=$size_short
 else
   cat > conftest.$ac_ext <<EOF
-#line 1862 "configure"
+#line 1880 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -1870,7 +1879,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -1890,7 +1899,7 @@
 
 
    echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1894: checking size of long" >&5
+echo "configure:1912: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1898,7 +1907,7 @@
   ac_cv_sizeof_long=$size_long
 else
   cat > conftest.$ac_ext <<EOF
-#line 1902 "configure"
+#line 1920 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -1910,7 +1919,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -1935,9 +1944,9 @@
 fi
 
 echo $ac_n "checking for missing socklen_t""... $ac_c" 1>&6
-echo "configure:1939: checking for missing socklen_t" >&5
+echo "configure:1957: checking for missing socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1941 "configure"
+#line 1959 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 EOF
@@ -1960,9 +1969,9 @@
 
 
 echo $ac_n "checking for h_errno""... $ac_c" 1>&6
-echo "configure:1964: checking for h_errno" >&5
+echo "configure:1982: checking for h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1966 "configure"
+#line 1984 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 EOF
@@ -1974,7 +1983,7 @@
   rm -rf conftest*
   CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
     cat > conftest.$ac_ext <<EOF
-#line 1978 "configure"
+#line 1996 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 EOF
@@ -1996,7 +2005,7 @@
 # Extract the first word of "debiandoc2html", so it can be a program name with args.
 set dummy debiandoc2html; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2000: checking for $ac_word" >&5
+echo "configure:2018: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DEBIANDOC_HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2031,7 +2040,7 @@
 # Extract the first word of "debiandoc2text", so it can be a program name with args.
 set dummy debiandoc2text; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2035: checking for $ac_word" >&5
+echo "configure:2053: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DEBIANDOC_TEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2067,7 +2076,7 @@
 # Extract the first word of "docbook2man", so it can be a program name with args.
 set dummy docbook2man; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2071: checking for $ac_word" >&5
+echo "configure:2089: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_DOCBOOK2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2108,7 +2117,7 @@
 			# Extract the first word of "getconf", so it can be a program name with args.
 set dummy getconf; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2112: checking for $ac_word" >&5
+echo "configure:2130: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GETCONF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2142,7 +2151,7 @@
 
 		elif test ! "$withval" = "no";then 
 			echo $ac_n "checking getconf""... $ac_c" 1>&6
-echo "configure:2146: checking getconf" >&5
+echo "configure:2164: checking getconf" >&5
 			echo "$ac_t""$withval" 1>&6
 			GETCONF=$withval
 		fi
@@ -2150,7 +2159,7 @@
   # Extract the first word of "getconf", so it can be a program name with args.
 set dummy getconf; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2154: checking for $ac_word" >&5
+echo "configure:2172: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GETCONF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2188,7 +2197,7 @@
 	
 
 echo $ac_n "checking number of cpus""... $ac_c" 1>&6
-echo "configure:2192: checking number of cpus" >&5
+echo "configure:2210: checking number of cpus" >&5
 	# Check whether --with-cpus or --without-cpus was given.
 if test "${with_cpus+set}" = set; then
   withval="$with_cpus"
@@ -2245,7 +2254,7 @@
 
 
 	echo $ac_n "checking processor multiplier""... $ac_c" 1>&6
-echo "configure:2249: checking processor multiplier" >&5
+echo "configure:2267: checking processor multiplier" >&5
 	# Check whether --with-proc-multiply or --without-proc-multiply was given.
 if test "${with_proc_multiply+set}" = set; then
   withval="$with_proc_multiply"
@@ -2265,7 +2274,7 @@
 
 	
 	echo $ac_n "checking number of processes to run during make""... $ac_c" 1>&6
-echo "configure:2269: checking number of processes to run during make" >&5
+echo "configure:2287: checking number of processes to run during make" >&5
 	# Check whether --with-procs or --without-procs was given.
 if test "${with_procs+set}" = set; then
   withval="$with_procs"
@@ -2283,7 +2292,7 @@
 	
 
 echo $ac_n "checking glibc version""... $ac_c" 1>&6
-echo "configure:2287: checking glibc version" >&5
+echo "configure:2305: checking glibc version" >&5
 	dummy=if$$
 	cat <<_GLIBC_>$dummy.c
 #include <features.h>
@@ -2303,7 +2312,7 @@
 	
 
 echo $ac_n "checking libstdc++ version""... $ac_c" 1>&6
-echo "configure:2307: checking libstdc++ version" >&5
+echo "configure:2325: checking libstdc++ version" >&5
 	dummy=if$$
 	cat <<_LIBSTDCPP_>$dummy.cc
 #include <features.h>
@@ -2329,7 +2338,7 @@
 
 
 	echo $ac_n "checking if $CXX -MD works""... $ac_c" 1>&6
-echo "configure:2333: checking if $CXX -MD works" >&5
+echo "configure:2351: checking if $CXX -MD works" >&5
 	touch gcc3dep.cc
 	${CXX-c++} -MD -o gcc3dep_test.o -c gcc3dep.cc
 	rm -f gcc3dep.cc gcc3dep_test.o
@@ -2350,7 +2359,7 @@
 
 ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW"
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:2354: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2372: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2388,7 +2397,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:2392: checking for a BSD compatible install" >&5
+echo "configure:2410: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2462,7 +2471,7 @@
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:2466: checking for ld used by GCC" >&5
+echo "configure:2484: checking for ld used by GCC" >&5
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -2492,10 +2501,10 @@
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:2496: checking for GNU ld" >&5
+echo "configure:2514: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:2499: checking for non-GNU ld" >&5
+echo "configure:2517: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'acl_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2530,7 +2539,7 @@
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:2534: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:2552: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'acl_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2552,7 +2561,7 @@
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2556: checking for $ac_word" >&5
+echo "configure:2574: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2587,7 +2596,7 @@
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2591: checking for $ac_word" >&5
+echo "configure:2609: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2624,7 +2633,7 @@
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2628: checking for $ac_word" >&5
+echo "configure:2646: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2661,7 +2670,7 @@
     # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2665: checking for $ac_word" >&5
+echo "configure:2683: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGMERGE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2735,7 +2744,7 @@
 
 
                                                 echo $ac_n "checking for shared library run path origin""... $ac_c" 1>&6
-echo "configure:2739: checking for shared library run path origin" >&5
+echo "configure:2757: checking for shared library run path origin" >&5
 if eval "test \"`echo '$''{'acl_cv_rpath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3166,7 +3175,7 @@
   
 
   echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3170: checking whether NLS is requested" >&5
+echo "configure:3188: checking whether NLS is requested" >&5
     # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -3192,12 +3201,12 @@
         
 
         echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
-echo "configure:3196: checking for GNU gettext in libc" >&5
+echo "configure:3214: checking for GNU gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3201 "configure"
+#line 3219 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -3207,7 +3216,7 @@
 return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
 ; return 0; }
 EOF
-if { (eval echo configure:3211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext1_libc=yes
 else
@@ -3253,7 +3262,7 @@
 
 
   echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:3257: checking for iconv" >&5
+echo "configure:3275: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3261,7 +3270,7 @@
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat > conftest.$ac_ext <<EOF
-#line 3265 "configure"
+#line 3283 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -3271,7 +3280,7 @@
        iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:3275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_func_iconv=yes
 else
@@ -3283,7 +3292,7 @@
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
       cat > conftest.$ac_ext <<EOF
-#line 3287 "configure"
+#line 3305 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -3293,7 +3302,7 @@
          iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:3297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -3316,7 +3325,7 @@
   fi
   if test "$am_cv_lib_iconv" = yes; then
     echo $ac_n "checking how to link with libiconv""... $ac_c" 1>&6
-echo "configure:3320: checking how to link with libiconv" >&5
+echo "configure:3338: checking how to link with libiconv" >&5
     echo "$ac_t""$LIBICONV" 1>&6
   else
             CPPFLAGS="$am_save_CPPFLAGS"
@@ -3706,7 +3715,7 @@
   fi
 
           echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
-echo "configure:3710: checking for GNU gettext in libintl" >&5
+echo "configure:3728: checking for GNU gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3715,7 +3724,7 @@
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
                         cat > conftest.$ac_ext <<EOF
-#line 3719 "configure"
+#line 3737 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -3729,7 +3738,7 @@
 return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
 ; return 0; }
 EOF
-if { (eval echo configure:3733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gnugettext1_libintl=yes
 else
@@ -3742,7 +3751,7 @@
                         if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               cat > conftest.$ac_ext <<EOF
-#line 3746 "configure"
+#line 3764 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -3756,7 +3765,7 @@
 return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0)
 ; return 0; }
 EOF
-if { (eval echo configure:3760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
@@ -3803,7 +3812,7 @@
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
         echo $ac_n "checking how to link with libintl""... $ac_c" 1>&6
-echo "configure:3807: checking how to link with libintl" >&5
+echo "configure:3825: checking how to link with libintl" >&5
         echo "$ac_t""$LIBINTL" 1>&6
         
   for element in $INCINTL; do
@@ -3862,7 +3871,7 @@
 # Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3866: checking for $ac_word" >&5
+echo "configure:3884: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff -Nru /tmp/filebghkWu/apt-0.5.14/configure.in /tmp/file89GEHP/apt-0.5.14/configure.in
--- /tmp/filebghkWu/apt-0.5.14/configure.in	2003-09-23 23:34:14.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/configure.in	2003-09-27 17:08:02.000000000 -0400
@@ -17,7 +17,7 @@
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.5.14")
+AC_DEFINE_UNQUOTED(VERSION,"0.5.14-subarch1")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
@@ -75,6 +75,12 @@
 AC_MSG_RESULT($osset)
 AC_DEFINE_UNQUOTED(COMMON_OS,"$osset")
 
+dnl Get a space separted list of compatible architectures
+AC_MSG_CHECKING(compatible architectures)
+compatarchs="`if ( which dpkg-subarchitecture > /dev/null ) ; then dpkg-subarchitecture -a$archset -s ; fi`"
+AC_MSG_RESULT($compatarchs)
+AC_DEFINE_UNQUOTED(COMPAT_ARCHS,"$compatarchs")
+
 dnl We use C99 types if at all possible
 AC_CACHE_CHECK([for C99 integer types],c9x_ints,[
     AC_TRY_COMPILE([#include <inttypes.h>],
diff -Nru /tmp/filebghkWu/apt-0.5.14/debian/apt-utils.dirs /tmp/file89GEHP/apt-0.5.14/debian/apt-utils.dirs
--- /tmp/filebghkWu/apt-0.5.14/debian/apt-utils.dirs	2001-02-20 02:03:17.000000000 -0500
+++ /tmp/file89GEHP/apt-0.5.14/debian/apt-utils.dirs	2003-09-27 16:39:42.000000000 -0400
@@ -1,2 +1,2 @@
-usr/lib
+./${libdir}
 usr/bin
diff -Nru /tmp/filebghkWu/apt-0.5.14/debian/changelog /tmp/file89GEHP/apt-0.5.14/debian/changelog
--- /tmp/filebghkWu/apt-0.5.14/debian/changelog	2003-09-23 23:49:59.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/debian/changelog	2003-09-27 16:59:20.000000000 -0400
@@ -1,3 +1,13 @@
+apt (0.5.14-subarch1) unstable; urgency=low
+
+  * added support for overriding default architecture in sources.list.
+  * added support for compatible architectures; can be set via
+    APT::Architecture::compatlist apt.conf variable.
+  * fixed testing for compatible architectures;
+  * fixed a bug with generating package cache files.
+
+ -- Bart Trojanowski <bart@jukie.net>  Sat, 27 Sep 2003 16:59:14 -0400
+
 apt (0.5.14) unstable; urgency=low
 
   * apt-get build-dep, when trying to skip over the remaining elements of
diff -Nru /tmp/filebghkWu/apt-0.5.14/debian/control /tmp/file89GEHP/apt-0.5.14/debian/control
--- /tmp/filebghkWu/apt-0.5.14/debian/control	2003-08-10 01:26:32.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/debian/control	2003-09-27 16:39:42.000000000 -0400
@@ -33,6 +33,7 @@
  Advanced Package Tool.
 
 Package: libapt-pkg-dev
+Package.64: lib64apt-pkg-dev
 Architecture: any
 Priority: optional
 Depends: apt-utils, ${libapt-pkg:provides}, ${libapt-inst:provides}
diff -Nru /tmp/filebghkWu/apt-0.5.14/debian/dirs /tmp/file89GEHP/apt-0.5.14/debian/dirs
--- /tmp/filebghkWu/apt-0.5.14/debian/dirs	2001-02-20 02:03:17.000000000 -0500
+++ /tmp/file89GEHP/apt-0.5.14/debian/dirs	2003-09-27 16:39:42.000000000 -0400
@@ -1,6 +1,7 @@
 usr/bin
-usr/lib/apt/methods
-usr/lib/dpkg/methods/apt
+./${libdir}
+./usr/lib/apt/methods
+./usr/lib/dpkg/methods/apt
 etc/apt
 var/cache/apt/archives/partial
 var/lib/apt/lists/partial
diff -Nru /tmp/filebghkWu/apt-0.5.14/debian/lib64apt-pkg-dev.dirs /tmp/file89GEHP/apt-0.5.14/debian/lib64apt-pkg-dev.dirs
--- /tmp/filebghkWu/apt-0.5.14/debian/lib64apt-pkg-dev.dirs	1969-12-31 19:00:00.000000000 -0500
+++ /tmp/file89GEHP/apt-0.5.14/debian/lib64apt-pkg-dev.dirs	2003-09-27 16:39:42.000000000 -0400
@@ -0,0 +1,2 @@
+./${libdir}
+usr/include/apt-pkg
diff -Nru /tmp/filebghkWu/apt-0.5.14/debian/libapt-pkg-dev.dirs /tmp/file89GEHP/apt-0.5.14/debian/libapt-pkg-dev.dirs
--- /tmp/filebghkWu/apt-0.5.14/debian/libapt-pkg-dev.dirs	1999-03-17 22:32:22.000000000 -0500
+++ /tmp/file89GEHP/apt-0.5.14/debian/libapt-pkg-dev.dirs	2003-09-27 16:39:42.000000000 -0400
@@ -1,2 +1,2 @@
-usr/lib
+./${libdir}
 usr/include/apt-pkg
diff -Nru /tmp/filebghkWu/apt-0.5.14/debian/rules /tmp/file89GEHP/apt-0.5.14/debian/rules
--- /tmp/filebghkWu/apt-0.5.14/debian/rules	2003-09-22 10:36:20.000000000 -0400
+++ /tmp/file89GEHP/apt-0.5.14/debian/rules	2003-09-27 17:03:29.000000000 -0400
@@ -16,14 +16,33 @@
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_LIBDIR         ?= $(shell dpkg-libinfo -qDEB_LIBDIR)
+export DEB_LIBNAME        ?= $(shell dpkg-libinfo -qDEB_LIBNAME)
+export DEB_BUILD_CFLAGS   ?= $(shell dpkg-subarchitecture -qBuild-CFLAGS)
+export DEB_BUILD_CXXFLAGS ?= $(shell dpkg-subarchitecture -qBuild-CXXFLAGS)
+export DEB_BUILD_CC       ?= $(shell dpkg-subarchitecture -qBuild-CC)
+export DEB_BUILD_CXX      ?= $(shell dpkg-subarchitecture -qBuild-CXX)
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
-  confflags += --build $(DEB_HOST_GNU_TYPE)
+  #confflags += --build $(DEB_HOST_GNU_TYPE)
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 else
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
+ifeq (${DEB_LIBDIR},)
+	DEB_LIBDIR = "/usr/lib"
+endif
+ifeq (${DEB_LIBNAME},)
+	DEB_LIBNAME = "lib"
+endif
+export libdir  = ${DEB_LIBDIR}
+confflags += --libdir=${libdir}
+export libname = ${DEB_LIBNAME}
+
+confenv += CC="${DEB_BUILD_CC}" CFLAGS="${DEB_BUILD_CFLAGS}" CXX="${DEB_BUILD_CXX}" CXXFLAGS="${DEB_BUILD_CXXFLAGS}"
+
 # See below
 -include build/environment.mak
 
@@ -69,21 +88,21 @@
 export LIBAPTINST_MAJOR:=$(shell egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)
 
 # Determine which package we should provide in the control files
-LIBAPTPKG_PROVIDE=libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTPKG_MAJOR)
-LIBAPTINST_PROVIDE=libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTINST_MAJOR)
+LIBAPTPKG_PROVIDE=${libname}apt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTPKG_MAJOR)
+LIBAPTINST_PROVIDE=${libname}apt-inst$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTINST_MAJOR)
 
 debian/shlibs.local: apt-pkg/makefile
 	# We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and
 	# one for the rest of the packages. This ensures that each package gets
 	# the right overrides.. 
 	rm -rf $@ $@.apt $@.apt-utils
-	echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR)" > $@.apt
+	echo "${libname}apt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR)" > $@.apt
 
-	echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
-	echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR)" >> $@.apt-utils
+	echo "${libname}apt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
+	echo "${libname}apt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR)" >> $@.apt-utils
 
-	echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
-	echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
+	echo "${libname}apt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
+	echo "${libname}apt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
 
 build: build/build-stamp	
 build-doc: build/build-doc-stamp	
@@ -99,7 +118,7 @@
 	dh_testdir
 	-mkdir build
 	cp COPYING debian/copyright
-	cd build && ../configure $(confflags)
+	cd build && $(confenv) ../configure $(confflags)
 	touch $@
 
 build/build-stamp: build/configure-stamp
@@ -175,7 +194,7 @@
 
 # Build architecture-dependent files here.
 
-binary-arch: apt libapt-pkg-dev apt-utils 
+binary-arch: apt ${libname}apt-pkg-dev apt-utils 
 apt: build debian/shlibs.local
 	dh_testdir -p$@
 	dh_testroot -p$@
@@ -190,8 +209,8 @@
 	rm $(addprefix debian/apt/usr/bin/apt-,$(APT_UTILS))
 
 	# install the shared libs
-	find $(BLD)/bin/ -type f -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/apt/usr/lib/ \;
-	find $(BLD)/bin/ -type l -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/apt/usr/lib/ \;
+	find $(BLD)/bin/ -type f -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/apt/${libdir}/ \;
+	find $(BLD)/bin/ -type l -name "libapt-pkg*.so.*" -exec cp -a "{}" debian/apt/${libdir}/ \;
 
 	cp $(BLD)/bin/methods/* debian/apt/usr/lib/apt/methods/
 
@@ -212,12 +231,12 @@
 	dh_fixperms -p$@
 	dh_makeshlibs -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)' -papt
 	dh_installdeb -p$@
-	dh_shlibdeps -papt -l`pwd`/debian/apt/usr/lib -- -Ldebian/shlibs.local.apt
+	dh_shlibdeps -papt -l`pwd`/debian/apt/${libdir} -- -Ldebian/shlibs.local.apt
 	dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
-libapt-pkg-dev: build debian/shlibs.local
+${libname}apt-pkg-dev: build debian/shlibs.local
 	dh_testdir -p$@
 	dh_testroot -p$@
 	dh_clean -p$@ -k
@@ -225,10 +244,10 @@
 #
 # libapt-pkg-dev install
 #
-	cp -a $(BLD)/bin/libapt-pkg*.so debian/libapt-pkg-dev/usr/lib/
-	cp -a $(BLD)/bin/libapt-inst*.so debian/libapt-pkg-dev/usr/lib/
-#	ln -s libapt-pkg.so.$(LIBAPTPKG_MAJOR) debian/libapt-pkg-dev/usr/lib/libapt-pkg.so
-	cp $(BLD)/include/apt-pkg/*.h debian/libapt-pkg-dev/usr/include/apt-pkg/
+	cp -a $(BLD)/bin/libapt-pkg*.so debian/${libname}apt-pkg-dev/${libdir}/
+	cp -a $(BLD)/bin/libapt-inst*.so debian/${libname}apt-pkg-dev/${libdir}/
+#	ln -s libapt-pkg.so.$(LIBAPTPKG_MAJOR) debian/${libname}apt-pkg-dev/${libdir}/libapt-pkg.so
+	cp $(BLD)/include/apt-pkg/*.h debian/${libname}apt-pkg-dev/usr/include/apt-pkg/
 
 	dh_installdocs -p$@
 #	dh_installmenu -p$@
@@ -253,8 +272,8 @@
 	dh_installdirs -p$@
 
 	# install the shared libs
-	find $(BLD)/bin/ -type f -name "libapt-inst*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
-	find $(BLD)/bin/ -type l -name "libapt-inst*.so.*" -exec cp -a "{}" debian/$@/usr/lib/ \;
+	find $(BLD)/bin/ -type f -name "libapt-inst*.so.*" -exec cp -a "{}" debian/$@/${libdir}/ \;
+	find $(BLD)/bin/ -type l -name "libapt-inst*.so.*" -exec cp -a "{}" debian/$@/${libdir}/ \;
 
 	cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/
 	dh_installdocs -p$@
@@ -268,7 +287,7 @@
 	dh_fixperms -p$@
 	dh_makeshlibs -m$(LIBAPTINST_MAJOR) -V '$(LIBAPTINST_PROVIDE)' -p$@
 	dh_installdeb -p$@
-	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib dh_shlibdeps -p$@ -- -Ldebian/shlibs.local.apt-utils
+	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:`pwd`/debian/apt/${libdir}:`pwd`/debian/$@/${libdir} dh_shlibdeps -p$@ -- -Ldebian/shlibs.local.apt-utils
 	dh_gencontrol -p$@ -u -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
 	dh_md5sums -p$@
 	dh_builddeb -p$@