* Major typo fix in Tgz.pm.

* Fixed newlines in tgz filelist.
   * Fixed some undefined value warnings.
This commit is contained in:
joey
2000-04-22 23:32:45 +00:00
parent 84a8367902
commit 23baf2bcf4
6 changed files with 20 additions and 7 deletions

View File

@@ -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";

View File

@@ -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;
}

View File

@@ -28,6 +28,7 @@ extra_install:
alien:
perl -pe ' \
$$_="" if /use lib/; \
$$_="\tmy \$$version_string=\"$(VER)\";\n" \
if /VERSION_AUTOREPLACE/' alien.pl > alien
}

View File

@@ -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;

8
debian/changelog vendored
View File

@@ -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

8
debian/rules vendored
View File

@@ -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