From f472108107d0a38bf63aabcde43a5e055e704eda Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Tue, 8 May 2012 23:32:23 +0300 Subject: [PATCH] Fix FTBFS due to g++-4.7 related symbols changes --- debian/changelog | 6 ++++++ debian/libmgl-qt5.symbols | 1 + debian/libmgl-wx5.symbols | 3 +++ debian/libmgl5.symbols | 36 ++++++++++++++++++++++++++++++++++-- debian/source/options | 2 +- 5 files changed, 45 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c3ab5d3..6c276d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mathgl (1.11.2-11) UNRELEASED; urgency=low + + * Update symbols files in order to fix FTBFS (Closes: #671964) + + -- Dimitrios Eftaxiopoulos Tue, 08 May 2012 20:18:59 +0300 + mathgl (1.11.2-10) unstable; urgency=low * Replace octave3.2-headers with liboctave-dev in Build-Depends in diff --git a/debian/libmgl-qt5.symbols b/debian/libmgl-qt5.symbols index 539e6a1..9a754cc 100644 --- a/debian/libmgl-qt5.symbols +++ b/debian/libmgl-qt5.symbols @@ -5,6 +5,7 @@ libmgl-qt.so.5 libmgl-qt5 #MINVER# _Z16convertFromGraphR7QPixmapP10mglGraphABPPh@Base 1.11 _Z8mglQtRunv@Base 1.11 (optional)_ZN10QByteArrayD1Ev@Base 1.11 + _ZN10QByteArrayD2Ev@Base 1.11 _ZN10mglGraphAB8GetRatioEv@Base 1.11 _ZN10mglGraphQT10ToggleZoomEv@Base 1.11 _ZN10mglGraphQT11ToggleAlphaEv@Base 1.11 diff --git a/debian/libmgl-wx5.symbols b/debian/libmgl-wx5.symbols index dcae0ab..c919772 100644 --- a/debian/libmgl-wx5.symbols +++ b/debian/libmgl-wx5.symbols @@ -2,6 +2,9 @@ libmgl-wx.so.5 libmgl-wx5 #MINVER# _Z15mglSetExtensionR8wxStringPKc@Base 1.11 _Z16convertFromGraphR8wxBitmapP10mglGraphABPPh@Base 1.11 _Z8mglw_strRK8wxString@Base 1.11 + _ZN12wxBitmapBaseD0Ev@Base 1.11 + _ZN12wxBitmapBaseD1Ev@Base 1.11 + _ZN12wxBitmapBaseD2Ev@Base 1.11 _ZN12wxWindowBase10SetMaxSizeERK6wxSize@Base 1.11 _ZN12wxWindowBase10SetMinSizeERK6wxSize@Base 1.11 _ZN12wxWindowBase12GetValidatorEv@Base 1.11 diff --git a/debian/libmgl5.symbols b/debian/libmgl5.symbols index f26b114..da85af5 100644 --- a/debian/libmgl5.symbols +++ b/debian/libmgl5.symbols @@ -797,10 +797,11 @@ libmgl.so.5 libmgl5 #MINVER# (arch=alpha amd64 kfreebsd-amd64 ia64 s390 s390x sparc64 powerpcspe)_ZN10u3dLineSet7AddLineEmmm@Base 1.11 (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390 !s390x !sparc64 !powerpcspe)_ZN10u3dLineSet7AddLineEjjj@Base 1.11 _ZN10u3dLineSet9line_plotEPfS0_S0_S0_@Base 1.11 - _ZN10u3dLineSetD1Ev@Base 1.11 - (arch=!powerpcspe)_ZN10u3dLineSetD2Ev@Base 1.11 + (optional)_ZN10u3dLineSetD1Ev@Base 1.11 + (optional)_ZN10u3dLineSetD2Ev@Base 1.11 _ZN10u3dTexture13print_textureEPKcRSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 (optional)_ZN10u3dTextureD1Ev@Base 1.11 + (optional)_ZN10u3dTextureD2Ev@Base 1.11 _ZN11TGAImageMin10DeallocateEv@Base 1.11 _ZN11TGAImageMin10InitializeEjjj@Base 1.11 _ZN11TGAImageMinC1Ev@Base 1.11 @@ -815,6 +816,11 @@ libmgl.so.5 libmgl5 #MINVER# _ZN11mglFormulaCD2Ev@Base 1.11 _ZN11u3dMaterial12print_shaderERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 _ZN11u3dMaterial14print_materialERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 + (optional)_ZN11u3dMaterialC1ERKS_@Base 1.11 + (optional)_ZN11u3dMaterialC1Ev@Base 1.11 + (optional)_ZN11u3dMaterialC2ERKS_@Base 1.11 + (optional)_ZN11u3dMaterialC2Ev@Base 1.11 + _ZN11u3dMaterialD1Ev@Base 1.11 _ZN11u3dMaterialD1Ev@Base 1.11 (arch=!powerpcspe)_ZN11u3dMaterialD2Ev@Base 1.11 _ZN11u3dPointSet10point_plotERK8mglPointRK8mglColor@Base 1.11 @@ -1000,6 +1006,8 @@ libmgl.so.5 libmgl5 #MINVER# _ZN7mglPrim6IsSameEfPfi@Base 1.11 _ZN7u3dBall10print_nodeERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 _ZN7u3dBall22print_shading_modifierERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 + _ZN7u3dBallD1Ev@Base 1.11 + _ZN7u3dBallD2Ev@Base 1.11 (arch=alpha amd64 kfreebsd-amd64 ia64 s390 s390x sparc64 powerpcspe)_ZN7u3dMesh11AddTriangleEmmmm@Base 1.11 (arch=alpha amd64 kfreebsd-amd64 ia64 s390 s390x sparc64 powerpcspe)_ZN7u3dMesh11AddTriangleEmmmmmm@Base 1.11 (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390 !s390x !sparc64 sh4 powerpcspe)_ZN7u3dMesh11AddTriangleEjjjj@Base 1.11 @@ -1009,6 +1017,8 @@ libmgl.so.5 libmgl5 #MINVER# _ZN7u3dMesh20print_model_resourceERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 _ZN7u3dMesh9quad_plotEPfS0_S0_S0_S0_S0_S0_S0_@Base 1.11 _ZN7u3dMesh9trig_plotEPfS0_S0_S0_S0_S0_@Base 1.11 + _ZN7u3dMeshC1ERKS_@Base 1.11 + _ZN7u3dMeshC2ERKS_@Base 1.11 _ZN7u3dMeshD1Ev@Base 1.11 (arch=!powerpcspe)_ZN7u3dMeshD2Ev@Base 1.11 _ZN7u3dNode5printERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 @@ -1432,9 +1442,12 @@ libmgl.so.5 libmgl5 #MINVER# _ZN8mglParseC2Eb@Base 1.11 _ZN8mglParseD1Ev@Base 1.11 _ZN8mglParseD2Ev@Base 1.11 + _ZN8u3dGroupD1Ev@Base 1.11 + _ZN8u3dGroupD2Ev@Base 1.11 _ZN8u3dLight10print_nodeERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 _ZN8u3dLight20print_light_resourceERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 (optional)_ZN8u3dLightD1Ev@Base 1.11 + _ZN8u3dLightD2Ev@Base 1.11 _ZN8u3dModel10print_nodeERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 _ZN8u3dModel16AddModelMaterialEPKfbb@Base 1.11 _ZN8u3dModel22print_shading_modifierERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11 @@ -1442,7 +1455,9 @@ libmgl.so.5 libmgl5 #MINVER# _ZN8u3dModel8AddColorERK8mglColor@Base 1.11 _ZN8u3dModel8AddPointEPKf@Base 1.11 _ZN8u3dModel8AddPointERK8mglPoint@Base 1.11 + _ZN8u3dModelC1ERKS_@Base 1.11 _ZN8u3dModelC1ESsP12mglGraphIDTFRKb@Base 1.11 + _ZN8u3dModelC2ERKS_@Base 1.11 _ZN8u3dModelC2ESsP12mglGraphIDTFRKb@Base 1.11 (arch=!powerpcspe)_ZN8u3dModelD1Ev@Base 1.11 _ZN8u3dModelD2Ev@Base 1.11 @@ -1506,8 +1521,13 @@ libmgl.so.5 libmgl5 #MINVER# (optional)_ZNSt11_Deque_baseI11u3dMaterialSaIS0_EE17_M_initialize_mapEj@Base 1.11 (optional)_ZNSt11_Deque_baseI11u3dMaterialSaIS0_EED2Ev@Base 1.11 (optional)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED1Ev@Base 1.11 + (optional)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED2Ev@Base 1.11 (optional)_ZNSt4listI7u3dMeshSaIS0_EE14_M_create_nodeERKS0_@Base 1.11 (optional)_ZNSt4listI7u3dMeshSaIS0_EE9push_backERKS0_@Base 1.11 + (optional)_ZNSt12_Destroy_auxILb0EE9__destroyIP7u3dBallEEvT_S4_@Base 1.11 + (optional)_ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED0Ev@Base 1.11 + (optional)_ZNSt20__uninitialized_copyILb0EE13__uninit_copyIP7u3dBallS3_EET0_T_S5_S4_@Base 1.11 + (optional)_ZNSt4listI8u3dGroupSaIS0_EE9push_backERKS0_@Base 1.11 _ZNSt5dequeI11u3dMaterialSaIS0_EE16_M_push_back_auxERKS0_@Base 1.11 (optional)_ZNSt5dequeI11u3dMaterialSaIS0_EE17_M_reallocate_mapEmb@Base 1.11 (optional)_ZNSt5dequeI11u3dMaterialSaIS0_EE19_M_destroy_data_auxESt15_Deque_iteratorIS0_RS0_PS0_ES6_@Base 1.11 @@ -1515,14 +1535,26 @@ libmgl.so.5 libmgl5 #MINVER# _ZNSt5dequeI11u3dMaterialSaIS0_EED1Ev@Base 1.11 (optional)_ZNSt5dequeI11u3dMaterialSaIS0_EED2Ev@Base 1.11 _ZNSt6vectorI10TexCoord2DSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.11 + (arch=i386)_ZNSt6vectorI10TexCoord2DSaIS0_EE9push_backERKS0_@Base 1.11 _ZNSt6vectorI7size_t3SaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.11 _ZNSt6vectorI7u3dBallSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.11 (optional)_ZNSt6vectorI7u3dBallSaIS0_EED1Ev@Base 1.11 + (optional)_ZNSt6vectorI7u3dBallSaIS0_EE9push_backERKS0_@Base 1.11 _ZNSt6vectorI7u3dLineSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.11 _ZNSt6vectorI8mglColorSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.11 + (optional)_ZNSt6vectorI8mglColorSaIS0_EE9push_backERKS0_@Base 1.11 + _ZNSt6vectorI8mglColorSaIS0_EED1Ev@Base 1.11 + _ZNSt6vectorI8mglColorSaIS0_EED2Ev@Base 1.11 _ZNSt6vectorI8mglPointSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.11 + (optional)_ZNSt6vectorI8mglPointSaIS0_EE9push_backERKS0_@Base 1.11 (optional)_ZNSt6vectorImSaImEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPmS1_EERKm@Base 1.11 + (optional)_ZNSt6vectorImSaImEED1Ev@Base 1.11 + (optional)_ZNSt6vectorImSaImEED2Ev@Base 1.11 + (optional)_ZNSt6vectorIjSaIjEED1Ev@Base 1.11 + (optional)_ZNSt6vectorIjSaIjEED2Ev@Base 1.11 (optional)_ZNSt6vectorIjSaIjEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPjS1_EERKj@Base 1.11 + _ZNSt6vectorI8mglPointSaIS0_EED1Ev@Base 1.11 + _ZNSt6vectorI8mglPointSaIS0_EED2Ev@Base 1.11 (optional)_ZSt22__complex_pow_unsignedIdESt7complexIT_ES2_j@Base 1.11 (optional)_ZSt5fixedRSt8ios_base@Base 1.11 _ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_EPKS3_RKS6_@Base 1.11 diff --git a/debian/source/options b/debian/source/options index 07421a3..332aaf0 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1 +1 @@ - extend-diff-ignore = "(^|/)(config\.log|texinfo/mgl_ru\.info-1|texinfo/mgl_ru\.info-2)$" \ No newline at end of file + extend-diff-ignore = "(^|/)(config\.log|texinfo/mgl_ru\.info-1|texinfo/mgl_ru\.info-2|Makefile\.in|aclocal\.m4|configure|examples/Makefile\.in|include/Makefile\.in|lang/Makefile\.in|mgl/Makefile\.in|texinfo/Makefile\.in|texinfo/png/Makefile\.in|utils/Makefile\.in|widgets/Makefile\.in)$" \ No newline at end of file -- 2.30.2