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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 80ab275538bdf47b6777b5fd6bf018ce53eaf7b5
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Jan 31 02:20:26 2010 +0200

    Don't bother detecting substs if there are not enough arches in the group.
---
 .../PkgKde/SymbolsHelper/SymbolFileCollection.pm   |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm b/symbolshelper/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm
index d019c36..5d23360 100644
--- a/symbolshelper/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm
+++ b/symbolshelper/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm
@@ -271,21 +271,22 @@ sub create_template {
 		}
 		next;
 	    }
-
 	    # Calculate properties and detect substs.
 	    if (my $sym = $group->calc_properties($self)) {
-		# Then detect substs
-		my $substs_arch = ($group->has_symbol($orig_arch)) ?
-		    $orig_arch : ($group->get_arches())[0];
-		if ($group->detect_substs($substs_arch)) {
-			my $substs_sym = $group->get_symbol($substs_arch);
-			$sym->add_tag("subst");
-			$sym->reset_h_name($substs_sym->get_h_name());
+		# Then detect substs (we need two or more arch specific symbols for that)
+		if ($group->get_arches() > 1) {
+		    my $substs_arch = ($group->has_symbol($orig_arch)) ?
+			$orig_arch : ($group->get_arches())[0];
+
+		    if ($group->detect_substs($substs_arch)) {
+			    my $substs_sym = $group->get_symbol($substs_arch);
+			    $sym->add_tag("subst");
+			    $sym->reset_h_name($substs_sym->get_h_name());
+		    }
 		}
 
 		# Finally add to template
 		$template->add_symbol($soname, $sym);
-	    } else {
 	    }
 	}
     }

-- 
Debian Qt/KDE packaging tools