* Add support for the s390x architecture. Upstream supports it and

  there's no reason not to.

diff --git a/debian/changelog b/debian/changelog
index b364e347e014ce0a3cc2bf8cf725daaf7aa31ffa..f89399307754be099e5445e534d47512f3ad4f58 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ openafs (1.4.4.dfsg1-2) unstable; urgency=low
     for the debugging help.  (Closes: #411818)
   * Prefer alpha_linux_26 to alpha_linux_24 for the non-kernel build on
     Alpha, now that the source supports it.
+  * Add support for the s390x architecture.  Upstream supports it and
+    there's no reason not to.
   * Fix the watch file to remove .dfsg\d+ when comparing versions.
 
  --

diff --git a/debian/control b/debian/control
index 103e61262b57d3c39115572ef84581e6083d48cd..438e6fb78b958397c2489311d641ca2649dd49c8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5), libncurses5-dev, libpam0g-dev, bison,
 Standards-Version: 3.7.2
 
 Package: openafs-client
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64
+Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: openafs-modules-source (>= 1.2.9) | openafs-modules2, lsof
 Suggests: openafs-doc
@@ -23,7 +23,7 @@ Description: AFS distributed filesystem client support
 
 Package: openafs-kpasswd
 Priority: extra
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64
+Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
 Depends: ${shlibs:Depends}, openafs-client
 Conflicts: krb5-user, heimdal-clients, kerberos4kth-clients
 Description: AFS distributed filesystem old password changing
@@ -37,7 +37,7 @@ Description: AFS distributed filesystem old password changing
  package for new cells or for cells using Kerberos v5.
 
 Package: openafs-fileserver
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64
+Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
 Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client
 Recommends: ntp
 Suggests: openafs-doc
@@ -50,7 +50,7 @@ Description: AFS distributed filesystem file server
  installed on any machine that will export files into AFS.
 
 Package: openafs-dbserver
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64
+Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
 Depends: ${shlibs:Depends}, ${perl:Depends}, openafs-fileserver, openafs-client
 Suggests: openafs-doc
 Conflicts: openafs-ptutil
@@ -77,7 +77,7 @@ Description: AFS distributed filesystem documentation
  protocol documentation, and other OpenAFS documentation.
 
 Package: openafs-krb5
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64
+Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
 Depends: ${shlibs:Depends}
 Description: AFS distributed filesystem Kerberos 5 integration
  AFS is a distributed filesystem allowing cross-platform sharing of files
@@ -91,7 +91,7 @@ Description: AFS distributed filesystem Kerberos 5 integration
 
 Package: libopenafs-dev
 Section: libdevel
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64
+Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
 Priority: extra
 Depends: ${shlibs:Depends}
 Suggests: openafs-doc
@@ -118,7 +118,7 @@ Description: AFS distributed filesystem kernel module source
 Package: libpam-openafs-kaserver
 Priority: extra
 Depends: ${shlibs:Depends}, openafs-client
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64
+Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
 Description: AFS distributed filesystem kaserver PAM module
  AFS is a distributed filesystem allowing cross-platform sharing of
  files among multiple computers.  Facilities are provided for access
@@ -131,7 +131,7 @@ Description: AFS distributed filesystem kaserver PAM module
 Package: openafs-dbg
 Priority: extra
 Depends: openafs-fileserver (= ${binary:Version})
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64
+Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
 Section: libdevel
 Description: AFS distributed filesystem debugging information
  AFS is a distributed filesystem allowing cross-platform sharing of

diff --git a/debian/kern-sysname b/debian/kern-sysname
index cadab28fbb5f1ec9fee87e7240afc0a38ceabaaa..33e75ba166760eafc761e8c1ab180089d0c72399 100644 (file)
--- a/debian/kern-sysname
+++ b/debian/kern-sysname
@@ -110,6 +110,16 @@ s390)
         ;;
     esac
     ;;
+s390x)
+    case $KVERS in
+    2.4*)
+        echo s390x_linux24
+        ;;
+    2.6*)
+        echo s390x_linux26
+        ;;
+    esac
+    ;;
 *)
     echo "ERROR: unsupported architecture" >&2
     echo UNKNOWN

diff --git a/debian/sysname b/debian/sysname
index 2cf08599e036b68888f2eebe3918b625efca9997..0c529a7b42a8e43845a6ba8b7dbce72f38574422 100755 (executable)
--- a/debian/sysname
+++ b/debian/sysname
@@ -30,6 +30,9 @@ ppc64)
 s390)
     echo s390_linux26
     ;;
+s390x)
+    echo s390x_linux26
+    ;;
 sparc|sparc64)
     echo sparc_linux24
     ;;