From: short <>
Date: Thu, 21 Aug 2003 11:33:12 +0000 (+0000)
Subject: Fixed .deb building of 'orig'-based packages.
X-Git-Tag: lufs_0_9_6_captive1~17
X-Git-Url: http://git.jankratochvil.net/?p=macros.git;a=commitdiff_plain;h=6cf1604c42c41f1b95fae2d07e3b4725a1f99f90;hp=a836346ee6fb7a12766559562a00b0675ad48a59

Fixed .deb building of 'orig'-based packages.
Fixed .deb building of non-primary packages.
+Option '--cleanfilesfordir' to dump &cleanfilesfordir result.
---

diff --git a/AutoGen.pm b/AutoGen.pm
index 8f5399d..aa4bb64 100644
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -222,7 +222,7 @@ my($class,%args)=@_;
 	else {
 		my @origs;
 		for my $glob ("orig-$name-*.tar.{gz,Z}") {
-			@origs=glob "orig-$name-*.tar.{gz,Z,bz2}";
+			@origs=glob $glob;
 			confess "Invalid glob $glob: ".join(",",@origs) if 1!=@origs;
 			}
 		my $base=($origs[0]=~/^orig-(.*)[.]tar[.](?:gz|Z)$/)[0];
@@ -265,12 +265,27 @@ my($class,%args)=@_;
 	my $name=$Options{"name"};
 	$class->_prepdist($name);
 	_system "make distdir";
-	_system(join(" ","cd $name-*;dpkg-buildpackage",
+	# Copy 'orig' archive after &_prepdist which would delete it.
+	my @origs;
+	for my $glob ("orig-$name-*.tar.{gz,Z}") {
+		@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/;
+			_copy $origs[0],$deborig;
+			}
+		}
+	my @subdirs;
+	for my $glob ("$name-*") {
+		@subdirs=glob $glob;
+		confess "Invalid glob $glob: ".join(",",@subdirs) if 1!=@subdirs;
+		}
+	_system(join(" ","cd ".$subdirs[0].";dpkg-buildpackage",
 			"-rfakeroot",
 			($args{"sign"} ? () : ("-us","-uc")),
 			));
-	_remove \1,"$name-*";
-	_system "ls -l ${name}_*";
+	_remove \1,$subdirs[0];
+	_system "ls -l ${name}*_[0-9]*";
 	exit 0;	# should never return
 }
 
@@ -324,7 +339,7 @@ sub _cleanfiles
 						./<name>-[0-9]* ./<name>-devel-[0-9]*
 						./<name>.spec ./<name>.m4 ./<name>.spec.m4
 						./debian/tmp ./debian/<name>
-						./<name>_[0-9]*
+						./<name>*_[0-9]*
 						./macros/macros.dep
 						./po/Makefile.in.in ./po/POTFILES* ./po/cat-id-tbl.c ./po/cat-id-tbl.tmp
 						./po/*.gmo ./po/*.mo ./po/stamp-cat-id ./po/<name>.pot ./po/ChangeLog
@@ -457,6 +472,7 @@ my($class,%options)=@_;
 			  "rpmtest"  ,sub { $class->_rpmbuild("sign"=>0); },
 			  "deb"      ,sub { $class->_debbuild("sign"=>1); },
 			  "debtest"  ,sub { $class->_debbuild("sign"=>0); },
+			  "cleanfilesfordir=s",sub { print "$_\n" for (_cleanfilesfordir $_[1]); exit 0; },
 			  "dist"     ,\$Options{"ARGV_dist"},
 			  "copy!"    ,\$Options{"ARGV_copy"},
 			  "fullclean",\$Options{"ARGV_fullclean"},