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

[Modestas Vainius]

The following commit has been merged in the improved-gensymbols branch:
commit f1ba9e5c6f396c0750e863109216b78a5d88872e
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Jan 17 16:39:29 2010 +0200

    Add support for substitutions directly to pkgkde-gensymbols (dpkg-gensymbols wrapper).
    
    This renders `pkgkde-symbolshelper symbolfile` obsolete.
---
 debian/changelog                   |    3 ++
 symbolshelper/pkgkde-symbolshelper |   42 ++++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8619e99..77d3c15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ pkg-kde-tools (0.6.0~pre3) UNRELEASED; urgency=low
   * Add pkgkde-symbolshelper addon.
   * Port pkgkde-symbolshelper to the latest dpkg-dev symbols API.
     Most subcomands as of 0.4.0 are supported, some are no longer needed.
+  * Add support for substitutions directly to pkgkde-gensymbols
+    (dpkg-gensymbols wrapper). This renders `pkgkde-symbolshelper symbolfile`
+    obsolete.
 
  -- Modestas Vainius <modestas at vainius.eu>  Sun, 06 Dec 2009 22:06:01 +0200
 
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index 284f281..6669ced 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -202,23 +202,6 @@ sub subcommand_create {
     return 1;
 }
 
-sub subcommand_symbolfile {
-    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);
-	return out_symfile($symfile);
-    }
-    return 1;
-}
-
 sub subcommand_patch {
     error("NOT IMPLEMENTED YET");
 
@@ -263,6 +246,25 @@ sub subcommand_resort {
     return 1;
 }
 
+sub subcommand_symbolfile {
+    warning("'symbolfile' has been deprecated.");
+    info("you can add substitutions to standard symbol files and remove this call.");
+    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);
+	return out_symfile($symfile);
+    }
+    return 1;
+}
+
 sub subcommand_postgensymbols {
     warning("postgensymbols has been deprecated. Please remove this call.");
     return 1;
@@ -282,9 +284,9 @@ sub subcommand_boilerplate {
 
 my %SUBCOMMANDS = (
     "create"		=> [ 1, \&subcommand_create, "create symbol file template" ],
-    "symbolfile"	=> [ 2, \&subcommand_symbolfile, "generate symbol file from the template" ],
-    "patch"		=> [ 3, \&subcommand_patch, "apply dpkg-gensymbols patch to the symbol file template" ],
-    "resort"		=> [ 4, \&subcommand_resort, "resort symbol file" ],
+    "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." ],
     "postgensymbols"	=> [ 5, \&subcommand_postgensymbols, "deprecated. Does nothing" ],
 );
 

-- 
Debian Qt/KDE packaging tools