* Fixed incorrect patch for --print-architecture (oops, oh well

    it was already broken when there was no gcc anyway :)

diff --git a/ChangeLog b/ChangeLog
index 3f5b2b40ad483b4813b57a21f67b048ab73d7851..a8d8c4d7eeb32c24f5557eb2e0054cb379cb8f79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 21 12:57:31 EDT 1999 Ben Collins <bcollins.debian.org>
+
+  * Fixed incorrect patch for --print-architecture (oops, oh well
+    it was already broken when there was no gcc anyway :)
+
 Thu Oct 21 10:22:43 EDT 1999 Ben Collins <bcollins.debian.org>
 
   * Fixed the check that was added to dpkg-divert.

diff --git a/TODO b/TODO
index fb4f5045e6c3f8f72bf704c1f92e1b5158b9bb9d..8fc839bc71e235509e5b715b3265e9441f346c30 100644 (file)
--- a/TODO
+++ b/TODO
@@ -21,6 +21,8 @@ urgent
  * openpgp signatures in the package archive
 
 other stuff unlikely to get done soon
+ * Purge a.out compatibility from source (keep the upgrade stuff in
+   place).
  * Automatically remove <file>.gz if <file> can't be found ? and maybe,
    remove <file> if <file.gz> can't be found? Bug mess when we start
    thinking about bz2 :/

diff --git a/debian/changelog b/debian/changelog
index 52d4c79efc9b27955725a32b62feb4c9dd0ad946..6db599a0cb2f2cd7b59c750db7a49248e7d8ea6a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dpkg (1.4.1.18) unstable; urgency=low
+
+  * Fixed incorrect patch for --print-architecture (oops, oh well
+    it was already broken when there was no gcc anyway :)
+
+
+ -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
+
 dpkg (1.4.1.17) unstable; urgency=low
 
   * Add support for long filenames, along with --assert-longfilenames

diff --git a/main/enquiry.c b/main/enquiry.c
index cc600f7408b209da4e287736fc356c8f83c3dba4..e4d7efe68542e6c7b398371e6201e806d6c63fc0 100644 (file)
--- a/main/enquiry.c
+++ b/main/enquiry.c
@@ -647,7 +647,8 @@ void printarch(const char *const *argv) {
      * are being called, then we should just give them the built
      * in arch.
      */
-    if (printf("%s\n",architecture) == EOF) werr("stdout");
+    if (printf("/usr/lib/gcc-lib/%s-none/0.0.0/libgcc.a\n",architecture) == EOF)
+      werr("stdout");
     if (fflush(stdout)) werr("stdout");
     exit(0);
   }