Hello community, here is the log from the commit of package build checked in at Tue Jun 3 21:59:58 CEST 2008. -------- --- build/build.changes 2008-05-29 16:43:43.000000000 +0200 +++ /mounts/work_src_done/NOARCH/build/build.changes 2008-06-03 17:57:06.549378000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 3 17:53:22 CEST 2008 - mls@suse.de + +- fix debtransform bug [bnc#396766] + +------------------------------------------------------------------- Old: ---- build-2008.05.29.tar.gz New: ---- build-2008.06.03.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.i24519/_old 2008-06-03 21:59:34.000000000 +0200 +++ /var/tmp/diff_new_pack.i24519/_new 2008-06-03 21:59:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2008.05.29) +# spec file for package build (Version 2008.06.03) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ Group: Development/Tools/Building AutoReqProv: on Summary: A Script to Build SUSE Linux RPMs -Version: 2008.05.29 +Version: 2008.06.03 Release: 1 Source: build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -52,6 +52,8 @@ %{_mandir}/man1/build.1.* %changelog +* Tue Jun 03 2008 mls@suse.de +- fix debtransform bug [bnc#396766] * Thu May 29 2008 mls@suse.de - add 11.0 config - fix debian provides ++++++ build-2008.05.29.tar.gz -> build-2008.06.03.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/build-2008.05.29/build new/build-2008.06.03/build --- old/build-2008.05.29/build 2008-05-29 15:34:36.000000000 +0200 +++ new/build-2008.06.03/build 2008-06-03 17:55:52.000000000 +0200 @@ -1015,7 +1015,7 @@ # now clean up RPM building directories # rm -rf $BUILD_ROOT$TOPDIR - for i in BUILD RPMS/`arch` RPMS/i386 RPMS/noarch SOURCES SPECS SRPMS ; do + for i in BUILD RPMS/`uname -m` RPMS/i386 RPMS/noarch SOURCES SPECS SRPMS ; do mkdir -p $BUILD_ROOT$TOPDIR/$i test $BUILD_USER = abuild && chown 399:399 $BUILD_ROOT$TOPDIR/$i done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/build-2008.05.29/Build/Deb.pm new/build-2008.06.03/Build/Deb.pm --- old/build-2008.05.29/Build/Deb.pm 2008-04-04 17:55:25.000000000 +0200 +++ new/build-2008.06.03/Build/Deb.pm 2008-06-03 17:56:10.000000000 +0200 @@ -60,7 +60,7 @@ $version =~ s/-[^-]+$//; } elsif ($tag eq 'SOURCE') { $name = $data; - } elsif ($tag eq 'BUILD-DEPENDS' || $tag eq 'BUILD-CONFLICTS' || $tag eq 'BUILD-IGNORE') { + } elsif ($tag eq 'BUILD-DEPENDS' || $tag eq 'BUILD-CONFLICTS' || $tag eq 'BUILD-IGNORE' || $tag eq 'BUILD-DEPENDS-INDEP') { my @d = split(/,\s*/, $data); for my $d (@d) { if ($d =~ /^(.*?)\s*\[(.*)\]$/) { @@ -84,7 +84,7 @@ $d =~ s/ \(([^\)]*)\)/ $1/g; $d =~ s/>>/>/g; $d =~ s/< 1; $tarfile = $tars[0]; } - if (!exists($tags->{'DEBTRANSFORM-FILES-TAR'})) { + if (@debtars && !exists($tags->{'DEBTRANSFORM-FILES-TAR'})) { die("package contains more than one debian tar file\n") if @debtars > 1; @debtarfiles = ($debtars[0]); } @@ -238,7 +238,7 @@ for (@c) { die("debian tar and directory both contain '$_->{'name'}'\n") if $dir{"debian.$_->{'name'}"}; undef $changelog if $_->{'name'} eq 'changelog'; - $debtarorigin{$_->{'name'}} = $debtarfile; + $debtarorigin{$_->{'name'}} = "$dir/$debtarfile"; } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org