Enable support for arm and armel

Upstream added support in 1.4.7.  Also alphabetize the architecture
lists in debian/control and be more consistent on field order.

diff --git a/debian/changelog b/debian/changelog
index cb2dc6ab201c22bc769f609d9d8e1842a82e191c..d0f4a74f2673fcabf77a8da98366689591e23d3a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 openafs (1.4.7.dfsg1-3) UNRELEASED; urgency=low
 
   * Apply upstream delta for Linux 2.6.26 support.
+  * Enable support for arm and armel, added upstream in 1.4.7.
   * When clearing the restart time while installing a new cell, pass
     -localauth to avoid an authentication failure.  Thanks, Davor Ocelic.
     (Closes: #488152)

diff --git a/debian/control b/debian/control
index 40c540608152b99922d1192586f66d5fa0bc1c36..b827be2327e490a81edb713ff6cdb496027543e3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Git: git://git.debian.org/git/pkg-k5-afs/openafs.git
 Vcs-Browser: http://git.debian.org/?p=pkg-k5-afs/openafs.git
 
 Package: openafs-client
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
+Architecture: alpha amd64 arm armel hppa i386 ia64 powerpc ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: openafs-modules-source (>= 1.2.9) | openafs-modules2, lsof
 Suggests: openafs-doc
@@ -26,7 +26,7 @@ Description: AFS distributed filesystem client support
 
 Package: openafs-kpasswd
 Priority: extra
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
+Architecture: alpha amd64 arm armel hppa i386 ia64 powerpc ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, openafs-client
 Conflicts: krb5-user, heimdal-clients, kerberos4kth-clients
 Description: AFS distributed filesystem old password changing
@@ -40,7 +40,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 s390x
+Architecture: alpha amd64 arm armel hppa i386 ia64 powerpc ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client, lsb-base
 Recommends: ntp
 Suggests: openafs-doc
@@ -53,7 +53,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 s390x
+Architecture: alpha amd64 arm armel hppa i386 ia64 powerpc ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}, ${perl:Depends}, openafs-fileserver, openafs-client
 Suggests: openafs-doc
 Conflicts: openafs-ptutil
@@ -80,7 +80,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 s390x
+Architecture: alpha amd64 arm armel hppa i386 ia64 powerpc ppc64 s390 s390x sparc
 Depends: ${shlibs:Depends}
 Conflicts: openafs-client (<< 1.4.7.dfsg1-1)
 Description: AFS distributed filesystem Kerberos 5 integration
@@ -95,7 +95,7 @@ Description: AFS distributed filesystem Kerberos 5 integration
 
 Package: libopenafs-dev
 Section: libdevel
-Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x
+Architecture: alpha amd64 arm armel hppa i386 ia64 powerpc ppc64 s390 s390x sparc
 Priority: extra
 Depends: ${shlibs:Depends}
 Suggests: openafs-doc
@@ -120,9 +120,9 @@ Description: AFS distributed filesystem kernel module source
  This package provides source to the AFS kernel modules.
 
 Package: libpam-openafs-kaserver
+Architecture: alpha amd64 arm armel hppa i386 ia64 powerpc ppc64 s390 s390x sparc
 Priority: extra
 Depends: ${shlibs:Depends}, openafs-client
-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
@@ -133,11 +133,11 @@ Description: AFS distributed filesystem kaserver PAM module
  implementation, a Kerberos v5 PAM module, and libpam-openafs-session.
 
 Package: openafs-dbg
+Section: libdevel
 Priority: extra
+Architecture: alpha amd64 arm armel hppa i386 ia64 powerpc ppc64 s390 s390x sparc
 Depends: openafs-fileserver (= ${binary:Version})
  | libpam-openafs-kaserver (= ${binary:Version})
-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
  files among multiple computers.  Facilities are provided for access

diff --git a/debian/module/sysname b/debian/module/sysname
index d551c89ddde292521fb8db6e37f5d5bbb39ffe92..7c4176c0f77d73058242e56b0882ee16a089f341 100755 (executable)
--- a/debian/module/sysname
+++ b/debian/module/sysname
@@ -21,6 +21,16 @@ alpha)
         ;;
     esac
     ;;
+arm|armel)
+    case $KVERS in
+    2.4*)
+        echo arm_linux24
+        ;;
+    2.6*)
+        echo arm_linux26
+        ;;
+    esac
+    ;;
 hppa)
     case $KVERS in
     2.4*)

diff --git a/debian/sysname b/debian/sysname
index c95bb0bacd18315edf64962347d5110e5863e2a1..77ba91fd90918e04d85e88f97bc250ce6c89b623 100755 (executable)
--- a/debian/sysname
+++ b/debian/sysname
@@ -9,6 +9,9 @@ case `dpkg --print-architecture` in
 alpha)
     echo alpha_linux_26
     ;;
+arm|armel)
+    echo arm_linux26
+    ;;
 amd64)
     echo amd64_linux26
     ;;