* archtable: sparc64 and ia64 edits

 * dselect/main.cc: gcc 2.96 fixups

diff --git a/ChangeLog b/ChangeLog
index 62c7befedfaa2286289b86df3cc6f20e623a502a..aa773a25652b1a06fde0acb7ca028398b7399e3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 31 23:38:56 EDT 2000 Ben Collins <bcollins@debian.org>
+
+  * archtable: add ia64; revert sparc64 so that it turns into sparc. There
+    wont be a full binary-sparc64 port.
+  * dselect/main.cc: small fixups to get it to compile with gcc-2.96
+
 Wed Jul 26 21:27:30 CEST 2000 peter karlsson <peterk@debian.org>
 
   * po/sv.po: Updated translation.

diff --git a/archtable b/archtable
index addeb5c8dcfa7dee571093121ebde90f9a081cdb..c87ac7a10c3863b68a1f5f77ea58f03e926645c9 100644 (file)
--- a/archtable
+++ b/archtable
@@ -13,7 +13,7 @@ i586-linux-gnu                i386            i486
 i686-linux-gnu         i386            i486
 pentium-linux-gnu      i386            i486
 sparc-linux-gnu                sparc           sparc
-sparc64-linux-gnu      sparc64         sparc64
+sparc64-linux-gnu      sparc           sparc
 alpha-linux-gnu                alpha           alpha
 alphaev4-linux-gnu     alpha           alpha
 alphaev5-linux-gnu     alpha           alpha
@@ -29,3 +29,5 @@ mips-linux-gnu                mips            mips
 mipsel-linux-gnu       mipsel          mipsel
 mipseb-linux-gnu       mips            mips
 i386-gnu               hurd-i386       undefined
+ia64-linux-gnu         ia64            ia64
+ia64-unknown-linux     ia64            ia64

diff --git a/debian/changelog b/debian/changelog
index 2e3bb8c9112ff07780c129fe3c565c3e0593657e..a6ee003f586e7fd33fb0162454048941739e6af7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ dpkg (1.7.0) unstable; urgency=low
   * Check COLUMNS environment for dpkg -l output. Closes: Bug#65536
   * Add Origin, Bugs-Submit-To, Bugs-Submit-Style
   * Corrections and updates to Swedish translation.
+  * archtable: add ia64; revert sparc64 so that it turns into sparc. There
+    wont be a full binary-sparc64 port.
+  * dselect/main.cc: small fixups to get it to compile with gcc-2.96
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/dselect/main.cc b/dselect/main.cc
index 85ba9236f4b1c7f21b6d9c22e4256f970696a6e0..57853e10e76604d0badab77d04477fe04b451f55 100644 (file)
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -117,7 +117,7 @@ extern "C" {
     setvbuf(debug,0,_IONBF,0);
   }
 
-  static void setexpert() {
+  static void setexpert(const struct cmdinfo*, const char *v) {
     expertmode = 1;
   }
 
@@ -131,7 +131,7 @@ static const struct cmdinfo cmdinfos[]= {
   { "version",    0,   0,  0,  0,          versiononly            },
   { "licence",    0,   0,  0,  0,          showcopyright          }, /* UK spelling */
   { "license",    0,   0,  0,  0,          showcopyright          }, /* US spelling */
-  {  0,           0                                               }
+  {  0,           0,   0,  0,  0,          0                      }
 };
 
 static int cursesareon= 0;