Add armhf, s390x architectures, comment hppa architecture

3 files changed, 26 insertions, 5 deletions

diff --git a/debian/archlist b/debian/archlist
index 2bcf888b4..a3764f8fe 100644
--- a/debian/archlist
+++ b/debian/archlist
@@ -6,12 +6,14 @@
 i386	Intel x86
 amd64	AMD64
 armel	ARM
-hppa	PA-RISC (hppa)
+armhf	ARM
+#hppa	PA-RISC (hppa)
 ia64	IA-64
 mips	Mips
 mipsel	Mipsel
 powerpc	PowerPC
 s390	S/390
+s390x	S/390
 sparc	Sparc
 kfreebsd-i386	kFreeBSD Intel x86
 kfreebsd-amd64	kFreeBSD AMD64
diff --git a/debian/changelog b/debian/changelog
index 8e44f629b..e34334b8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ installation-guide (2011xxxx) UNRELEASED; urgency=low
     default, and document how to enable it. Thanks Filipus Klutiero for the
     report. Closes: #666105.
   * Document that installing an MBR is needed to get a bootable USB key.
+  * Add armhf, s390x architectures, comment hppa architecture.
 
   [ Steve McIntyre ]
   * Make it clearer how we expect users to write CDs to USB sticks.
diff --git a/debian/control b/debian/control
index dc33173c9..f9255267f 100644
--- a/debian/control
+++ b/debian/control
@@ -70,15 +70,24 @@ Description: Debian installation guide for armel
  .
  A shorter reference, the installation HOWTO, is included in an appendix.
 
-Package: installation-guide-hppa
+Package: installation-guide-armhf
 Architecture: all
 Conflicts: installation-guide
-Description: Debian installation guide for hppa
- This package contains the Debian installation guide for the PA-RISC
- architecture, in a variety of languages.
+Description: Debian installation guide for armhf
+ This package contains the Debian installation guide for the ARM
+ with Hardware FPU architecture, in a variety of languages.
  .
  A shorter reference, the installation HOWTO, is included in an appendix.
 
+#Package: installation-guide-hppa
+#Architecture: all
+#Conflicts: installation-guide
+#Description: Debian installation guide for hppa
+# This package contains the Debian installation guide for the PA-RISC
+# architecture, in a variety of languages.
+# .
+# A shorter reference, the installation HOWTO, is included in an appendix.
+
 Package: installation-guide-i386
 Architecture: all
 Conflicts: installation-guide
@@ -151,6 +160,15 @@ Description: Debian installation guide for s390
  .
  A shorter reference, the installation HOWTO, is included in an appendix.
 
+Package: installation-guide-s390x
+Architecture: all
+Conflicts: installation-guide
+Description: Debian installation guide for s390x
+ This package contains the Debian installation guide for the 64bit S/390
+ architecture, in a variety of languages.
+ .
+ A shorter reference, the installation HOWTO, is included in an appendix.
+
 Package: installation-guide-sparc
 Architecture: all
 Conflicts: installation-guide