[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.7.3-9-gd1e71ad

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 8ce68666d3183fb9cac25d377996f5a5670c7415
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Fri May 14 14:37:32 2010 +0300

    pkgkde-symbolshelper: do not bump symbol minver when new substs are detected.
    
    Do not bump symbol minimum version when the only change made is detection of
    substs in the original symbol.
---
 debian/changelog                                   |    2 ++
 .../PkgKde/SymbolsHelper/SymbolFileCollection.pm   |    7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bb0773..bfa9817 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 pkg-kde-tools (0.7.4~pre1) UNRELEASED; urgency=low
 
   * pkgkde-symbolshelper: disable symbol file backups by default.
+  * pkgkde-symbolshelper: do not bump symbol minimum version when the only
+    change made is detection of substs in the original symbol.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 04 May 2010 11:09:03 +0300
 
diff --git a/perllib/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm b/perllib/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm
index 29d6413..5e9fb8e 100644
--- a/perllib/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm
+++ b/perllib/Debian/PkgKde/SymbolsHelper/SymbolFileCollection.pm
@@ -755,7 +755,8 @@ sub calc_properties {
 
 		# Finally set arch tag
 		$result->add_tag("arch", join(" ", map { "${arch_neg}$_" } sort(@narches)));
-	    } else { # Original symbol has no arch tags
+	    } else { # Original symbol has no more valid arch tags
+		$arch_added += scalar(keys %present);
 		if ($total_arches > 2 && keys(%present) == $total_arches - 1) {
 		    # Use !missing_arch if only a single arch is missing
 		    my $missarch;
@@ -793,8 +794,8 @@ sub calc_properties {
 	}
     }
 
-    # Bump symbol minver if new arches added
-    if (defined $result && keys(%present) && (!@oarches || $arch_added) &&
+    # Bump symbol minver if new arches added or there is no original symbol
+    if (defined $result && keys(%present) && (!defined $osym || $arch_added) &&
         ! $result->is_optional())
     {
 	$result->{minver} = $collection->get_latest_version();

-- 
Debian Qt/KDE packaging tools