[hdf5] 01/01: Fix debian/sort-symbols to workaround bug #773718.

Gilles Filippini pini at moszumanska.debian.org
Mon Dec 22 23:07:59 UTC 2014


This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository hdf5.

commit 383e4f4150e8f71c45a02ff2e6eb14936b172354
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Dec 22 23:39:35 2014 +0100

    Fix debian/sort-symbols to workaround bug #773718.
---
 debian/changelog             |  7 ++++++
 debian/libhdf5-cpp-9.symbols | 56 ++++++++++++++++++++++----------------------
 debian/sort-symbols          |  8 +++----
 3 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22ff496..a47be64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hdf5 (1.8.14+docs-2) UNRELEASED; urgency=medium
+
+  * Fix helper script debian/sort-symbols to workaround bug #773718
+    against dpkg-dev (dpkg-gensymbols).
+
+ -- Gilles Filippini <pini at debian.org>  Mon, 22 Dec 2014 23:36:03 +0100
+
 hdf5 (1.8.14+docs-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/libhdf5-cpp-9.symbols b/debian/libhdf5-cpp-9.symbols
index e8c8a4c..24cb61e 100644
--- a/debian/libhdf5-cpp-9.symbols
+++ b/debian/libhdf5-cpp-9.symbols
@@ -796,6 +796,22 @@ libhdf5_cpp.so.9 libhdf5-cpp-9 #MINVER#
  (optional|c++)"H5::VarLenType::VarLenType(int)@HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"H5::VarLenType::fromClass() const at HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"H5::VarLenType::~VarLenType()@HDF5_CPP_1.8.9" 1.8.13
+ HDF5_CPP_1.8.10 at HDF5_CPP_1.8.10 1.8.14
+ HDF5_CPP_1.8.11 at HDF5_CPP_1.8.11 1.8.13
+ HDF5_CPP_1.8.12 at HDF5_CPP_1.8.12 1.8.13
+ HDF5_CPP_1.8.13 at HDF5_CPP_1.8.13 1.8.14
+ HDF5_CPP_1.8.14 at HDF5_CPP_1.8.14 1.8.14
+ HDF5_CPP_1.8.7 at HDF5_CPP_1.8.7 1.8.14
+ HDF5_CPP_1.8.8 at HDF5_CPP_1.8.8 1.8.14
+ HDF5_CPP_1.8.9 at HDF5_CPP_1.8.9 1.8.13
+ HDF5_SERIAL_1.8.10 at HDF5_SERIAL_1.8.10 1.8.13
+ HDF5_SERIAL_1.8.11 at HDF5_SERIAL_1.8.11 1.8.13
+ HDF5_SERIAL_1.8.12 at HDF5_SERIAL_1.8.12 1.8.13
+ HDF5_SERIAL_1.8.13 at HDF5_SERIAL_1.8.13 1.8.13
+ HDF5_SERIAL_1.8.14 at HDF5_SERIAL_1.8.14 1.8.14
+ HDF5_SERIAL_1.8.7 at HDF5_SERIAL_1.8.7 1.8.13
+ HDF5_SERIAL_1.8.8 at HDF5_SERIAL_1.8.8 1.8.13
+ HDF5_SERIAL_1.8.9 at HDF5_SERIAL_1.8.9 1.8.13
  (optional|c++)"non-virtual thunk to H5::Attribute::close()@HDF5_CPP_1.8.11" 1.8.13
  (optional|c++)"non-virtual thunk to H5::Attribute::fromClass() const at HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"non-virtual thunk to H5::Attribute::getId() const at HDF5_CPP_1.8.9" 1.8.13
@@ -887,6 +903,7 @@ libhdf5_cpp.so.9 libhdf5-cpp-9 #MINVER#
  (optional|c++)"typeinfo name for H5::ReferenceException at HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"typeinfo name for H5::StrType at HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"typeinfo name for H5::VarLenType at HDF5_CPP_1.8.9" 1.8.13
+ userAttrOpWrpr at HDF5_CPP_1.8.9 1.8.13
  (optional|c++)"vtable for H5::AbstractDs at HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"vtable for H5::ArrayType at HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"vtable for H5::AtomType at HDF5_CPP_1.8.9" 1.8.13
@@ -924,6 +941,17 @@ libhdf5_cpp.so.9 libhdf5-cpp-9 #MINVER#
  (optional|c++)"vtable for H5::ReferenceException at HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"vtable for H5::StrType at HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"vtable for H5::VarLenType at HDF5_CPP_1.8.9" 1.8.13
+libhdf5_hl_cpp.so.9 libhdf5-cpp-9 #MINVER#
+ (optional|c++)"FL_PacketTable::AppendPacket(void*)@HDF5_CPP_1.8.9" 1.8.13
+ (optional|c++)"FL_PacketTable::AppendPackets(unsigned long, void*)@Base" 1.8.14
+ (optional|c++)"FL_PacketTable::AppendPackets(unsigned long, void*)@HDF5_CPP_1.8.14" 1.8.14
+ (optional|c++)"FL_PacketTable::FL_PacketTable(int, char*)@HDF5_CPP_1.8.9" 1.8.13
+ (optional|c++)"FL_PacketTable::FL_PacketTable(int, char*, int, unsigned long long, int)@HDF5_CPP_1.8.9" 1.8.13
+ (optional|c++)"FL_PacketTable::GetNextPacket(void*)@HDF5_CPP_1.8.9" 1.8.13
+ (optional|c++)"FL_PacketTable::GetNextPackets(unsigned long, void*)@Base" 1.8.14
+ (optional|c++)"FL_PacketTable::GetNextPackets(unsigned long, void*)@HDF5_CPP_1.8.14" 1.8.14
+ (optional|c++)"FL_PacketTable::GetPacket(unsigned long long, void*)@HDF5_CPP_1.8.9" 1.8.13
+ (optional|c++)"FL_PacketTable::GetPackets(unsigned long long, unsigned long long, void*)@HDF5_CPP_1.8.9" 1.8.13
  HDF5_CPP_1.8.10 at HDF5_CPP_1.8.10 1.8.14
  HDF5_CPP_1.8.11 at HDF5_CPP_1.8.11 1.8.13
  HDF5_CPP_1.8.12 at HDF5_CPP_1.8.12 1.8.13
@@ -940,18 +968,6 @@ libhdf5_cpp.so.9 libhdf5-cpp-9 #MINVER#
  HDF5_SERIAL_1.8.7 at HDF5_SERIAL_1.8.7 1.8.13
  HDF5_SERIAL_1.8.8 at HDF5_SERIAL_1.8.8 1.8.13
  HDF5_SERIAL_1.8.9 at HDF5_SERIAL_1.8.9 1.8.13
- userAttrOpWrpr at HDF5_CPP_1.8.9 1.8.13
-libhdf5_hl_cpp.so.9 libhdf5-cpp-9 #MINVER#
- (optional|c++)"FL_PacketTable::AppendPacket(void*)@HDF5_CPP_1.8.9" 1.8.13
- (optional|c++)"FL_PacketTable::AppendPackets(unsigned long, void*)@Base" 1.8.14
- (optional|c++)"FL_PacketTable::AppendPackets(unsigned long, void*)@HDF5_CPP_1.8.14" 1.8.14
- (optional|c++)"FL_PacketTable::FL_PacketTable(int, char*)@HDF5_CPP_1.8.9" 1.8.13
- (optional|c++)"FL_PacketTable::FL_PacketTable(int, char*, int, unsigned long long, int)@HDF5_CPP_1.8.9" 1.8.13
- (optional|c++)"FL_PacketTable::GetNextPacket(void*)@HDF5_CPP_1.8.9" 1.8.13
- (optional|c++)"FL_PacketTable::GetNextPackets(unsigned long, void*)@Base" 1.8.14
- (optional|c++)"FL_PacketTable::GetNextPackets(unsigned long, void*)@HDF5_CPP_1.8.14" 1.8.14
- (optional|c++)"FL_PacketTable::GetPacket(unsigned long long, void*)@HDF5_CPP_1.8.9" 1.8.13
- (optional|c++)"FL_PacketTable::GetPackets(unsigned long long, unsigned long long, void*)@HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"PacketTable::GetIndex(int&)@HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"PacketTable::GetPacketCount(int&)@HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"PacketTable::IsValid()@HDF5_CPP_1.8.9" 1.8.13
@@ -965,19 +981,3 @@ libhdf5_hl_cpp.so.9 libhdf5-cpp-9 #MINVER#
  (optional|c++)"typeinfo name for FL_PacketTable at HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"typeinfo name for PacketTable at HDF5_CPP_1.8.9" 1.8.13
  (optional|c++)"vtable for FL_PacketTable at HDF5_CPP_1.8.9" 1.8.13
- HDF5_CPP_1.8.10 at HDF5_CPP_1.8.10 1.8.14
- HDF5_CPP_1.8.11 at HDF5_CPP_1.8.11 1.8.13
- HDF5_CPP_1.8.12 at HDF5_CPP_1.8.12 1.8.13
- HDF5_CPP_1.8.13 at HDF5_CPP_1.8.13 1.8.14
- HDF5_CPP_1.8.14 at HDF5_CPP_1.8.14 1.8.14
- HDF5_CPP_1.8.7 at HDF5_CPP_1.8.7 1.8.14
- HDF5_CPP_1.8.8 at HDF5_CPP_1.8.8 1.8.14
- HDF5_CPP_1.8.9 at HDF5_CPP_1.8.9 1.8.13
- HDF5_SERIAL_1.8.10 at HDF5_SERIAL_1.8.10 1.8.13
- HDF5_SERIAL_1.8.11 at HDF5_SERIAL_1.8.11 1.8.13
- HDF5_SERIAL_1.8.12 at HDF5_SERIAL_1.8.12 1.8.13
- HDF5_SERIAL_1.8.13 at HDF5_SERIAL_1.8.13 1.8.13
- HDF5_SERIAL_1.8.14 at HDF5_SERIAL_1.8.14 1.8.14
- HDF5_SERIAL_1.8.7 at HDF5_SERIAL_1.8.7 1.8.13
- HDF5_SERIAL_1.8.8 at HDF5_SERIAL_1.8.8 1.8.13
- HDF5_SERIAL_1.8.9 at HDF5_SERIAL_1.8.9 1.8.13
diff --git a/debian/sort-symbols b/debian/sort-symbols
index 8ddf733..d5d31fe 100755
--- a/debian/sort-symbols
+++ b/debian/sort-symbols
@@ -2,7 +2,7 @@
 
 # Scan
 symbols = File.readlines(ARGV[0]).collect do |line|
- if line =~ /^(#MISSING:.*#)? (\([^\)]+\))?(.*) ([^ ]+)$/ then
+ if line =~ /^(#MISSING:.*#)? (\([^\)]+\))?("?(.*)"?) ([^ ]+)$/ then
    $~.captures
  else
    [line]
@@ -31,20 +31,20 @@ end
 symbols.length.times do |index|
   (symbols.length - 1).downto(index) do |i|
     if symbols[i-1].length > 1 and symbols[i].length > 1 then
-      symbols[i-1], symbols[i] = symbols[i], symbols[i-1] unless symbols[i-1][2] < symbols[i][2]
+      symbols[i-1], symbols[i] = symbols[i], symbols[i-1] unless symbols[i-1][3] < symbols[i][3]
     end
   end
 end
 
 # Uniq
 (symbols.length - 1).downto(1) do |i|
-  symbols.delete_at(i) if symbols[i-1].length > 1 and symbols[i].length > 1 and not symbols[i-1][0] and not symbols[i][0] and symbols[i-1][2] == symbols[i][2]
+  symbols.delete_at(i) if symbols[i-1].length > 1 and symbols[i].length > 1 and not symbols[i-1][0] and not symbols[i][0] and symbols[i-1][3] == symbols[i][3]
 end
 
 # Output
 symbols.each do |symbol|
   if symbol.length > 1 then
-    puts "#{symbol[0]} #{symbol[1]}#{symbol[2]} #{symbol[3]}"
+    puts "#{symbol[0]} #{symbol[1]}#{symbol[2]} #{symbol[4]}"
   else
     puts "#{symbol[0]}"
   end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git



More information about the Pkg-grass-devel mailing list