add s/390 support

diff --git a/ChangeLog b/ChangeLog
index b40c1454e924be3ca770987d1dd5d6d5ec6619a3..76d103ef527e66889faec53d1f4354554c7a97e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec  9 01:51:51 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * archtable, scripts/dpkg-architecture.pl: add linux s/390
+
 Tue 05 Dec 07:43:05 CET 2000 peter karlsson <peterk@debian.org>
 
   * po/sv.po: Updated Swedish translation.
@@ -29,6 +33,7 @@ Mon Dec  4 01:34:57 CET 2000 Wichert Akkerman <wakkerma@debian.org>
     + lib/parse.c: use memset to initialize fieldencountered
     + main/filesdb.c: use new read_fd_into_buf
 
+>>>>>>> 1.231
 Sun Dec  3 22:11:22 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * dpkg-deb/extract.c: apply one of Adams do_fd_copy patches

diff --git a/archtable b/archtable
index bdd17de86b6a6e212525144ffaa3fb61acf6dd5c..24aa5445658dcb7ab90d7109ca0d3ccc51c68970 100644 (file)
--- a/archtable
+++ b/archtable
@@ -39,3 +39,7 @@ hppa-linux-gnu                hppa            hppa
 hppa1.1-linux-gnu      hppa            hppa
 hppa2.0-linux-gnu      hppa            hppa
 i386-freebsd           freebsd-i386    freebsd-i386
+s390-linux-gnu         s390            s390
+s390-ibm-linux-gnu     s390            s390
+s390-unknown-linux-gnu s390            s390
+

diff --git a/debian/changelog b/debian/changelog
index f7d16880b0379f2eafb11707d0a7770a05edc507..5810fd6e213ada7c83f0a1cbc99a688eecfe5a31 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ dpkg (1.8.0) unstable; urgency=low
     import suidmanager settings.
   * Speedups patches by Adam Heath
   * statoverride fixes by Robert Luberda, Closes: Bug#78436
+  * Add Linux S/390 support. Closes: Bug#79063
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index 06e4b30d8737cf487a547069cbc0b709a7ca6c0c..700c0d9247d69afb12e7048e0f6508b6eb403cf7 100755 (executable)
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -60,6 +60,7 @@ require 'controllib.pl';
            'shed',      'shed-linux',
            'hppa',      'hppa-linux',
            'hurd-i386', 'i386-gnu',
+           's390',      's390-linux');
            'freebsd-i386', 'i386-freebsd');
 
 sub usageversion {