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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 228e9a883a029af92f944e6cf95484426fff0279
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Feb 6 15:16:52 2010 +0200

    Create initial template basing it on the arch specific symbol file.
    
    Now `pkgkde-symbolshelper create` bases its template on the arch specific
    symbol file. (as specified with -a option). This alters arch tag generation a
    bit (negative arches are used more frequently than before).
---
 debian/changelog                   |    3 +++
 symbolshelper/pkgkde-symbolshelper |    6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b1562b..feba911 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ pkg-kde-tools (0.6.1) UNRELEASED; urgency=low
 
   * Rework detection of arch specific symbols. This should fix some bugs
     with arch symbol tag processing and generation.
+  * Now `pkgkde-symbolshelper create` bases its template on the arch specific
+    symbol file (as specified with -a option). This alters arch tag generation
+    a bit (negative arches are used more frequently than before).
 
  -- Modestas Vainius <modax at debian.org>  Sat, 06 Feb 2010 15:05:44 +0200
 
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index aaf6281..3201d96 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -229,13 +229,15 @@ sub subcommand_create {
 	    }
 
 	    # Create collection and generate template
-	    my $orig_symfile = $symfiles{$opt_arch}->fork_empty();
+	    my $orig_symfile = $symfiles{$opt_arch}->fork();
+	    delete $symfiles{$opt_arch};
 	    my $symfiles = Debian::PkgKde::SymbolsHelper::SymbolFileCollection->new($orig_symfile);
 	    $symfiles->add_new_symfiles(values %symfiles);
+	    $symfiles->add_confirmed_arches($opt_arch);
 
 	    # Detect templinst symbols before substitutions and create template
 	    regular_print("Generating symbol file template .... (this might take a while)");
-	    foreach my $symfile ($symfiles->get_symfiles()) {
+	    foreach my $symfile ($orig_symfile, $symfiles->get_symfiles()) {
 		foreach my $sym ($symfile->get_symbols()) {
 		    $sym->mark_cpp_templinst_as_optional();
 		}

-- 
Debian Qt/KDE packaging tools