The following commit has been merged in the master branch: commit 7822af84d540230ba0601e3695784366af3ca808 Author: Gilles Filippini <p...@debian.org> Date: Tue Dec 3 10:50:48 2013 +0100
debian/sort-symbols: script clean-up diff --git a/debian/sort-symbols b/debian/sort-symbols index 512e2f2..8ddf733 100755 --- a/debian/sort-symbols +++ b/debian/sort-symbols @@ -11,16 +11,17 @@ end # c++filt symbols.collect! do |symbol| - if symbol.length > 1 then - if symbol[2] =~ /^_Z/ then - symbol[2] = '"' + `echo #{symbol[2]} | c++filt`.chomp! + '"' - if symbol[1] then - flags = symbol[1][1...-1].split("|") - flags = (flags + ["optional", "c++"]).uniq - symbol[1] = "(" + flags.join("|") + ")" - else - symbol[1] = "(optional|c++)" - end + # if mangled c++ symbol + if symbol.length > 1 and symbol[2] =~ /^_Z/ then + # unmangle + symbol[2] = '"' + `echo #{symbol[2]} | c++filt`.chomp! + '"' + # add (optional|c++) if not present + if symbol[1] then + flags = symbol[1][1...-1].split("|") + flags = (flags + ["optional", "c++"]).uniq + symbol[1] = "(" + flags.join("|") + ")" + else + symbol[1] = "(optional|c++)" end end symbol -- Hierarchical Data Format 5 (HDF5) _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel