releasing version 8.87

Note that lsb-rpm has been dropped from rpm in Debian unstable. So
this changes nothing really; it already fell back to rpmbuild.

And I can find no mention of either lsb-rpm or lsb-rpmbuild in the LSB
spec, although I didn't look very hard.

Alien/Package/Deb.pm

@@ -443,18 +443,16 @@ EOF
 	close OUT;
 	$this->do("chmod", 755, "$dir/debian/rules");
 
-	# Save any scripts.
 	if ($this->usescripts) {
 		foreach my $script (qw{postinst postrm preinst prerm}) {
-			my $data=$this->$script();
+			$this->savescript($script, $this->$script());
-			next unless defined $data;
-			next if $data =~ m/^\s*$/;
-			open (OUT,">$dir/debian/$script") ||
-				die "$dir/debian/$script: $!";
-			print OUT $data;
-			close OUT;
 		}
 	}
+	else {
+		# There may be a postinst with permissions fixups even when
+		# scripts are disabled.
+		$this->savescript("postinst", undef);
+	}
 	
 	my %dirtrans=( # Note: no trailing slashes on these directory names!
 		# Move files to FHS-compliant locations, if possible.
@@ -596,6 +594,8 @@ sub version {
 	# get
 	return unless defined wantarray; # optimization
 	$_=$this->{version};
+	# filter out some characters not allowed in debian versions
+	s/[^-.+~:A-Za-z0-9]//g; # see lib/dpkg/parsehelp.c parseversion
 	# Make sure the version contains digets.
 	unless (/[0-9]/) {
 		# Drat. Well, add some. dpkg-deb won't work
@@ -727,30 +727,50 @@ sub username {
 	return $username;
 }
 
-=item postinst
+=item savescript
 
-Returns the postinst. This may include generated shell code to set owners
+Saves script to debian directory.
-and groups from the owninfo field, and update modes from the modeinfo field.
 
 =cut
 
-sub postinst {
+sub savescript {
 	my $this=shift;
+	my $script=shift;
+	my $data=shift;
 
-	if (@_) {
+	if ($script eq 'postinst') {
-		$this->{postinst}=shift;
+		$data=$this->gen_postinst($data);
 	}
 
+	my $dir=$this->unpacked_tree;
+
+	return unless defined $data;
+	next if $data =~ m/^\s*$/;
+	open (OUT,">$dir/debian/$script") ||
+		die "$dir/debian/$script: $!";
+	print OUT $data;
+	close OUT;
+}
+
+=item gen_postinst
+
+Modifies or creates a postinst. This may include generated shell code to set
+owners and groups from the owninfo field, and update modes from the modeinfo
+field.
+
+=cut
+
+sub gen_postinst {
+	my $this=shift;
+	my $postinst=shift;
+
 	my $owninfo = $this->owninfo;
 	my $modeinfo = $this->modeinfo;
-	my $postinst = $this->{postinst};
+	return $postinst unless ref $owninfo && %$owninfo;
-	return $postinst unless ref $owninfo;
 
 	# If there is no postinst, let's make one up..
 	$postinst="#!/bin/sh\n" unless defined $postinst && length $postinst;
 	
-	return $postinst unless %$owninfo;
-	
 	my ($firstline, $rest)=split(/\n/, $postinst, 2);
 	if ($firstline !~ m/^#!\s*\/bin\/(ba)?sh/) {
 		print STDERR "warning: unable to add ownership fixup code to postinst as the postinst is not a shell script!\n";

Alien/Package/Lsb.pm

@@ -96,8 +96,8 @@ sub revert {
 
 =item build
 
-Uses the parent's build method. If a lsb-rpm is available, uses it to build
+Uses the parent's build method. If a lsb-rpmbuild is available, uses it to
-the package.
+build the package.
 
 =cut
 
@@ -105,8 +105,8 @@ sub build {
 	my $this=shift;
 	my $buildcmd=shift || 'rpmbuild';
 	foreach (split(/:/,$ENV{PATH})) {
-		if (-x "$_/lsb-rpm") {
+		if (-x "$_/lsb-rpmbuild") {
-			$buildcmd='lsb-rpm';
+			$buildcmd='lsb-rpmbuild';
 			last;
 		}
 	}

Alien/Package/Rpm.pm

@@ -424,7 +424,7 @@ sub build {
 		$opts="--buildarch ".$this->arch;
 	}
 	else {
-		# Presumably we're delaing with rpm 3.0 or above, which
+		# Presumably we're dealing with rpm 3.0 or above, which
 		# doesn't output rpmdir in any format I'd care to try to
 		# parse. Instead, rpm is now of a late enough version to
 		# notice the %define's in the spec file, that will make the

debian/changelog

@@ -1,3 +1,18 @@
+alien (8.87) unstable; urgency=low
+
+  * Use lsb-rpmbuild, not lsb-rpm. Closes: #667044
+  * Fix adding of postinst script to deb, containing rpm permissions
+    fixups code. Closes: #667651
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 05 Apr 2012 13:53:29 -0400
+
+alien (8.86) unstable; urgency=low
+
+  * Filter out illegal characters in version number when building a deb.
+    Closes: #648531
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 12 Nov 2011 13:12:35 -0400
+
 alien (8.85) unstable; urgency=low
 
   * Avoid breaking on spaces in filenames. Closes: #618636

debian/control

@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Build-Depends: debhelper (>= 7.0.50)
 Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.kitenet.net/alien
 Homepage: http://kitenet.net/~joey/code/alien/
 

debian/copyright

@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: native package
 
 Files: *