releasing version 8.66

* Use rpmbuild to build lsb packages, not rpm.

Alien/Package.pm

@@ -306,6 +306,21 @@ the filename of the generated package.
 
 sub build {}
 
+=item incrementrelease
+
+This method should increment the release field of the package by
+the specified number.
+
+=cut
+
+sub incrementrelease {
+	my $this=shift;
+	my $number=shift;
+	$^W=0; # Shut of possible "is not numeric" warning.
+	$this->release($this->release + $number);
+	$^W=1; # Re-enable warnings.
+}
+
 =item DESTROY
 
 When an object is destroyed, it cleans some stuff up. In particular, if the

Alien/Package/Deb.pm

@@ -227,7 +227,7 @@ sub scan {
 
 =item unpack
 
-Implment the unpack method to unpack a deb file.
+Implement the unpack method to unpack a deb file.
 
 =cut
 
@@ -522,7 +522,7 @@ sub cleantree {
 Set/get package name. 
 
 Always returns the packge name in lowercase with all invalid characters
-returned. The name is however, stored unchanged.
+rmoved. The name is however, stored unchanged.
 
 =cut
 
@@ -578,7 +578,7 @@ sub version {
 	# Make sure the version contains digets.
 	unless (/[0-9]/) {
 		# Drat. Well, add some. dpkg-deb won't work
-		# # on a version w/o numbers!
+		# on a version w/o numbers!
 		return $_."0";
 	}
 	return $_;
@@ -646,10 +646,10 @@ Returns the date, in rfc822 format.
 sub date {
 	my $this=shift;
 
-	my $date=$this->runpipe(1, "822-date");
+	my $date=$this->runpipe(1, "date -R");
 	chomp $date;
 	if (!$date) {
-		die "822-date did not return a valid result. You probably need to install the dpkg-dev debian package";
+		die "date -R did not return a valid result.";
 	}
 
 	return $date;

Alien/Package/Lsb.pm

@@ -103,7 +103,7 @@ the package.
 
 sub build {
 	my $this=shift;
-	my $buildcmd=shift || 'rpm';
+	my $buildcmd=shift || 'rpmbuild';
 	foreach (split(/:/,$ENV{PATH})) {
 		if (-x "$_/lsb-rpm") {
 			$buildcmd='lsb-rpm';
@@ -113,6 +113,14 @@ sub build {
 	$this->SUPER::build($buildcmd);
 }
 
+=item incrementrelease
+
+LSB package versions are not changed.
+
+=cut
+
+sub incrementrelease {}
+
 =back
 
 =head1 AUTHOR

Alien/Package/Rpm.pm

@@ -448,6 +448,10 @@ are typically shell scripts, but often lack the leading #!/bin/sh
 This can confuse dpkg, so add the #!/bin/sh if it looks like there
 is no shebang magic already in place.
 
+Also, if the rpm is relocatable, the script could refer to
+RPM_INSTALL_PREFIX, which is set by rpm at run time. Deal with this by
+adding code to the script to set RPM_INSTALL_PREFIX.
+
 =cut
 
 # This helper function deals with all the scripts.
@@ -457,9 +461,18 @@ sub _script_helper {
 
 	# set
 	if (@_) {
+		my $prefixcode="";
+		if (defined $this->prefixes) {
+			$prefixcode="RPM_INSTALL_PREFIX=".$this->prefixes."\n";
+			$prefixcode.="export RPM_INSTALL_PREFIX\n";
+		}
+
 		my $value=shift;
 		if (length $value and $value !~ m/^#!\s*\//) {
-			$value="#!/bin/sh\n$value";
+			$value="#!/bin/sh\n$prefixcode$value";
+		}
+		else {
+			$value=~s/\n/\n$prefixcode/s;
 		}
 		$this->{$script} = $value;
 	}

alien.pl

@@ -18,10 +18,6 @@ package format and install it. It also supports LSB packages.
 
 =head1 WARNING
 
-Despite the high version number, B<alien> is still (and will probably always
-be) rather experimental software. It's been under development for many
-years now, but there are still many bugs and limitations.
-
 B<alien> should not be used to replace important system packages, like
 init, libc, or other things that are essential for the functioning of
 your system. Many of these packages are set up differently by the
@@ -54,6 +50,9 @@ No guarantees are made that the generated lsb packages will be fully LSB
 compliant, and it's rather unlikely they will unless you build them in the
 lsbdev environment.
 
+Note that unlike other package formats, converting an LSB package to
+another format will not cause its minor version number to be changed.
+
 =item deb
 
 For converting to (but not from) deb format, the gcc, make, debhelper,
@@ -334,7 +333,7 @@ Usage: alien [options] file [...]
        --version=<version>  Specify package version.
   -p, --to-pkg              Generate a Solaris pkg package.
   -i, --install             Install generated package.
-  -g, --generate            Unpack, but do not generate a new package.
+  -g, --generate            Generate build tree, but do not build package.
   -c, --scripts             Include scripts in package.
   -v, --verbose             Display each command alien runs.
       --veryverbose         Be verbose, and also display output of run commands.
@@ -462,9 +461,7 @@ foreach my $file (@ARGV) {
 
 	# Increment release.
 	unless (defined $keepversion) {
-		$^W=0; # Shut of possible "is not numeric" warning.
+		$package->incrementrelease($versionbump);
-		$package->release($package->release + $versionbump);
-		$^W=1; # Re-enable warnings.
 	}
 	
 	foreach my $format (keys %destformats) {

alien.spec.in

@@ -4,7 +4,7 @@ Packager: Joey Hess <joey@kitenet.net>
 Version: @version@
 Release: 1
 Source: ftp://kitenet.net/pub/code/debian/alien_@version@.tar.gz
-Copyright: GPL
+License: GPL
 Group: Utilities/File
 Buildroot: /tmp/alien-@version@.build
 Requires: perl

debian/changelog

@@ -1,3 +1,26 @@
+alien (8.66) unstable; urgency=low
+
+  * Use date -R as 822-date will soon be deprecated.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 22 Mar 2007 17:45:24 -0400
+
+alien (8.65) unstable; urgency=low
+
+  * Fix alien's own spec file, s/Copyright/License/.
+  * Add support for rpm scripts that use RPM_INSTALL_PREFIX, by setting
+    RPM_INSTALL_PREFIX as part of the converted script. Closes: #400863
+  * When converting LSB packages, do not increment the release number.
+  * Use rpmbuild to build lsb packages, not rpm, if lsb-rpm is not available.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 15 Dec 2006 13:46:38 -0500
+
+alien (8.64) unstable; urgency=low
+
+  * Minor improvement to usage message as reported in [some random blog
+    somewhere that I happened to read by accident].
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 30 Mar 2006 12:51:45 -0500
+
 alien (8.63) unstable; urgency=low
 
   * Correct code to properly use RPMBUILDOPT (not RPMBUILDOPTS). Closes: #352816

debian/control

@@ -3,7 +3,8 @@ Section: admin
 Priority: optional
 Build-Depends: debhelper (>= 4), dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
+XS-Vcs-Svn: svn://svn.kitenet.net/joey/trunk/src/packages/alien
 
 Package: alien
 Architecture: all

debian/rules

@@ -39,15 +39,9 @@ binary-indep: build
 	dh_md5sums
 	dh_builddeb
 
-VERSION=$(shell expr "`dpkg-parsechangelog 2>/dev/null |grep Version:`" : '.*Version: \(.*\)')
+# Not intended for use by anyone except the author.
-
+announcedir:
-# Update the web page. Not intended for use by anyone except the author.
+	@echo ${HOME}/src/joeywiki/code/alien/news
-DIR=/home/web/kitenet.net/programs/alien
-installhook:
-	cp debian/changelog $(DIR)/CHANGES
-	echo -n $(VERSION) > $(DIR)/LATEST-VERSION-IS
-	rm -f $(DIR)/*.tar.gz
-	ln -sf /home/joey/lib/debian/unstable/alien_$(VERSION).tar.gz $(DIR)
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary