[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.6

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 791f96d8aca8cd4fbd64a8f8b11cef50f927b4e3
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Feb 28 15:12:20 2010 +0200

    `pkgkde-symbolshelper rewrite`: understand -v again.
---
 debian/changelog                   |    1 +
 symbolshelper/pkgkde-symbolshelper |   13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3c92c74..cf8bcb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ pkg-kde-tools (0.6.6~pre2) UNRELEASED; urgency=low
   * pkgkde-deb2symbols: be quiet when dumping symbol file.
   * `pkgkde-symbolshelper batchpatch`: improve error messages.
   * Fix patch parsing when patches go one right after another.
+  * `pkgkde-symbolshelper rewrite`: understand -v again.
 
  -- Modestas Vainius <modax at debian.org>  Fri, 19 Feb 2010 20:30:09 +0200
 
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index 5307ef5..eb6f1e1 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -652,7 +652,7 @@ sub subcommand_rewrite {
     my $opt_template = 1;
     my $opt_convert;
     my %opts = (
-	get_common_options("boia"),
+	get_common_options("boiav"),
 	"template!" => \$opt_template,
 	"convert" => \$opt_convert,
     );
@@ -665,11 +665,12 @@ sub subcommand_rewrite {
 		template_mode => $opt_template
 	    );
 
-	    if ($opt_convert) {
-		foreach my $sym ($symfile->get_symbols()) {
-		    $sym->upgrade_virtual_table_symbol($opt_arch);
-		    tweak_symbol($sym, $opt_version);
-		}
+	    foreach my $sym ($symfile->get_symbols()) {
+		$sym->upgrade_virtual_table_symbol($opt_arch) if ($opt_convert);
+		tweak_symbol($sym, $opt_version);
+	    }
+	    foreach my $pat ($symfile->get_patterns()) {
+		tweak_symbol($pat, $opt_version);
 	    }
 
 	    return out_symfile($symfile->fork(), %o);

-- 
Debian Qt/KDE packaging tools