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

[Modestas Vainius]

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

    pkgkde-symbolshelper: drop symbolfile and postgensymbols subcommands.
    
    Those were deprecated long ago.
---
 debian/changelog     |    2 ++
 pkgkde-symbolshelper |   37 -------------------------------------
 2 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5af70df..7137895 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ pkg-kde-tools (0.7.4~pre2) UNRELEASED; urgency=low
   * Add support for perl tests under t/*.t subdirectory to Makefile.
   * Add t/perl_syntax_check.t for checking syntax of the perl scripts in
     the package.
+  * pkgkde-symbolshelper: drop symbolfile and postgensymbols subcommands
+    that were deprecated long ago.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 04 May 2010 11:09:03 +0300
 
diff --git a/pkgkde-symbolshelper b/pkgkde-symbolshelper
index 80ce68d..b97946c 100755
--- a/pkgkde-symbolshelper
+++ b/pkgkde-symbolshelper
@@ -697,41 +697,6 @@ sub subcommand_rewrite {
     return 1;
 }
 
-sub subcommand_symbolfile {
-    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"),
-    );
-    if (GetOptions(%opts)) {
-	check_mandatory_options("i", "when package (-p) is not specified") unless ($opt_package);
-	unless ($opt_in) {
-	    $opt_in = "debian/$opt_package.symbols.in";
-	    error("symbol template file '$opt_in' was not found for package '$opt_package'") unless (-r $opt_in);
-	}
-	# 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;
-}
-
-sub subcommand_postgensymbols {
-    warning("postgensymbols has been deprecated. Please remove this call.");
-    return 0;
-}
-
 # Boilerplate for the common subcommand handler
 sub subcommand_boilerplate {
     my %opts = (
@@ -749,8 +714,6 @@ my %SUBCOMMANDS = (
     "patch"		=> [ 2, \&subcommand_patch, "apply dpkg-gensymbols patch(es) to the symbol file template" ],
     "batchpatch"	=> [ 3, \&subcommand_batchpatch, "apply dpkg-gensymbols patches to multiple packages at once" ],
     "rewrite"		=> [ 4, \&subcommand_rewrite, "filter/rewrite symbol file" ],
-    "symbolfile"	=> [ 5, \&subcommand_symbolfile, "deprecated by pkgkde-gensymbols wrapper" ],
-    "postgensymbols"	=> [ 6, \&subcommand_postgensymbols, "deprecated. Does nothing" ],
 );
 
 report_options(info_fh => \*STDERR);

-- 
Debian Qt/KDE packaging tools