[SCM] Debian Qt/KDE packaging tools branch, experimental, updated. master/0.4.2-9-ga96bd7f

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit 7ae01e7544a6aa8ca40de287384ce3762ef3d5a1
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Apr 11 15:29:47 2009 +0300

    Switch to named parameters for *_min_version() subs.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm b/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm
index 9b1cffd..2e14a8b 100644
--- a/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm
+++ b/symbolshelper/Debian/PkgKde/SymHelper/Handlers.pm
@@ -441,7 +441,7 @@ sub apply_patch_to_template {
             $self->preprocess();
 
             # Handle min version
-            $dummysymfile->handle_min_version($newminver);
+            $dummysymfile->handle_min_version($newminver, with_deprecated => 1);
             $dummysymfile->dump(*STDOUT, with_deprecated => 2);
 
             # Create a symbols template for our dummy file
diff --git a/symbolshelper/Debian/PkgKde/SymHelper/SymbFile.pm b/symbolshelper/Debian/PkgKde/SymHelper/SymbFile.pm
index 1f88f50..9edd87d 100644
--- a/symbolshelper/Debian/PkgKde/SymHelper/SymbFile.pm
+++ b/symbolshelper/Debian/PkgKde/SymHelper/SymbFile.pm
@@ -284,21 +284,21 @@ sub merge_symbols_from_symbfile {
 }
 
 sub set_min_version {
-    my ($self, $version, $with_deprecated) = @_;
+    my ($self, $version, %opts) = @_;
 
     while (my ($soname, $sonameobj) = each(%{$self->{objects}})) {
         while (my ($sym, $info) = each(%{$sonameobj->{syms}})) {
-            $info->{minver} = $version if ($with_deprecated || !$info->{deprecated});
+            $info->{minver} = $version if ($opts{with_deprecated} || !$info->{deprecated});
         }
     }
 }
 
 sub fix_min_versions {
-    my ($self, $with_deprecated) = @_;
+    my ($self, %opts) = @_;
 
     while (my ($soname, $sonameobj) = each(%{$self->{objects}})) {
         while (my ($sym, $info) = each(%{$sonameobj->{syms}})) {
-            if ($with_deprecated || !$info->{deprecated}) {
+            if ($opts{with_deprecated} || !$info->{deprecated}) {
                 my $minver = $info->{minver};
                 if ($minver =~ m/-.*[^~]$/) {
                     unless($minver =~ s/-[01](?:$|[^\d-][^-]*$)//) {
@@ -312,13 +312,13 @@ sub fix_min_versions {
 }
 
 sub handle_min_version {
-    my ($self, $version, $with_deprecated) = @_;
+    my ($self, $version, %opts) = @_;
 
     if (defined $version) {
         if ($version) {
-            $self->set_min_version($version, $with_deprecated);
+            $self->set_min_version($version, %opts);
         } else {
-            $self->fix_min_versions($with_deprecated);
+            $self->fix_min_versions(%opts);
         }
     }
 }
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index cea2501..c0a5093 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -190,7 +190,7 @@ sub subcommand_create {
                     "deprecate_incomplete" => $opt_deprecate_incomplete,
                 );
             }
-            $template->handle_min_version($opt_version, 1);
+            $template->handle_min_version($opt_version, with_deprecated => 1);
             return out_symfile($template);
         } else {
             error("no properly named symbol files found in $opt_dir");

-- 
Debian Qt/KDE packaging tools