[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.4.3-2-52-g0e65c31

Thomas Weber tweber at debian.org
Mon Jan 30 22:03:30 UTC 2012 

The following commit has been merged in the master branch:
commit b2dcab565be5246d96c9a3a64ade3fa1d7feba22
Author: Thomas Weber <tweber at debian.org>
Date:   Wed Jan 25 22:03:15 2012 +0000

    Use demangled names for non-virtual thunks in the symbols file.
    
    This avoids special casing them in the 32/64 bit symbol files and is explained
    in dpkg-gensymbols(1).

diff --git a/debian/liboctave0.symbols b/debian/liboctave0.symbols
index 1e4e407..19ee636 100644
--- a/debian/liboctave0.symbols
+++ b/debian/liboctave0.symbols
@@ -13915,6 +13915,23 @@ liboctave.so.0 liboctave0 #MINVER#
  _ZTVN10idx_vector14idx_scalar_repE at Base 3.4.3
  _ZTVN10idx_vector14idx_vector_repE at Base 3.4.3
  _ZTVN12octave_shlib9shlib_repE at Base 3.4.3
+# non-virtual thunks differ across architectures in their mangled name
+# So we use the demangled name (see dpkg-gensymbols(1))
+# NOTE: these symbols are NOT optional!
+ (c++)"non-virtual thunk to ODE::~ODE()@Base" 3.4.3
+ (c++)"non-virtual thunk to ODE::~ODE()@Base" 3.4.3
+ (c++)"non-virtual thunk to LSODE::~LSODE()@Base" 3.4.3
+ (c++)"non-virtual thunk to LSODE::~LSODE()@Base" 3.4.3
+ (c++)"non-virtual thunk to DAE::~DAE()@Base" 3.4.3
+ (c++)"non-virtual thunk to DAE::~DAE()@Base" 3.4.3
+ (c++)"non-virtual thunk to DAERT::~DAERT()@Base" 3.4.3
+ (c++)"non-virtual thunk to DAERT::~DAERT()@Base" 3.4.3
+ (c++)"non-virtual thunk to DASPK::~DASPK()@Base" 3.4.3
+ (c++)"non-virtual thunk to DASPK::~DASPK()@Base" 3.4.3
+ (c++)"non-virtual thunk to DASRT::~DASRT()@Base" 3.4.3
+ (c++)"non-virtual thunk to DASRT::~DASRT()@Base" 3.4.3
+ (c++)"non-virtual thunk to DASSL::~DASSL()@Base" 3.4.3
+ (c++)"non-virtual thunk to DASSL::~DASSL()@Base" 3.4.3
  _ZZN10DiagArray2ISt7complexIdEE4elemEiiE4zero at Base 3.4.3
  _ZZN10DiagArray2ISt7complexIfEE4elemEiiE4zero at Base 3.4.3
  _ZZN10DiagArray2IbE4elemEiiE4zero at Base 3.4.3
@@ -27078,6 +27095,21 @@ liboctinterp.so.0 liboctave0 #MINVER#
  _ZTVN6uimenu10propertiesE at Base 3.4.3
  _ZTVN7hggroup10propertiesE at Base 3.4.3
  _ZTVN7surface10propertiesE at Base 3.4.3
+# non-virtual thunks differ across architectures in their mangled name
+# So we use the demangled name (see dpkg-gensymbols(1))
+# NOTE: these symbols are NOT optional!
+ (c++)"non-virtual thunk to iprocstream::~iprocstream()@Base" 3.4.3
+ (c++)"non-virtual thunk to iprocstream::~iprocstream()@Base" 3.4.3
+ (c++)"non-virtual thunk to hdf5_ifstream::~hdf5_ifstream()@Base" 3.4.3
+ (c++)"non-virtual thunk to hdf5_ifstream::~hdf5_ifstream()@Base" 3.4.3
+ (c++)"non-virtual thunk to hdf5_ofstream::~hdf5_ofstream()@Base" 3.4.3
+ (c++)"non-virtual thunk to hdf5_ofstream::~hdf5_ofstream()@Base" 3.4.3
+ (c++)"non-virtual thunk to c_file_ptr_stream<std::basic_iostream<char, std::char_traits<char> >, _IO_FILE*, c_file_ptr_buf>::~c_file_ptr_stream()@Base" 3.4.3
+ (c++)"non-virtual thunk to c_file_ptr_stream<std::basic_iostream<char, std::char_traits<char> >, _IO_FILE*, c_file_ptr_buf>::~c_file_ptr_stream()@Base" 3.4.3
+ (c++)"non-virtual thunk to c_file_ptr_stream<std::basic_iostream<char, std::char_traits<char> >, void*, c_zfile_ptr_buf>::~c_file_ptr_stream()@Base" 3.4.3
+ (c++)"non-virtual thunk to c_file_ptr_stream<std::basic_iostream<char, std::char_traits<char> >, void*, c_zfile_ptr_buf>::~c_file_ptr_stream()@Base" 3.4.3
+ (c++)"non-virtual thunk to oprocstream::~oprocstream()@Base" 3.4.3
+ (c++)"non-virtual thunk to oprocstream::~oprocstream()@Base" 3.4.3
  _ZZ23write_mat5_integer_dataI10octave_intIaEEvRSoPKT_iiE3buf at Base 3.4.3
  _ZZ23write_mat5_integer_dataI10octave_intIhEEvRSoPKT_iiE3buf at Base 3.4.3
  _ZZ23write_mat5_integer_dataI10octave_intIiEEvRSoPKT_iiE3buf at Base 3.4.3
diff --git a/debian/liboctave0.symbols.32bit b/debian/liboctave0.symbols.32bit
index 56a3a61..5c5eb2c 100644
--- a/debian/liboctave0.symbols.32bit
+++ b/debian/liboctave0.symbols.32bit
@@ -6789,20 +6789,6 @@ liboctave.so.0 liboctave0 #MINVER#
  (c++|regex|optional=templateInstantiation)"void std::reverse<.*>\(.*\)@Base" 3.4.3
  _ZSt8__rotateIP10octave_intIxEEvT_S3_S3_St26random_access_iterator_tag at Base 3.4.3
  _ZSt8__rotateIP10octave_intIyEEvT_S3_S3_St26random_access_iterator_tag at Base 3.4.3
- _ZThn44_N3ODED0Ev at Base 3.4.3
- _ZThn44_N3ODED1Ev at Base 3.4.3
- _ZThn44_N5LSODED0Ev at Base 3.4.3
- _ZThn44_N5LSODED1Ev at Base 3.4.3
- _ZThn60_N3DAED0Ev at Base 3.4.3
- _ZThn60_N3DAED1Ev at Base 3.4.3
- _ZThn60_N5DAERTD0Ev at Base 3.4.3
- _ZThn60_N5DAERTD1Ev at Base 3.4.3
- _ZThn60_N5DASPKD0Ev at Base 3.4.3
- _ZThn60_N5DASPKD1Ev at Base 3.4.3
- _ZThn60_N5DASRTD0Ev at Base 3.4.3
- _ZThn60_N5DASRTD1Ev at Base 3.4.3
- _ZThn60_N5DASSLD0Ev at Base 3.4.3
- _ZThn60_N5DASSLD1Ev at Base 3.4.3
  _ZZN5ArrayI10octave_intIxEE17resize_fill_valueEvE4zero at Base 3.4.3
  _ZZN5ArrayI10octave_intIxEE7resize1EiRKS1_E15max_stack_chunk at Base 3.4.3
  _ZZN5ArrayI10octave_intIyEE17resize_fill_valueEvE4zero at Base 3.4.3
@@ -7622,18 +7608,6 @@ liboctinterp.so.0 liboctave0 #MINVER#
  _ZTV22octave_base_int_scalarI10octave_intIxEE at Base 3.4.3
  _ZTV22octave_base_int_scalarI10octave_intIyEE at Base 3.4.3
  _ZTVN14unwind_protect12fcn_arg_elemIjEE at Base 3.4.3
- _ZThn12_N13hdf5_ifstreamD0Ev at Base 3.4.3
- _ZThn12_N13hdf5_ifstreamD1Ev at Base 3.4.3
- _ZThn12_N13hdf5_ofstreamD0Ev at Base 3.4.3
- _ZThn12_N13hdf5_ofstreamD1Ev at Base 3.4.3
- _ZThn4_N11oprocstreamD0Ev at Base 3.4.3
- _ZThn4_N11oprocstreamD1Ev at Base 3.4.3
- _ZThn8_N11iprocstreamD0Ev at Base 3.4.3
- _ZThn8_N11iprocstreamD1Ev at Base 3.4.3
- _ZThn8_N17c_file_ptr_streamISdP8_IO_FILE14c_file_ptr_bufED0Ev at Base 3.4.3
- _ZThn8_N17c_file_ptr_streamISdP8_IO_FILE14c_file_ptr_bufED1Ev at Base 3.4.3
- _ZThn8_N17c_file_ptr_streamISdPv15c_zfile_ptr_bufED0Ev at Base 3.4.3
- _ZThn8_N17c_file_ptr_streamISdPv15c_zfile_ptr_bufED1Ev at Base 3.4.3
  _ZTv0_n12_N10gzifstreamD0Ev at Base 3.4.3
  _ZTv0_n12_N10gzifstreamD1Ev at Base 3.4.3
  _ZTv0_n12_N10gzofstreamD0Ev at Base 3.4.3
diff --git a/debian/liboctave0.symbols.64bit b/debian/liboctave0.symbols.64bit
index 6dc3f75..0db332d 100644
--- a/debian/liboctave0.symbols.64bit
+++ b/debian/liboctave0.symbols.64bit
@@ -6778,20 +6778,6 @@ liboctave.so.0 liboctave0 #MINVER#
  _ZSt16__introsort_loopIPilEvT_S1_T0_ at Base 3.4.3
  _ZSt8__rotateIP10octave_intIlEEvT_S3_S3_St26random_access_iterator_tag at Base 3.4.3
  _ZSt8__rotateIP10octave_intImEEvT_S3_S3_St26random_access_iterator_tag at Base 3.4.3
- _ZThn64_N3ODED0Ev at Base 3.4.3
- _ZThn64_N3ODED1Ev at Base 3.4.3
- _ZThn64_N5LSODED0Ev at Base 3.4.3
- _ZThn64_N5LSODED1Ev at Base 3.4.3
- _ZThn96_N3DAED0Ev at Base 3.4.3
- _ZThn96_N3DAED1Ev at Base 3.4.3
- _ZThn96_N5DAERTD0Ev at Base 3.4.3
- _ZThn96_N5DAERTD1Ev at Base 3.4.3
- _ZThn96_N5DASPKD0Ev at Base 3.4.3
- _ZThn96_N5DASPKD1Ev at Base 3.4.3
- _ZThn96_N5DASRTD0Ev at Base 3.4.3
- _ZThn96_N5DASRTD1Ev at Base 3.4.3
- _ZThn96_N5DASSLD0Ev at Base 3.4.3
- _ZThn96_N5DASSLD1Ev at Base 3.4.3
  _ZZN5ArrayI10octave_intIlEE17resize_fill_valueEvE4zero at Base 3.4.3
  _ZZN5ArrayI10octave_intIlEE7resize1EiRKS1_E15max_stack_chunk at Base 3.4.3
  _ZZN5ArrayI10octave_intImEE17resize_fill_valueEvE4zero at Base 3.4.3
@@ -7609,18 +7595,6 @@ liboctinterp.so.0 liboctave0 #MINVER#
  _ZTV22octave_base_int_scalarI10octave_intIlEE at Base 3.4.3
  _ZTV22octave_base_int_scalarI10octave_intImEE at Base 3.4.3
  _ZTVN14unwind_protect12fcn_arg_elemImEE at Base 3.4.3
- _ZThn16_N11iprocstreamD0Ev at Base 3.4.3
- _ZThn16_N11iprocstreamD1Ev at Base 3.4.3
- _ZThn16_N13hdf5_ifstreamD0Ev at Base 3.4.3
- _ZThn16_N13hdf5_ifstreamD1Ev at Base 3.4.3
- _ZThn16_N13hdf5_ofstreamD0Ev at Base 3.4.3
- _ZThn16_N13hdf5_ofstreamD1Ev at Base 3.4.3
- _ZThn16_N17c_file_ptr_streamISdP8_IO_FILE14c_file_ptr_bufED0Ev at Base 3.4.3
- _ZThn16_N17c_file_ptr_streamISdP8_IO_FILE14c_file_ptr_bufED1Ev at Base 3.4.3
- _ZThn16_N17c_file_ptr_streamISdPv15c_zfile_ptr_bufED0Ev at Base 3.4.3
- _ZThn16_N17c_file_ptr_streamISdPv15c_zfile_ptr_bufED1Ev at Base 3.4.3
- _ZThn8_N11oprocstreamD0Ev at Base 3.4.3
- _ZThn8_N11oprocstreamD1Ev at Base 3.4.3
  _ZTv0_n24_N10gzifstreamD0Ev at Base 3.4.3
  _ZTv0_n24_N10gzifstreamD1Ev at Base 3.4.3
  _ZTv0_n24_N10gzofstreamD0Ev at Base 3.4.3

-- 
Debian packaging for octave

More information about the Pkg-octave-commit mailing list