diff --git a/Alien/Package/Rpm.pm b/Alien/Package/Rpm.pm index 6884576..4c5c0e4 100644 --- a/Alien/Package/Rpm.pm +++ b/Alien/Package/Rpm.pm @@ -530,17 +530,18 @@ sub arch { elsif ($arch eq 'x86_64') { $arch='amd64'; } - - # Treat 486, 586, etc, as 386. - if ($arch =~ m/i\d86/i || $arch =~ m/pentium/i) { + elsif ($arch =~ m/i\d86/i || $arch =~ m/pentium/i) { + # Treat 486, 586, etc, as 386. $arch='i386'; } - - # Treat armv4l as arm. - if ($arch eq 'armv4l') { + elsif ($arch eq 'armv4l') { + # Treat armv4l as arm. $arch='arm'; } - + elsif ($arch eq 'parisc') { + $arch='hppa'; + } + $this->{arch}=$arch; } @@ -553,6 +554,9 @@ sub arch { # systems? $arch='ppc'; } + elsif ($arch eq 'hppa') { + $arch='parisc'; + } elsif ($arch eq 'all') { $arch='noarch'; } diff --git a/debian/changelog b/debian/changelog index dff020c..33558a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +alien (8.57) unstable; urgency=low + + * hppa <=> parisc conversion for rpm. Closes: #338187 + + -- Joey Hess Tue, 8 Nov 2005 13:39:06 -0500 + alien (8.56) unstable; urgency=low * Warn if a package contains maintainer scripts which are not converted,