git://git.jankratochvil.net
/
macros.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
38afe71
)
Support proper 'foreign'/patched packages versioning even for .deb pkgs.
author
short
<>
Sat, 20 Sep 2003 09:36:29 +0000
(09:36 +0000)
committer
short
<>
Sat, 20 Sep 2003 09:36:29 +0000
(09:36 +0000)
AutoGen.pm
patch
|
blob
|
history
diff --git
a/AutoGen.pm
b/AutoGen.pm
index
17c1483
..
36fd165
100644
(file)
--- a/
AutoGen.pm
+++ b/
AutoGen.pm
@@
-280,11
+280,14
@@
my($class,%args)=@_;
_system "make distdir";
# Copy 'orig' archive after &_prepdist which would delete it.
my @origs;
_system "make distdir";
# Copy 'orig' archive after &_prepdist which would delete it.
my @origs;
+ my $base;
for my $glob ("orig-$name-*.tar.{gz,Z,bz2}") {
@origs=glob $glob;
if (@origs) {
confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
for my $glob ("orig-$name-*.tar.{gz,Z,bz2}") {
@origs=glob $glob;
if (@origs) {
confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
- (my $deborig=$origs[0])=~s/^orig-([^-]+)-(.*)([.]tar[.][^.]+)$/$1_$2.orig$3/;
+ $origs[0]=~/^orig-([^-]+)-(.*)([.]tar[.][^.]+)$/;
+ my $deborig="$1_$2.orig$3";
+ $base="$1-$2";
_copy $origs[0],$deborig;
}
}
_copy $origs[0],$deborig;
}
}
@@
-293,11
+296,12
@@
my($class,%args)=@_;
@subdirs=glob $glob;
confess "Invalid glob $glob: ".join(",",@subdirs) if 1!=@subdirs;
}
@subdirs=glob $glob;
confess "Invalid glob $glob: ".join(",",@subdirs) if 1!=@subdirs;
}
- _system(join(" ","cd ".$subdirs[0].";dpkg-buildpackage",
+ rename $subdirs[0],$base or confess "$!";
+ _system(join(" ","cd ".$base.";dpkg-buildpackage",
"-rfakeroot",
($args{"sign"} ? () : ("-us","-uc")),
));
"-rfakeroot",
($args{"sign"} ? () : ("-us","-uc")),
));
- _remove \1,$
subdirs[0]
;
+ _remove \1,$
base
;
_system "ls -l ${name}*_[0-9]*";
exit 0; # should never return
}
_system "ls -l ${name}*_[0-9]*";
exit 0; # should never return
}