releasing version 8.80

Instead, avoid populating fields with empty strings if rpm fails to
get a field value, either due to not knowing the field, or due to the
field not being set.

Alien/Package/Rpm.pm

@@ -76,13 +76,15 @@ sub scan {
 		POSTIN => 'postinst',
 		PREUN => 'prerm',
 		POSTUN => 'postrm',
+		LICENSE => 'copyright',
 	);
 
 	# Use --queryformat to pull out all the fields we need.
 	foreach my $field (qw{NAME VERSION RELEASE ARCH CHANGELOGTEXT
-		              SUMMARY DESCRIPTION COPYRIGHT PREFIXES},
+		              SUMMARY DESCRIPTION PREFIXES},
 	                   keys(%fieldtrans)) {
 		my $value=$this->runpipe(0, "LANG=C rpm -qp --queryformat \%{$field} $file");
+		next if $? || $value eq '(none)';
 		my $key;
 		if (exists $fieldtrans{$field}) {
 			$key=$fieldtrans{$field};
@@ -90,7 +92,6 @@ sub scan {
 		else {
 			$key=lc($field);
 		}
-		$value='' if $value eq '(none)';
 		$this->$key($value);
 	}
 
@@ -122,12 +123,18 @@ sub scan {
 			$this->summary('Converted RPM package');
 		}
 	}
-	unless (defined $this->copyright) {
-		$this->copyright('unknown');
-	}
 	unless (defined $this->description) {
 		$this->description($this->summary);
 	}
+	unless (defined $this->copyright) {
+		# Older rpms have no licence tag, but have a copyright.
+		$this->copyright($this->runpipe(0, "LANG=C rpm -qp --queryformat \%{COPYRIGHT} $file"));
+
+		# Fallback.
+		if (! $this->copyright) {
+			$this->copyright('unknown');
+		}
+	}
 	if (! defined $this->release || ! defined $this->version || 
 	    ! defined $this->name) {
 		die "Error querying rpm file";

alien.pl

@@ -67,6 +67,9 @@ standard linux directory tree. Do NOT run B<alien> on tar files with source
 code in them, unless you want this source code to be installed in your root
 directory when you install the package!
 
+When using B<alien> to convert a tgz package, all files in /etc in are assumed
+to be configuration files.
+
 =item pkg
 
 To manipulate packages in the Solaris pkg format (which is really the SV 
@@ -127,6 +130,16 @@ Like B<-g>, but do not generate the packagename.orig directory. This is only
 useful when you are very low on disk space and are generating a debian
 package.
 
+=item B<-c>, B<--scripts>
+
+Try to convert the scripts that are meant to be run when the
+package is installed and removed. Use this with caution, because these
+scripts might be designed to work on a system unlike your own, and could
+cause problems. It is recommended that you examine the scripts by hand
+and check to see what they do before using this option.
+
+This is enabled by default when converting from lsb packages.
+
 =item B<--patch=>I<patch>
 
 Specify the patch to be used instead of automatically looking the patch up
@@ -156,16 +169,6 @@ information.
 
 Note that without an argument, this displays the version of B<alien> instead.
 
-=item B<-c>, B<--scripts>
-
-Try to convert the scripts that are meant to be run when the
-package is installed and removed. Use this with caution, because these
-scripts might be designed to work on a system unlike your own, and could
-cause problems. It is recommended that you examine the scripts by hand
-and check to see what they do before using this option.
-
-This is enabled by default when converting from lsb packages.
-
 =item B<-T>, B<--test>
 
 Test the generated packages. Currently this is only supported for debian
@@ -258,14 +261,6 @@ included in generated debian packages.
 
 =back
 
-=head1 NOTES
-
-When using B<alien> to convert a tgz package, all files in /etc in are assumed
-to be configuration files.
-
-If B<alien> is not run as root, the files in the generated package will have
-incorrect owners and permissions.
-
 =head1 AUTHOR
 
 B<alien> was written by Christoph Lameter, B<<clameter@debian.org>>.

debian/changelog

@@ -1,3 +1,9 @@
+alien (8.80) unstable; urgency=low
+
+  * Support querying rpm LICENSE field. (Alexey Khoroshilov)
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 18 Apr 2010 15:44:52 -0400
+
 alien (8.79) unstable; urgency=low
 
   * Typo. Closes: #554379