[SCM] Debian Qt/KDE packaging tools branch, improved-gensymbols, updated. debian/0.5.3-34-g35e4d6a

[Modestas Vainius]

The following commit has been merged in the improved-gensymbols branch:
commit 6f4bec39af9b4f4d1008753b3c22858b60967f46
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jan 18 00:55:31 2010 +0200

    More pkgkde-symbolshelper (<< 0.6.0) symbolfile compatibility fixes.
    
    * Do not fail without pkgkde-gensymbols when both `pkgkde-symbolshelper
      symbolfile` and old dpkg-gensymbols are used.
    * `pkgkde-symbolshelper postgensymbols` does not fail.
---
 .../Debian/PkgKde/SymbolsHelper/Symbol.pm          |    2 +-
 symbolshelper/pkgkde-symbolshelper                 |   19 +++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm b/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm
index 1aa996f..9355c01 100644
--- a/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm
+++ b/symbolshelper/Debian/PkgKde/SymbolsHelper/Symbol.pm
@@ -62,7 +62,7 @@ sub initialize {
 	    $self->{symbol_templ} = $self->{symbol};
 	}
 	if ($self->expand_substitutions(%opts) > 0) {
-	    $self->add_tag('subst');
+	    $self->add_tag('subst', 'compat');
 	}
     }
 
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index 90ec81e..32004c9 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -286,8 +286,9 @@ sub subcommand_resort {
 }
 
 sub subcommand_symbolfile {
-    warning("'symbolfile' has been deprecated.");
-    info("you can add substitutions to standard symbol files and remove this call.");
+    warning("'symbolfile' and debian/*.symbols.in files have been deprecated.");
+    info("You should add substitutions to standard symbol files and " .
+         "use pkgkde-gensymbols as dpkg-gensymbols wrapper.");
     my %opts = (
 	get_common_options("oipa"),
     );
@@ -299,6 +300,16 @@ sub subcommand_symbolfile {
 	}
 	# Redump to new location.
 	my $symfile = Debian::PkgKde::SymbolsHelper::SymbolFile->new(file => $opt_in, arch => $opt_arch);
+	foreach my $sym ($symfile->get_symbols()) {
+	    if ($sym->has_tag("subst")) {
+		my $val = $sym->get_tag_value("subst");
+		if (defined $val && $val eq "compat") {
+		    # Reset symbol template to current name value
+		    $sym->set_symbolname();
+		    $sym->delete_tag("subst");
+		}
+	    }
+	}
 	return out_symfile($symfile);
     }
     return 1;
@@ -306,7 +317,7 @@ sub subcommand_symbolfile {
 
 sub subcommand_postgensymbols {
     warning("postgensymbols has been deprecated. Please remove this call.");
-    return 1;
+    return 0;
 }
 
 # Boilerplate for the common subcommand handler
@@ -325,7 +336,7 @@ my %SUBCOMMANDS = (
     "create"		=> [ 1, \&subcommand_create, "create symbol file template" ],
     "patch"		=> [ 2, \&subcommand_patch, "apply dpkg-gensymbols patch to the symbol file template" ],
     "resort"		=> [ 3, \&subcommand_resort, "resort symbol file" ],
-    "symbolfile"	=> [ 4, \&subcommand_symbolfile, "deprecated. Redumps debian/package.symbols.in." ],
+    "symbolfile"	=> [ 4, \&subcommand_symbolfile, "deprecated by pkgkde-gensymbols wrapper" ],
     "postgensymbols"	=> [ 5, \&subcommand_postgensymbols, "deprecated. Does nothing" ],
 );
 

-- 
Debian Qt/KDE packaging tools