Fix libfltk-dev build-dep and add s390x arch symbols

diff --git a/debian/changelog b/debian/changelog
index 4a34cdbc74ebb6605485b296ca2719ce06115f11..87218603aef0f1ee7c77e74f9ec531bd77efb052 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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).
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Wed, 7 Sep 2011 06:04:00 +0300
+
 mathgl (1.11.2-2) unstable; urgency=low
 
   * Add debian/source/options file in order to avoid the generation of unneeded debian-

diff --git a/debian/control b/debian/control
index 194aaa91a16b91cf8ea8c99a6dcc1070c6c72d2e..7acad50b877f45bea5108b7d4d20fc41f2a1656b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>, D Haley <mycae@yahoo.co
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.2.3~), libltdl-dev, libgsl0-dev, freeglut3-dev, 
  libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-serial-dev | libhdf5-dev, 
- libjpeg-dev, libtiff-dev, libfltk-dev, libqt4-dev, libwxgtk2.8-dev, swig, 
+ libjpeg-dev, libtiff-dev, libfltk1.3-dev | libfltk-dev, libqt4-dev, libwxgtk2.8-dev, swig, 
  texinfo, texi2html, texlive, texlive-generic-recommended, octave3.2-headers,
  libgif-dev, autoconf, automake, python, python-dev, python-numpy, python-support,
  libhdf4-dev, chrpath

diff --git a/debian/libmgl-fltk5.symbols b/debian/libmgl-fltk5.symbols
index 48f1d006b329c06eb24d4318d86b2000c88b7baa..f1fd9ed131b55eb0102e72df0bd6d190946d3d7b 100644 (file)
--- a/debian/libmgl-fltk5.symbols
+++ b/debian/libmgl-fltk5.symbols
@@ -60,6 +60,9 @@ libmgl-fltk.so.5 libmgl-fltk5 #MINVER#
  _ZN9Fl_MathGLD2Ev@Base 1.11
  (arch=!powerpcspe)_ZN9Fl_PixmapC1EPKPKc@Base 1.11
  (arch=!ia64 !sparc !sparc64)_ZN9Fl_PixmapC2EPKPKc@Base 1.11
+ _ZN9Fl_Widget12as_gl_windowEv@Base 1.11
+ _ZN9Fl_Widget8as_groupEv@Base 1.11
+ _ZN9Fl_Widget9as_windowEv@Base 1.11
  _ZTI12mglGraphFLTK@Base 1.11
  _ZTI9Fl_MathGL@Base 1.11
  _ZTS12mglGraphFLTK@Base 1.11

diff --git a/debian/libmgl-qt5.symbols b/debian/libmgl-qt5.symbols
index 8a84ffe7558c87e9a42dd270093dbef8b366d29b..917d6e94fef07a1280f2343f7392340b6e85621e 100644 (file)
--- a/debian/libmgl-qt5.symbols
+++ b/debian/libmgl-qt5.symbols
@@ -96,10 +96,10 @@ libmgl-qt.so.5 libmgl-qt5 #MINVER#
  _ZTS7QMathGL@Base 1.11
  _ZTV10mglGraphQT@Base 1.11
  _ZTV7QMathGL@Base 1.11
- (arch=alpha amd64 kfreebsd-amd64 ia64 sparc64)_ZThn16_N7QMathGLD0Ev@Base 1.11
- (arch=alpha amd64 kfreebsd-amd64 ia64 sparc64)_ZThn16_N7QMathGLD1Ev@Base 1.11
- (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !sparc64)_ZThn8_N7QMathGLD0Ev@Base 1.11
- (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !sparc64)_ZThn8_N7QMathGLD1Ev@Base 1.11
+ (arch=alpha amd64 kfreebsd-amd64 ia64 s390x sparc64)_ZThn16_N7QMathGLD0Ev@Base 1.11
+ (arch=alpha amd64 kfreebsd-amd64 ia64 s390x sparc64)_ZThn16_N7QMathGLD1Ev@Base 1.11
+ (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390x !sparc64)_ZThn8_N7QMathGLD0Ev@Base 1.11
+ (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390x !sparc64)_ZThn8_N7QMathGLD1Ev@Base 1.11
  mgl_create_graph_qt@Base 1.11
  mgl_create_graph_qt_@Base 1.11
  mgl_create_graph_qt_dr@Base 1.11

diff --git a/debian/libmgl5.symbols b/debian/libmgl5.symbols
index 83b96621c4f0c23f0e006e0adbe560369d5d5c2c..69c37a61adcda1db4330f9ce04324360e42f1e7e 100644 (file)
--- a/debian/libmgl5.symbols
+++ b/debian/libmgl5.symbols
@@ -279,8 +279,8 @@ libmgl.so.5 libmgl5 #MINVER#
  _Z13mgl_jpeg_savePKciiPPh@Base 1.11
  _Z13mgl_next_dataPKci@Base 1.11
  _Z13mgl_pnga_savePKciiPPh@Base 1.11
- (arch=alpha amd64 kfreebsd-amd64 ia64 sparc64 powerpcspe)_Z13mgl_puts_dir_PmPfS0_S0_S0_S0_S0_PKcS0_i@Base 1.11
- (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !sparc64 !powerpcspe)_Z13mgl_puts_dir_PjPfS0_S0_S0_S0_S0_PKcS0_i@Base 1.11
+ (arch=alpha amd64 kfreebsd-amd64 ia64 s390x sparc64 powerpcspe)_Z13mgl_puts_dir_PmPfS0_S0_S0_S0_S0_PKcS0_i@Base 1.11
+ (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390x !sparc64 !powerpcspe)_Z13mgl_puts_dir_PjPfS0_S0_S0_S0_S0_PKcS0_i@Base 1.11
  _Z13mgl_write_pdfP8mglGraphPKcS2_@Base 1.11
  _Z13mgl_write_u3dP8mglGraphPKcS2_@Base 1.11
  _Z13mglc_alphadefPwlP6mglArgPi@Base 1.11
@@ -309,12 +309,12 @@ libmgl.so.5 libmgl5 #MINVER#
  _Z14check_for_namePKw@Base 1.11
  _Z14mglFormulaCalcPKwP8mglParse@Base 1.11
  _Z14mgl_draw_classP8mglGraphPv@Base 1.11
- (arch=alpha amd64 kfreebsd-amd64 ia64 ppc64 sparc64)_Z14mgl_start_gif_Pm@Base 1.11
- (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !ppc64 !sparc64)_Z14mgl_start_gif_Pj@Base 1.11
- (arch=alpha amd64 kfreebsd-amd64 ia64 ppc64 sparc64)_Z14mgl_write_pdf_PmPKcS1_ii@Base 1.11
- (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 ppc64 !sparc64)_Z14mgl_write_pdf_PjPKcS1_ii@Base 1.11
- (arch=alpha amd64 kfreebsd-amd64 ia64 ppc64 sparc64)_Z14mgl_write_u3d_PmPKcS1_ii@Base 1.11
- (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 ppc64 !sparc64)_Z14mgl_write_u3d_PjPKcS1_ii@Base 1.11
+ (arch=alpha amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc64)_Z14mgl_start_gif_Pm@Base 1.11
+ (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !ppc64 !s390x !sparc64)_Z14mgl_start_gif_Pj@Base 1.11
+ (arch=alpha amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc64)_Z14mgl_write_pdf_PmPKcS1_ii@Base 1.11
+ (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 ppc64 !s390x !sparc64)_Z14mgl_write_pdf_PjPKcS1_ii@Base 1.11
+ (arch=alpha amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc64)_Z14mgl_write_u3d_PmPKcS1_ii@Base 1.11
+ (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 ppc64 !s390x !sparc64)_Z14mgl_write_u3d_PjPKcS1_ii@Base 1.11
  _Z14mglc_addlegendPwlP6mglArgPi@Base 1.11
  _Z14mglc_arrowsizePwlP6mglArgPi@Base 1.11
  _Z14mglc_integratePwlP6mglArgPi@Base 1.11
@@ -365,8 +365,8 @@ libmgl.so.5 libmgl5 #MINVER#
  _Z16mgls_transparentP8mglGraphlP6mglArgPi@Base 1.11
  _Z16mgls_triangulateP8mglGraphlP6mglArgPi@Base 1.11
  _Z17mgl_create_schemePKcRl@Base 1.11
- (arch=alpha amd64 kfreebsd-amd64 ia64 sparc64 powerpcspe)_Z18mgl_set_ticks_dir_PmPcPfPiS1_@Base 1.11
- (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !sparc64 !powerpcspe)_Z18mgl_set_ticks_dir_PjPcPfPiS1_@Base 1.11
+ (arch=alpha amd64 kfreebsd-amd64 ia64 s390x sparc64 powerpcspe)_Z18mgl_set_ticks_dir_PmPcPfPiS1_@Base 1.11
+ (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390x !sparc64 !powerpcspe)_Z18mgl_set_ticks_dir_PjPcPfPiS1_@Base 1.11
  _Z3adddd@Base 1.11
  _Z3argdd@Base 1.11
  _Z3ceqdd@Base 1.11
@@ -793,8 +793,8 @@ libmgl.so.5 libmgl5 #MINVER#
  _ZN10mglGraphZBD1Ev@Base 1.11
  _ZN10mglGraphZBD2Ev@Base 1.11
  _ZN10u3dLineSet20print_model_resourceERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
- (arch=alpha amd64 kfreebsd-amd64 ia64 s390 sparc64 powerpcspe)_ZN10u3dLineSet7AddLineEmmm@Base 1.11
- (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390 !sparc64 !powerpcspe)_ZN10u3dLineSet7AddLineEjjj@Base 1.11
+ (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=!alpha !ia64 !sparc !sparc64 !sh4 !powerpcspe)_ZN10u3dLineSetD2Ev@Base 1.11
@@ -949,8 +949,8 @@ libmgl.so.5 libmgl5 #MINVER#
  _ZN7mglDataC1ERKS_@Base 1.11
  (arch=!ia64 !sparc !sh4)_ZN7mglDataC2ERKS_@Base 1.11
  _ZN7mglDataD0Ev@Base 1.11
- (arch=amd64 alpha ia64 armel armhf sparc sparc64 sh4 powerpcspe kfreebsd-amd64 kfreebsd-i386 mipsel powerpc s390)_ZN7mglDataD1Ev@Base 1.11
- (arch=amd64 armel armhf kfreebsd-amd64 kfreebsd-i386 mipsel powerpc s390)_ZN7mglDataD2Ev@Base 1.11
+ (arch=amd64 alpha ia64 armel armhf sparc sparc64 sh4 powerpcspe kfreebsd-amd64 kfreebsd-i386 mipsel powerpc s390 s390x)_ZN7mglDataD1Ev@Base 1.11
+ (arch=amd64 armel armhf kfreebsd-amd64 kfreebsd-i386 mipsel powerpc s390 s390x)_ZN7mglDataD2Ev@Base 1.11
  _ZN7mglDataaSERKS_@Base 1.11
  _ZN7mglDataaSEf@Base 1.11
  _ZN7mglDatadVERKS_@Base 1.11
@@ -999,10 +999,10 @@ libmgl.so.5 libmgl5 #MINVER#
  _ZN7mglPrim6IsSameEfPfi@Base 1.11
  _ZN7u3dBall10print_nodeERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
  _ZN7u3dBall22print_shading_modifierERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11
- (arch=alpha amd64 kfreebsd-amd64 ia64 s390 sparc64 powerpcspe)_ZN7u3dMesh11AddTriangleEmmmm@Base 1.11
- (arch=alpha amd64 kfreebsd-amd64 ia64 s390 sparc64 powerpcspe)_ZN7u3dMesh11AddTriangleEmmmmmm@Base 1.11
- (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390 !sparc64 sh4 powerpcspe)_ZN7u3dMesh11AddTriangleEjjjj@Base 1.11
- (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390 !sparc64 !powerpcspe)_ZN7u3dMesh11AddTriangleEjjjjjj@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
+ (arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390 !s390x !sparc64 !powerpcspe)_ZN7u3dMesh11AddTriangleEjjjjjj@Base 1.11
  _ZN7u3dMesh11quad_plot_nEPfS0_S0_S0_S0_S0_S0_S0_S0_S0_S0_S0_@Base 1.11
  _ZN7u3dMesh11trig_plot_nEPfS0_S0_S0_S0_S0_S0_S0_S0_@Base 1.11
  _ZN7u3dMesh20print_model_resourceERSt14basic_ofstreamIcSt11char_traitsIcEE@Base 1.11