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

Modestas Vainius modax at alioth.debian.org
Tue Feb 16 00:57:03 UTC 2010


The following commit has been merged in the master branch:
commit 8358f73bd64c753c1fb4a00d6f9dd0f4f9e9dd80
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Feb 16 02:52:31 2010 +0200

    `pkgkde-symbolshelper rewrite`: avoid dupe c++ aliases after convert.
    
    This is done by forking symbol file right before dumping it.
---
 debian/changelog                   |    2 ++
 symbolshelper/pkgkde-symbolshelper |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4e99d9..1181227 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ pkg-kde-tools (0.6.4~pre1) UNRELEASED; urgency=low
     a diff. Use -c0 -q to keep pkgkde-gensymbols completely quiet as before.
   * `pkgkde-symbolshelper create`: make it work with a single input symbol
     file.
+  * `pkgkde-symbolshelper rewrite`: avoid dupe c++ aliases after convert in
+    some cases.
 
  -- Modestas Vainius <modax at debian.org>  Tue, 16 Feb 2010 01:33:48 +0200
 
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index a3fcc9d..915f48e 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -660,7 +660,7 @@ sub subcommand_rewrite {
 		}
 	    }
 
-	    return out_symfile($symfile, %o);
+	    return out_symfile($symfile->fork(), %o);
 	} else {
 	    error("input symbol file ($opt_in) not found");
 	    return 1;

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list