[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.5.3-61-g33afb9a

[Modestas Vainius]

The following commit has been merged in the master branch:
commit fd321a7f7e5f8b13335de2b077edc28238ecbe88
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Jan 30 13:21:23 2010 +0200

    Cosmetic changes in pkgkde-symbolshelper.
---
 .../Debian/PkgKde/SymbolsHelper/Patching.pm        |    2 +-
 symbolshelper/pkgkde-symbolshelper                 |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Patching.pm b/symbolshelper/Debian/PkgKde/SymbolsHelper/Patching.pm
index 882c500..1e158b9 100644
--- a/symbolshelper/Debian/PkgKde/SymbolsHelper/Patching.pm
+++ b/symbolshelper/Debian/PkgKde/SymbolsHelper/Patching.pm
@@ -143,7 +143,7 @@ sub get_name {
     my $self = shift;
     if ($self->{source}) {
 	if ($self->has_info()) {
-	    return sprintf("%s_%s_%s (%s)", $self->{package},
+	    return sprintf("%s_%s_%s (--- %s)", $self->{package},
 		$self->{version}, $self->{arch}, $self->{source});
 	} else {
 	    return sprintf("--- %s +++ %s", $self->{source}, $self->{target});
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index 824e309..efc9250 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -249,7 +249,7 @@ sub subcommand_create {
 	    $symfiles->add_new_symfiles(values %symfiles);
 
 	    # Detect templinst symbols before substitutions and create template
-	    regular_print("Generating symbol file template.... (this might take a while)");
+	    regular_print("Generating symbol file template .... (this might take a while)");
 	    foreach my $symfile ($symfiles->get_symfiles()) {
 		foreach my $sym ($symfile->get_symbols()) {
 		    $sym->mark_cpp_templinst_as_optional();
@@ -370,13 +370,13 @@ sub subcommand_patch {
 		    }
 		} else {
 		    warning($str . "FAILED.");
-		    info("%s symbol file ignored. Failure output below:\n" .
+		    info("the patch has been ignored. Failure output below:\n" .
 			$patch->get_apply_output());
 		}
 	    }
 	}
 	unless (keys %psymfiles) {
-	    error("no valid symbol files could be loaded from supplied patch files");
+	    error("no valid symbol files could be loaded from the supplied patch files");
 	}
 
 	# Reset version if requested and drop patched symbol files which have
@@ -401,11 +401,12 @@ sub subcommand_patch {
 
 	# Finally create a SymbolFile collection and generate template
 	my $symfiles = new Debian::PkgKde::SymbolsHelper::SymbolFileCollection($symfile);
+	regular_print("Duplicating symbol file template on %s ...", join(", ", @carches));
 	$symfiles->fork_orig_symfile(@carches);
 	$symfiles->add_new_symfiles(values %psymfiles);
 
 	# Detect templinst symbols before substitutions and create template
-	regular_print("Generating symbol file template.... (this might take a while)");
+	regular_print("Generating symbol file template .... (this might take a while)");
 	foreach my $arch ($symfiles->get_new_arches()) {
 	    my $symfile = $symfiles->get_symfile($arch);
 	    foreach my $sym ($symfile->get_symbols()) {
@@ -424,7 +425,7 @@ sub subcommand_patch {
 	    my $sym = $template->get_symbol_object($info, $info->{soname});
 	    tweak_symbol($sym);
 	    if ($opt_verbose && !$printed_header) {
-		info("there are NEW symbols (the list includes optional):");
+		info("there are NEW symbols on %s (including optional):", $opt_arch);
 		$printed_header = 1;
 	    }
 	    if ($prev_soname ne $info->{soname}) {
@@ -440,7 +441,7 @@ sub subcommand_patch {
 	                         $a->get_symboltempl() cmp $b->get_symboltempl() }
 	                       $template->get_lost_symbols($symfile, with_optional => 1)) {
 	    if (!$printed_header) {
-		warning("there are LOST symbols (the list includes optional):");
+		warning("there are LOST symbols on %s (including optional):", $opt_arch);
 		$printed_header = 1;
 	    }
 	    if ($prev_soname ne $info->{soname}) {

-- 
Debian Qt/KDE packaging tools