Further symbols fixes for FTBFS on ia64, sparc and sh4

diff --git a/debian/changelog b/debian/changelog
index 367fc647208b73c764b76b160a318d88a1254421..43698524e17ff3c2399344203f4796fa51604737 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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).
+
+ -- 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

diff --git a/debian/libmgl5.symbols b/debian/libmgl5.symbols
index 634c6a30b0bbbc7852d208b8f178b895f91b7a87..3bcaf826ae715d1bf0bbc61b8ee52ede2c52a223 100644 (file)
--- a/debian/libmgl5.symbols
+++ b/debian/libmgl5.symbols
@@ -799,7 +799,7 @@ libmgl.so.5 libmgl5 #MINVER#
  _ZN10u3dLineSetD1Ev@Base 1.11
  (arch=!alpha !sparc64 !powerpcspe)_ZN10u3dLineSetD2Ev@Base 1.11
  _ZN10u3dTexture13print_textureEPKcRSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
- (arch=ia64 sparc sh4)_ZN10u3dTextureD1Ev@Base 1.11
+ (optional)_ZN10u3dTextureD1Ev@Base 1.11
  _ZN11TGAImageMin10DeallocateEv@Base 1.11
  _ZN11TGAImageMin10InitializeEjjj@Base 1.11
  _ZN11TGAImageMinC1Ev@Base 1.11
@@ -815,7 +815,7 @@ libmgl.so.5 libmgl5 #MINVER#
  _ZN11u3dMaterial12print_shaderERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
  _ZN11u3dMaterial14print_materialERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
  _ZN11u3dMaterialD1Ev@Base 1.11
- (arch=!alpha !ia64 !sparc !sparc64 !sh4 !powerpcspe)_ZN11u3dMaterialD2Ev@Base 1.11
+ (arch=!alpha !sparc64 !powerpcspe)_ZN11u3dMaterialD2Ev@Base 1.11
  _ZN11u3dPointSet10point_plotERK8mglPointRK8mglColor@Base 1.11
  _ZN11u3dPointSet20print_model_resourceERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
  _ZN11u3dPointSetC1ERKSsP12mglGraphIDTF@Base 1.11
@@ -947,10 +947,10 @@ libmgl.so.5 libmgl5 #MINVER#
  _ZN7mglData9RearrangeEiii@Base 1.11
  _ZN7mglData9TransposeEPKc@Base 1.11
  _ZN7mglDataC1ERKS_@Base 1.11
- (arch=!ia64 !sparc !sh4)_ZN7mglDataC2ERKS_@Base 1.11
+ _ZN7mglDataC2ERKS_@Base 1.11
  _ZN7mglDataD0Ev@Base 1.11
  (arch=amd64 alpha i386 ia64 armel armhf sparc sparc64 sh4 powerpcspe kfreebsd-amd64 kfreebsd-i386 mipsel powerpc s390 s390x)_ZN7mglDataD1Ev@Base 1.11
- (arch=amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mipsel powerpc s390 s390x)_ZN7mglDataD2Ev@Base 1.11
+ (arch=amd64 armel armhf ia64 i386 kfreebsd-amd64 kfreebsd-i386 mipsel powerpc s390 s390x sh4 sparc)_ZN7mglDataD2Ev@Base 1.11
  _ZN7mglDataaSERKS_@Base 1.11
  _ZN7mglDataaSEf@Base 1.11
  _ZN7mglDatadVERKS_@Base 1.11
@@ -994,7 +994,7 @@ libmgl.so.5 libmgl5 #MINVER#
  _ZN7mglFuncC1ElPKwPS_@Base 1.11
  _ZN7mglFuncC2ElPKwPS_@Base 1.11
  _ZN7mglFuncD1Ev@Base 1.11
- (arch=!ia64 !sparc !sparc64 !sh4)_ZN7mglFuncD2Ev@Base 1.11
+ (arch=!sparc64)_ZN7mglFuncD2Ev@Base 1.11
  _ZN7mglPrim4DrawEP10mglGraphPS@Base 1.11
  _ZN7mglPrim6IsSameEfPfi@Base 1.11
  _ZN7u3dBall10print_nodeERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
@@ -1009,10 +1009,10 @@ libmgl.so.5 libmgl5 #MINVER#
  _ZN7u3dMesh9quad_plotEPfS0_S0_S0_S0_S0_S0_S0_@Base 1.11
  _ZN7u3dMesh9trig_plotEPfS0_S0_S0_S0_S0_@Base 1.11
  _ZN7u3dMeshD1Ev@Base 1.11
- (arch=!alpha !ia64 !sparc !sparc64 !sh4 !powerpcspe)_ZN7u3dMeshD2Ev@Base 1.11
+ (arch=!alpha !sparc64 !powerpcspe)_ZN7u3dMeshD2Ev@Base 1.11
  _ZN7u3dNode5printERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
  _ZN7u3dNodeD1Ev@Base 1.11
- (arch=!alpha !ia64 !sparc !sparc64 !sh4 !powerpcspe)_ZN7u3dNodeD2Ev@Base 1.11
+ (arch=!alpha !sparc64 !powerpcspe)_ZN7u3dNodeD2Ev@Base 1.11
  _ZN8mglColor3SetES_f@Base 1.11
  _ZN8mglColor3SetEcf@Base 1.11
  _ZN8mglGraph10ColumnPlotEiif@Base 1.11
@@ -1433,7 +1433,7 @@ libmgl.so.5 libmgl5 #MINVER#
  _ZN8mglParseD2Ev@Base 1.11
  _ZN8u3dLight10print_nodeERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
  _ZN8u3dLight20print_light_resourceERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
- (arch=ia64 sparc sh4)_ZN8u3dLightD1Ev@Base 1.11
+ (optional)_ZN8u3dLightD1Ev@Base 1.11
  _ZN8u3dModel10print_nodeERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
  _ZN8u3dModel16AddModelMaterialEPKfbb@Base 1.11
  _ZN8u3dModel22print_shading_modifierERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
@@ -1443,7 +1443,7 @@ libmgl.so.5 libmgl5 #MINVER#
  _ZN8u3dModel8AddPointERK8mglPoint@Base 1.11
  _ZN8u3dModelC1ESsP12mglGraphIDTFRKb@Base 1.11
  _ZN8u3dModelC2ESsP12mglGraphIDTFRKb@Base 1.11
- (arch=!alpha !ia64 !sparc !sparc64 !sh4 !powerpcspe)_ZN8u3dModelD1Ev@Base 1.11
+ (arch=!alpha !sparc64 !powerpcspe)_ZN8u3dModelD1Ev@Base 1.11
  _ZN8u3dModelD2Ev@Base 1.11
  _ZNK10mglFormula4CalcEPKf@Base 1.11
  _ZNK10mglFormula4CalcEffff@Base 1.11