diff --git a/Alien/Package/Rpm.pm b/Alien/Package/Rpm.pm index 6f7e43d..303a055 100644 --- a/Alien/Package/Rpm.pm +++ b/Alien/Package/Rpm.pm @@ -536,6 +536,9 @@ sub arch { elsif ($arch eq 'x86_64') { $arch='amd64'; } + elsif ($arch eq 'em64t') { + $arch='amd64'; + } elsif ($arch =~ m/i\d86/i || $arch =~ m/pentium/i) { # Treat 486, 586, etc, as 386. $arch='i386'; diff --git a/Makefile.PL b/Makefile.PL index 124e20b..f441855 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -11,7 +11,7 @@ sub MY::libscan { return $_; } -# Add a more targets. +# Add a few more targets. sub MY::postamble { return q{ @@ -34,10 +34,7 @@ extra_install: gzip -qf9 $(PREFIX)/share/alien/patches/* alien: - perl -pe ' \ - $$_="" if /use lib/; \ - $$_="our \$$Version=\"$(VER)\";\n" \ - if /VERSION_AUTOREPLACE/' alien.pl > alien + perl -pe '$$_="" if /use lib/; $$_="our \$$Version=\"$(VER)\";\n" if /VERSION_AUTOREPLACE/' alien.pl > alien } } diff --git a/debian/changelog b/debian/changelog index 6f21806..e7655ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +alien (8.61) unstable; urgency=low + + * Add em64t as another alias for amd64. + * Makefile.PL fix for new make line wrapping. + + -- Joey Hess Sat, 7 Jan 2006 13:37:07 -0500 + alien (8.60) unstable; urgency=low * Make cpio leading directory permission fixup code work with new cpio