From 23baf2bcf4d22742f0ed7d4329672b05b340468a Mon Sep 17 00:00:00 2001
From: joey <joey@a4a2c43b-8ac3-0310-8836-e0e880c912e2>
Date: Sat, 22 Apr 2000 23:32:45 +0000
Subject: [PATCH]    * Major typo fix in Tgz.pm.    * Fixed newlines in tgz
 filelist.    * Fixed some undefined value warnings.

---
 Alien/Package/Rpm.pm | 3 +--
 Alien/Package/Tgz.pm | 6 ++++--
 Makefile.PL          | 1 +
 alien.pl             | 1 +
 debian/changelog     | 8 ++++++++
 debian/rules         | 8 +++++---
 6 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/Alien/Package/Rpm.pm b/Alien/Package/Rpm.pm
index d75a418..5a83232 100644
--- a/Alien/Package/Rpm.pm
+++ b/Alien/Package/Rpm.pm
@@ -332,8 +332,7 @@ sub build {
 		$opts="--target noarch" if $rpmarch eq 'noarch';
 	}
 
-	$opts.=" $ENV{RPMBUILDOPTS}" if exists $ENV{RPMBUILDOPTS};	
-
+	$opts.=" $ENV{RPMBUILDOPTS}" if exists $ENV{RPMBUILDOPTS};
 	system("cd $dir; rpm $opts -bb ".$this->name."-".$this->version."-".$this->release.".spec >/dev/null") &&
 		die "package build failed";
 
diff --git a/Alien/Package/Tgz.pm b/Alien/Package/Tgz.pm
index afe459a..71c23d5 100644
--- a/Alien/Package/Tgz.pm
+++ b/Alien/Package/Tgz.pm
@@ -97,7 +97,7 @@ sub scan {
 	# Strip out any tar extentions.
 	$basename=~s/\.(tgz|tar\.(gz|Z))$//;
 
-	if ($basename=~m/(.*)-(.*)/ ne undef) {
+	if ($basename=~m/(.*)-(.*)/) {
 		$this->name($1);
 		$this->version($2);
 	}
@@ -113,6 +113,7 @@ sub scan {
 	$this->copyright('unknown');
 	$this->release(1);
 	$this->distribution("Slackware");
+	$this->group("unknown");
 	$this->origformat('tgz');
 	$this->changelogtext('');
 	$this->binary_info(`ls -l $file`);
@@ -140,6 +141,7 @@ sub scan {
 	open (FILELIST, "tar ztf $file |") ||
 		die "getting filelist: $!";
 	while (<FILELIST>) {
+		chomp;
 		unless (m:^install/:) {
 			push @filelist, "/$_";
 		}
@@ -168,7 +170,7 @@ sub unpack {
 	system("cat $file | (cd ".$this->unpacked_tree."; tar zxpf -)") &&
 		die "Unpacking of `$file' failed: $!";
 	# Delete the install directory that has slackware info in it.
-	system("cd ".$this->unpacked_tree."rm -rf ./install");
+	system("cd ".$this->unpacked_tree."; rm -rf ./install");
 
 	return 1;
 }
diff --git a/Makefile.PL b/Makefile.PL
index f57b61b..4da0dfb 100755
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -28,6 +28,7 @@ extra_install:
 
 alien:
 	perl -pe ' \
+		$$_="" if /use lib/; \
 		$$_="\tmy \$$version_string=\"$(VER)\";\n" \
 			if /VERSION_AUTOREPLACE/' alien.pl > alien
 }
diff --git a/alien.pl b/alien.pl
index c04f846..7f8170c 100755
--- a/alien.pl
+++ b/alien.pl
@@ -205,6 +205,7 @@ License.
 =cut
 
 use strict;
+use lib '.'; # For debugging, removed by Makefile.
 use Getopt::Long;
 use Alien::Package::Deb;
 use Alien::Package::Rpm;
diff --git a/debian/changelog b/debian/changelog
index 056de85..a5a0e1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+alien (6.99.1) unstable; urgency=low
+
+  * Major typo fix in Tgz.pm.
+  * Fixed newlines in tgz filelist.
+  * Fixed some undefined value warnings.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 22 Apr 2000 16:12:44 -0700
+
 alien (6.99) unstable; urgency=low
 
   * The great rewrite. Alien is now based on pure object oriented package
diff --git a/debian/rules b/debian/rules
index 8ad432c..ed23e2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,12 +49,14 @@ installhook:
 	echo $(VERSION) > /home/pub/programs/alien/LATEST-VERSION-IS
 	rm /home/ftp/pub/code/alien/* || true
 	cd /home/ftp/pub/code/alien; \
-		ln -sf ../debian/alien_$(VERSION).tar.gz alien_$(VER).tar.gz; \
+		ln -sf ../debian/alien_$(VERSION).tar.gz alien_$(VERSION).tar.gz; \
 		ln -sf ../debian/alien_$(VERSION).tar.gz alien.tar.gz
-	fakeroot alien --to-slp /home/joey/debian/public/alien_*.deb
+	fakeroot alien -k --to-slp /home/joey/debian/public/alien_*.deb
 	mv alien-$(VERSION).slp /home/ftp/pub/code/alien/
-	fakeroot alien --to-rpm /home/joey/debian/public/alien_*.deb
+	fakeroot alien -k --to-rpm /home/joey/debian/public/alien_*.deb
 	mv alien-$(VERSION)*.rpm /home/ftp/pub/code/alien/
+	ln -s /home/ftp/pub/code/alien/alien-$(VERSION)*.rpm \
+		/home/ftp/pub/code/alien/alien.rpm 
 	ln -s /home/ftp/pub/code/alien/alien-$(VERSION).slp \
 		/home/ftp/pub/code/alien/alien.slp