First attempt to fix symbols build failure on several arches

diff --git a/debian/changelog b/debian/changelog
index 8ebc8a0f8fc1d6eb9d9bdcaa2aefe5fea42fbe8a..841cc6a7c30c7b97a1beed4c1bb8a9088a42e025 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,35 @@
+mathgl (2~rc1-2) experimental; urgency=low
+
+  * Correct typo in mathgl description in debian/control (Closes: #644863).
+  * Try to fix synbols FTBFS on several arches.   
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Wed, 4 Jan 2012 15:30:00 +0200
+
 mathgl (2~rc1-1) experimental; urgency=low
 
-  * New experimental upstream release (Closes: 632468).
+  * New experimental upstream release (Closes: #632468).
   * No documentation debian packages provided.   
 
  -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Wed, 28 Sep 2011 11:30:00 +0300
 
 mathgl (1.11.2-6) unstable; urgency=low
 
-  * Fix FTBFS for sparc (Closes: 642654).  
+  * Fix FTBFS for sparc (Closes: #642654).  
 
  -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Mon, 26 Sep 2011 16:23:12 +0300
 
 mathgl (1.11.2-5) unstable; urgency=low
 
   * Resolve differences for all non-optional symbols, in symbols files for ia64,
-    sparc and sh4 architectures (Closes: 642654).
+    sparc and sh4 architectures (Closes: #642654).
 
  -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Mon, 26 Sep 2011 10:25:00 +0300
 
 mathgl (1.11.2-4) unstable; urgency=low
 
   * Add python-numpy to Depnds of python-mathgl in debian/control and add
-    dh_numpy in binary-arch in debian/rules (Closes: 641793).
-  * Ammend symbols files for ia64, sparc and sh4 architectures (Closes: 642654).
+    dh_numpy in binary-arch in debian/rules (Closes: #641793).
+  * Ammend symbols files for ia64, sparc and sh4 architectures (Closes: #642654).
 
  -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Sat, 24 Sep 2011 23:16:00 +0300
 
@@ -30,7 +37,7 @@ mathgl (1.11.2-3) unstable; urgency=low
 
   * Replace libfltk-dev with libfltk1.3-dev | libfltk-dev in debian/control 
     Build-Depends (Closes: #638834).
-  * Ammend symbols files for s390x architecture (Closes: 639492).
+  * Ammend symbols files for s390x architecture (Closes: #639492).
 
  -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Wed, 7 Sep 2011 06:04:00 +0300
 

diff --git a/debian/control b/debian/control
index eeca0b930426cf4d3e92f2307d68c4a66f9fb0d0..3a296ff23615a8dfdef9f12bb1149aff7b0908fc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Package: mathgl
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl6 (= ${binary:Version})
-Description: library for scientific graphs. (utlities and examples)
+Description: library for scientific graphs. (utilities and examples)
  A free cross-platform library of fast C++ routines for plotting data in up
  to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF
  files. There are simple window interfaces based on GLUT, FLTK and/or Qt.

diff --git a/debian/libmgl6.symbols b/debian/libmgl6.symbols
index bffbbbb5dbcbb7cb6419cfd882f796c30dfc49a9..9d363f451f0485b090b98073f07c87ab7c8fbfd2 100644 (file)
--- a/debian/libmgl6.symbols
+++ b/debian/libmgl6.symbols
@@ -334,8 +334,8 @@ libmgl.so.6 libmgl6 #MINVER#
  _Z14mgl_draw_graphP7mglBasePv@Base 2~rc1
  _Z14mgl_qo2d_hprepPv@Base 2~rc1
  _Z14mgl_surf3_plotP7mglBasellPlS1_S1_S1_S1_St6vectorI8mglPointSaIS3_EEb@Base 2~rc1
- (arch=!i386)_Z14mgl_write_bps_PmPKcS1_ii@Base 2~rc1
- (arch=i386)_Z14mgl_write_bps_PjPKcS1_ii@Base 2~rc1
+ (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_Z14mgl_write_bps_PmPKcS1_ii@Base 2~rc1
+ (arch=i386 armel kfreebsd-i386 mips mipsel powerpc s390 sparc)_Z14mgl_write_bps_PjPKcS1_ii@Base 2~rc1
  _Z14mglc_addlegendPwlP6mglArgPiPKc@Base 2~rc1
  _Z14mglc_arrowsizePwlP6mglArgPiPKc@Base 2~rc1
  _Z14mglc_integratePwlP6mglArgPiPKc@Base 2~rc1
@@ -378,8 +378,8 @@ libmgl.so.6 libmgl6 #MINVER#
  _Z16mgls_perspectiveP8mglGraphlP6mglArgPiPKc@Base 2~rc1
  _Z16mgls_triangulateP8mglGraphlP6mglArgPiPKc@Base 2~rc1
  _Z17mgl_create_schemePKcRl@Base 2~rc1
- (arch=!i386)_Z17mgl_set_font_def_PmPci@Base 2~rc1
- (arch=i386)_Z17mgl_set_font_def_PjPci@Base 2~rc1
+ (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_Z17mgl_set_font_def_PmPci@Base 2~rc1
+ (arch=i386 armel kfreebsd-i386 mips mipsel powerpc s390 sparc)_Z17mgl_set_font_def_PjPci@Base 2~rc1
  _Z18mgl_data_read_hdf4P7mglDataPKcS2_@Base 2~rc1
  _Z3adddd@Base 2~rc1
  _Z3argdd@Base 2~rc1
@@ -931,16 +931,16 @@ libmgl.so.6 libmgl6 #MINVER#
  _ZNSs19_M_replace_dispatchIN9__gnu_cxx17__normal_iteratorIPwSbIwSt11char_traitsIwESaIwEEEEEERSsNS1_IPcSsEESA_T_SB_St12__false_type@Base 2~rc1
  _ZNSt6vectorI10mglSegmentSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 2~rc1
  _ZNSt6vectorI10mglTextureSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 2~rc1
- (arch=!i386)_ZNSt6vectorI10mglTextureSaIS0_EE7reserveEm@Base 2~rc1
- (arch=i386)_ZNSt6vectorI10mglTextureSaIS0_EE7reserveEj@Base 2~rc1
+ (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !sparc)_ZNSt6vectorI10mglTextureSaIS0_EE7reserveEm@Base 2~rc1
+ (arch=i386 armel kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorI10mglTextureSaIS0_EE7reserveEj@Base 2~rc1
  _ZNSt6vectorI6mglPntSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 2~rc1
  _ZNSt6vectorI6mglPntSaIS0_EE5eraseEN9__gnu_cxx17__normal_iteratorIPS0_S2_EES6_@Base 2~rc1
- (arch=!i386)_ZNSt6vectorI6mglPntSaIS0_EE7reserveEm@Base 2~rc1
- (arch=i386)_ZNSt6vectorI6mglPntSaIS0_EE7reserveEj@Base 2~rc1
- _ZNSt6vectorI6mglPntSaIS0_EE9push_backERKS0_@Base 2~rc1
+ (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !sparc)_ZNSt6vectorI6mglPntSaIS0_EE7reserveEm@Base 2~rc1
+ (arch=i386 armel kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorI6mglPntSaIS0_EE7reserveEj@Base 2~rc1
+ (arch=!armel !mips !mipsel !powerpc !s390)_ZNSt6vectorI6mglPntSaIS0_EE9push_backERKS0_@Base 2~rc1
  _ZNSt6vectorI7mglPrimSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 2~rc1
- _ZNSt6vectorI7mglPrimSaIS0_EED1Ev@Base 2~rc1
- _ZNSt6vectorI7mglPrimSaIS0_EED2Ev@Base 2~rc1
+ (arch=!armel)_ZNSt6vectorI7mglPrimSaIS0_EED1Ev@Base 2~rc1
+ (arch=!armel)_ZNSt6vectorI7mglPrimSaIS0_EED2Ev@Base 2~rc1
  _ZNSt6vectorI7mglTextSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 2~rc1
  _ZNSt6vectorI7mglTextSaIS0_EED1Ev@Base 2~rc1
  _ZNSt6vectorI7mglTextSaIS0_EED2Ev@Base 2~rc1
@@ -949,23 +949,25 @@ libmgl.so.6 libmgl6 #MINVER#
  _ZNSt6vectorI8mglGroupSaIS0_EED1Ev@Base 2~rc1
  _ZNSt6vectorI8mglGroupSaIS0_EED2Ev@Base 2~rc1
  _ZNSt6vectorI8mglPointSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 2~rc1
- (arch=!i386)_ZNSt6vectorI8mglPointSaIS0_EE7reserveEm@Base 2~rc1
- (arch=i386)_ZNSt6vectorI8mglPointSaIS0_EE7reserveEj@Base 2~rc1
+ (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !sparc)_ZNSt6vectorI8mglPointSaIS0_EE7reserveEm@Base 2~rc1
+ (arch=i386 armel kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorI8mglPointSaIS0_EE7reserveEj@Base 2~rc1
  _ZNSt6vectorI8mglPointSaIS0_EEaSERKS2_@Base 2~rc1
  _ZNSt6vectorI9mglMatrixSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 2~rc1
  _ZNSt6vectorIlSaIlEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPlS1_EERKl@Base 2~rc1
  _ZNSt6vectorIlSaIlEEaSERKS1_@Base 2~rc1
- _ZSt10__pop_heapIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEEvT_S8_S8_@Base 2~rc1
+ (optional)_ZSt10__pop_heapIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEEvT_S8_S8_@Base 2~rc1
  (optional)_ZSt11__push_heapIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEElS2_EvT_T0_S9_T1_@Base 2~rc1
  (optional)_ZSt11__push_heapIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEiS2_EvT_T0_S9_T1_@Base 2~rc1
  (optional)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEElS2_EvT_T0_S9_T1_@Base 2~rc1
  (optional)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEiS2_EvT_T0_S9_T1_@Base 2~rc1
+ (optional)_ZSt13__heap_selectIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEEvT_S8_S8_@Base 2~rc1
  _ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEEvT_S8_@Base 2~rc1
  (optional)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEElEvT_S8_T0_@Base 2~rc1
  (optional)_ZSt16__introsort_loopIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEiEvT_S8_T0_@Base 2~rc1
  _ZSt19__move_median_firstIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEEvT_S8_S8_@Base 2~rc1
  _ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEEvT_@Base 2~rc1
- _ZSt9make_heapIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEEvT_S8_@Base 2~rc1
+ (optional)_ZSt9make_heapIN9__gnu_cxx17__normal_iteratorIP7mglPrimSt6vectorIS2_SaIS2_EEEEEvT_S8_@Base 2~rc1
+ (optional)_ZSt8_DestroyIP7mglTextEvT_S2_@Base 2~rc1
  _ZStplIwSt11char_traitsIwESaIwEESbIT_T0_T1_EPKS3_RKS6_@Base 2~rc1
  _ZTI11mglCanvasGL@Base 2~rc1
  _ZTI7mglBase@Base 2~rc1