releasing version 8.84

* Use debhelper compat level v7 when building packages. All changes
  since v4 seem safe for alien's generated rules files.
* Use dh_prep instead of deprecated dh_clean -k.

.gitattributes

@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs

Alien/Package.pm

@@ -331,20 +331,27 @@ package was unpacked, it is time now to wipe out the temporary directory.
 sub DESTROY {
 	my $this=shift;
 
+	my $exitcode=$?;
+
 	return if (! defined $this->unpacked_tree || $this->unpacked_tree eq '');
 	# This should never happen, but it pays to check.
 	if ($this->unpacked_tree eq '/') {
 		die "alien internal error: unpacked_tree is set to '/'. Please file a bug report!";
 	}
 
-	# Just in case some dir perms are too screwed up for rm to work and
-	# we're not running as root. NB: can't use xargs
-	$this->do('find', $this->unpacked_tree, '-type', 'd', 
-	                  '-exec', 'chmod', '755', '{}', ';');
+	if (-d $this->unpacked_tree) {
+		# Just in case some dir perms are too screwed up for
+		# rm to work and we're not running as root. NB: can't
+		# use xargs
+		$this->do('find', $this->unpacked_tree, '-type', 'd', 
+		                  '-exec', 'chmod', '755', '{}', ';');
 	
-	$this->do('rm', '-rf', $this->unpacked_tree)
-		or die "unable to delete temporary directory '".$this->unpacked_tree."': $!";
-	$this->unpacked_tree('');	
+		$this->do('rm', '-rf', $this->unpacked_tree)
+			or die "unable to delete temporary directory '".$this->unpacked_tree."': $!";
+		$this->unpacked_tree('');
+	}
+
+	$?=$exitcode;
 }
 
 =item AUTOLOAD

Alien/Package/Deb.pm

@@ -383,6 +383,11 @@ sub prep {
 		close OUT;
 	}
 
+	# Use debhelper v7
+	open (OUT, ">$dir/debian/compat") || die "$dir/debian/compat: $!";
+	print OUT "7\n";
+	close OUT;
+
 	# A minimal rules file.
 	open (OUT, ">$dir/debian/rules") || die "$dir/debian/rules: $!";
 	my $fixpermscomment = $this->fixperms ? "" : "#";
@@ -390,12 +395,6 @@ sub prep {
 #!/usr/bin/make -f
 # debian/rules for alien
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Use v4 compatability mode, so ldconfig gets added to maint scripts.
-export DH_COMPAT=4
-
 PACKAGE=\$(shell dh_listpackages)
 
 build:
@@ -411,7 +410,7 @@ binary-indep: build
 binary-arch: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k -d
+	dh_prep
 	dh_installdirs
 
 	dh_installdocs
@@ -488,13 +487,27 @@ Build a deb.
 
 sub build {
 	my $this=shift;
+	
+	# Detect architecture mismatch and abort with a comprehensible
+	# error message.
+	my $arch=$this->arch;
+	if ($arch ne 'all') {
+		my $ret=system("dpkg-architecture", "-i".$arch);
+		if ($ret != 0) {
+			die $this->filename." is for architecture ".$this->arch." ; the package cannot be built on this system"."\n";
+		}
+	}
 
 	chdir $this->unpacked_tree;
 	my $log=$this->runpipe(1, "debian/rules binary 2>&1");
-	if ($?) {
+	chdir "..";
+	my $err=$?;
+	if ($err) {
+		if (! defined $log) {
+			die "Package build failed; could not run generated debian/rules file.\n";
+		}
 		die "Package build failed. Here's the log:\n", $log;
 	}
-	chdir "..";
 
 	return $this->name."_".$this->version."-".$this->release."_".$this->arch.".deb";
 }
@@ -734,7 +747,7 @@ sub postinst {
 	return $postinst unless ref $owninfo;
 
 	# If there is no postinst, let's make one up..
-	$postinst="#!/bin/sh\n" unless length $postinst;
+	$postinst="#!/bin/sh\n" unless defined $postinst && length $postinst;
 	
 	return $postinst unless %$owninfo;
 	

Alien/Package/Rpm.pm

@@ -159,7 +159,13 @@ sub unpack {
 	$this->SUPER::unpack(@_);
 	my $workdir=$this->unpacked_tree;
 	
-	$this->do("rpm2cpio ".$this->filename." | (cd $workdir; cpio --extract --make-directories --no-absolute-filenames --preserve-modification-time) 2>&1")
+	# Check if we need to use lzma to uncompress the cpio archive
+	my $decomp='';
+	if ($this->do("rpm2cpio ".$this->filename." | lzma -t -q > /dev/null 2>&1")) {
+		$decomp = 'lzma -d -q |';
+	}
+
+	$this->do("rpm2cpio ".$this->filename." | (cd $workdir; $decomp cpio --extract --make-directories --no-absolute-filenames --preserve-modification-time) 2>&1")
 		or die "Unpacking of '".$this->filename."' failed";
 	
 	# cpio does not necessarily store all parent directories in an
@@ -168,7 +174,7 @@ sub unpack {
 	# Find those directories and make them mode 755, which is more
 	# reasonable.
 	my %seenfiles;
-	open (RPMLIST, "rpm2cpio ".$this->filename." | cpio -it --quiet |")
+	open (RPMLIST, "rpm2cpio ".$this->filename." | $decomp cpio -it --quiet |")
 		or die "File list of '".$this->filename."' failed";
 	while (<RPMLIST>) {
 		chomp;
@@ -265,15 +271,20 @@ sub unpack {
 			}
 			$gid=0;
 		}
-		if (defined($owninfo{$file}) && ($mode & 07000 > 0)) {
+		if (defined($owninfo{$file}) && (($mode & 07000) > 0)) {
 			$modeinfo{$file} = sprintf "%lo", $mode;
 		}
-		if ($> == 0) {
-			$this->do("chown", "$uid:$gid", "$workdir/$file") 
-				|| die "failed chowning $file to $uid\:$gid\: $!";
+		# Note that ghost files exist in the metadata but not
+                # in the cpio archive, so check that the file exists
+		# before trying to access it
+		if (-e "$workdir/$file") {
+			if ($> == 0) {
+				$this->do("chown", "$uid:$gid", "$workdir/$file") 
+					|| die "failed chowning $file to $uid\:$gid\: $!";
+			}
+			$this->do("chmod", sprintf("%lo", $mode), "$workdir/$file") 
+				|| die "failed changing mode of $file to $mode\: $!";
 		}
-		$this->do("chmod", sprintf("%lo", $mode), "$workdir/$file") 
-			|| die "failed changing mode of $file to $mode\: $!";
 	}
 	$this->owninfo(\%owninfo);
 	$this->modeinfo(\%modeinfo);

debian/changelog

@@ -1,3 +1,47 @@
+alien (8.84) unstable; urgency=low
+
+  * Silence error message when deleting build tree after making an rpm,
+    if rpmbuild has already deleted it. Closes: #622846
+  * Squash an uninitialized value when creating a deb.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 15 Apr 2011 14:13:20 -0400
+
+alien (8.83) unstable; urgency=low
+
+  * Correct handling of arch all packages in deb arch check. Closes: #596209
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 09 Sep 2010 08:24:58 -0400
+
+alien (8.82) unstable; urgency=low
+
+  * Use debhelper compat level v7 when building packages. All changes
+    since v4 seem safe for alien's generated rules files.
+  * Use dh_prep instead of deprecated dh_clean -k.
+  * Print a nice error message when attempting to build a deb from a package
+    of an unsupported architecture. Closes: #592625
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 30 Aug 2010 17:04:24 -0400
+
+alien (8.81) unstable; urgency=low
+
+  * Avoid uninitialized value warning when debian/rules fails to run
+    due to alien being run in a noexec directory. Closes: #579216
+  * Prevent DESTROY stomping on alien's exit code sometimes.
+  * Support extracting lzma compressed RPMs. 
+    (Patch by unnamed person on some bug tracking system I don't frequent.)
+  * Suggest lzma. If not installed, alien will still fail to decompress
+    RPMs using it, but will support most rpms, which are not.
+  * Fix precedence problem that prevented alien from preserving permissions
+    of suid/sgid binaries that are not owned by root.
+    (Patch by Duane Waddle, on a bug tracking system I don't frequent, that
+    was about the "expire" it 4 days from now. We got lucky Duane, but please
+    use the Debian BTS next time!)
+  * Support RPMs containing ghost files.
+    (Patch by Ben Webb, who would get his patches applied quicker if he
+    actually communicated them to the program's author.)
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 17 May 2010 20:56:59 -0400
+
 alien (8.80) unstable; urgency=low
 
   * Support querying rpm LICENSE field. (Alexey Khoroshilov)

debian/control

@@ -3,15 +3,15 @@ Section: admin
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50)
 Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Vcs-Git: git://git.kitenet.net/alien
 Homepage: http://kitenet.net/~joey/code/alien/
 
 Package: alien
 Architecture: all
 Section: admin
-Depends: debhelper (>= 3), ${misc:Depends}, ${perl:Depends}, rpm (>= 2.4.4-2), dpkg-dev, make, cpio, rpm2cpio
-Suggests: patch, bzip2, lsb-rpm, lintian
+Depends: debhelper (>= 7), ${misc:Depends}, ${perl:Depends}, rpm (>= 2.4.4-2), dpkg-dev, make, cpio, rpm2cpio
+Suggests: patch, bzip2, lsb-rpm, lintian, lzma
 Description: convert and install rpm and other packages
  Alien allows you to convert LSB, Red Hat, Stampede and Slackware Packages
  into Debian packages, which can be installed with dpkg.

debian/copyright

@@ -1,35 +1,13 @@
-This is a program originally written by Christoph Lameter
-<clameter@debian.org>.
+Format: http://dep.debian.net/deps/dep5/
+Source: native package
 
-Deb to rpm conversion code was taken from the Martian program by
-Randolph Chung <randolph@tausq.org>.
-
-The Solaris pkg code was written by Mark A. Hershberger
-<mah@everybody.org>.
-
-This program is now maintained by Joey Hess <joeyh@debian.org>.
-
-Copyright 1996, 1997 Christoph Lameter
-Portions copyright 1997 Randolph Chung
-Portions copyright 2001 Mark A. Hershberger
-Copyright 1997-2007 Joey Hess
-
-License:
-
-    alien is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GPL can be found in
-/usr/share/common-licenses/GPL.
+Files: *
+Copyright:
+ 1996, 1997 Christoph Lameter
+ 1997 Randolph Chung
+ 2001 Mark A. Hershberger
+ 1997-2011 Joey Hess
+License: GPL-2+
+ On Debian systems, the complete text of the GPL can be found in
+ /usr/share/common-licenses/GPL.