[SCM] Packaging for mathgl branch, experimental, updated. debian/2_rc1-3-3-g9b00ec9

Dimitrios Eftaxiopoulos eftaxi12 at otenet.gr
Wed Feb 22 22:16:03 UTC 2012 

The following commit has been merged in the experimental branch:
commit abef4985452f080cce3e34fcc028434d99ef0c24
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date:   Wed Feb 22 21:24:59 2012 +0200

    Fix build failure on armhf and numpy and hdf5 transition issues

diff --git a/debian/control b/debian/control
index d72398e..ca2298a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,9 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>, D Haley <mycae at yahoo.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.2.3~), libltdl-dev, libgsl0-dev, freeglut3-dev, zlib1g-dev,
- libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-serial-dev | libhdf5-dev, 
- libjpeg-dev, libtiff-dev, libfltk1.3-dev | libfltk-dev, libqt4-dev, libwxgtk2.8-dev, swig, 
+Build-Depends: debhelper (>= 7.2.3~), libltdl-dev, libgsl0-dev, freeglut3-dev,
+ libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, zlib1g-dev, swig,
+ libjpeg-dev, libtiff-dev, libfltk1.3-dev | libfltk-dev, libqt4-dev, libwxgtk2.8-dev, 
  texinfo, texi2html, texlive, texlive-generic-recommended, octave3.2-headers,
  libgif-dev, autoconf, automake, python, python-dev, python-numpy, python-support,
  libhdf4-dev, chrpath
@@ -85,7 +85,8 @@ Description: library for scientific graphs. (development files)
 Package: python-mathgl
 Architecture: any
 Section: python
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, 
+ python-numpy-abi9
 Description: library for scientific graphs. (Python module)
  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
diff --git a/debian/control b/debian/control~
similarity index 100%
copy from debian/control
copy to debian/control~
diff --git a/debian/libmgl-wnd6.symbols b/debian/libmgl-wnd6.symbols
index a50a0af..2860307 100644
--- a/debian/libmgl-wnd6.symbols
+++ b/debian/libmgl-wnd6.symbols
@@ -142,10 +142,10 @@ libmgl-wnd.so.6 libmgl-wnd6 #MINVER#
  _ZTV11mglCanvasQT at Base 2~rc1
  _ZTV7QMathGL at Base 2~rc1
  _ZTV9Fl_MathGL at Base 2~rc1
- (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_ZThn16_N7QMathGLD0Ev at Base 2~rc1
- (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_ZThn16_N7QMathGLD1Ev at Base 2~rc1
- (arch=i386 armel kfreebsd-i386 mips mipsel powerpc s390 sparc)_ZThn8_N7QMathGLD0Ev at Base 2~rc1
- (arch=i386 armel kfreebsd-i386 mips mipsel powerpc s390 sparc)_ZThn8_N7QMathGLD1Ev at Base 2~rc1
+ (arch=!i386 !armel !armhf !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_ZThn16_N7QMathGLD0Ev at Base 2~rc1
+ (arch=!i386 !armel !armhf !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_ZThn16_N7QMathGLD1Ev at Base 2~rc1
+ (arch=i386 armel armhf kfreebsd-i386 mips mipsel powerpc s390 sparc)_ZThn8_N7QMathGLD0Ev at Base 2~rc1
+ (arch=i386 armel armhf kfreebsd-i386 mips mipsel powerpc s390 sparc)_ZThn8_N7QMathGLD1Ev at Base 2~rc1
  menuitems at Base 2~rc1
  mgl_create_graph_fltk at Base 2~rc1
  mgl_create_graph_fltk_ at Base 2~rc1
diff --git a/debian/libmgl-wnd6.symbols b/debian/libmgl-wnd6.symbols~
similarity index 100%
copy from debian/libmgl-wnd6.symbols
copy to debian/libmgl-wnd6.symbols~
diff --git a/debian/libmgl6.symbols b/debian/libmgl6.symbols
index 9d363f4..f4bca53 100644
--- a/debian/libmgl6.symbols
+++ b/debian/libmgl6.symbols
@@ -334,8 +334,8 @@ libmgl.so.6 libmgl6 #MINVER#
  _Z14mgl_draw_graphP7mglBasePv at Base 2~rc1
  _Z14mgl_qo2d_hprepPv at Base 2~rc1
  _Z14mgl_surf3_plotP7mglBasellPlS1_S1_S1_S1_St6vectorI8mglPointSaIS3_EEb at Base 2~rc1
- (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_Z14mgl_write_bps_PmPKcS1_ii at Base 2~rc1
- (arch=i386 armel kfreebsd-i386 mips mipsel powerpc s390 sparc)_Z14mgl_write_bps_PjPKcS1_ii at Base 2~rc1
+ (arch=!i386 !armel !armhf !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_Z14mgl_write_bps_PmPKcS1_ii at Base 2~rc1
+ (arch=i386 armel armhf kfreebsd-i386 mips mipsel powerpc s390 sparc)_Z14mgl_write_bps_PjPKcS1_ii at Base 2~rc1
  _Z14mglc_addlegendPwlP6mglArgPiPKc at Base 2~rc1
  _Z14mglc_arrowsizePwlP6mglArgPiPKc at Base 2~rc1
  _Z14mglc_integratePwlP6mglArgPiPKc at Base 2~rc1
@@ -378,8 +378,8 @@ libmgl.so.6 libmgl6 #MINVER#
  _Z16mgls_perspectiveP8mglGraphlP6mglArgPiPKc at Base 2~rc1
  _Z16mgls_triangulateP8mglGraphlP6mglArgPiPKc at Base 2~rc1
  _Z17mgl_create_schemePKcRl at Base 2~rc1
- (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_Z17mgl_set_font_def_PmPci at Base 2~rc1
- (arch=i386 armel kfreebsd-i386 mips mipsel powerpc s390 sparc)_Z17mgl_set_font_def_PjPci at Base 2~rc1
+ (arch=!i386 !armel !armhf !kfreebsd-i386 !mips !mipsel !powerpc !s390 !sparc)_Z17mgl_set_font_def_PmPci at Base 2~rc1
+ (arch=i386 armel armhf kfreebsd-i386 mips mipsel powerpc s390 sparc)_Z17mgl_set_font_def_PjPci at Base 2~rc1
  _Z18mgl_data_read_hdf4P7mglDataPKcS2_ at Base 2~rc1
  _Z3adddd at Base 2~rc1
  _Z3argdd at 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 at Base 2~rc1
  _ZNSt6vectorI10mglSegmentSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_ at Base 2~rc1
  _ZNSt6vectorI10mglTextureSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_ at Base 2~rc1
- (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !sparc)_ZNSt6vectorI10mglTextureSaIS0_EE7reserveEm at Base 2~rc1
- (arch=i386 armel kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorI10mglTextureSaIS0_EE7reserveEj at Base 2~rc1
+ (arch=!i386 !armel !armhf !kfreebsd-i386 !mips !mipsel !powerpc !sparc)_ZNSt6vectorI10mglTextureSaIS0_EE7reserveEm at Base 2~rc1
+ (arch=i386 armel armhf kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorI10mglTextureSaIS0_EE7reserveEj at Base 2~rc1
  _ZNSt6vectorI6mglPntSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_ at Base 2~rc1
  _ZNSt6vectorI6mglPntSaIS0_EE5eraseEN9__gnu_cxx17__normal_iteratorIPS0_S2_EES6_ at Base 2~rc1
- (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !sparc)_ZNSt6vectorI6mglPntSaIS0_EE7reserveEm at Base 2~rc1
- (arch=i386 armel kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorI6mglPntSaIS0_EE7reserveEj at Base 2~rc1
- (arch=!armel !mips !mipsel !powerpc !s390)_ZNSt6vectorI6mglPntSaIS0_EE9push_backERKS0_ at Base 2~rc1
+ (arch=!i386 !armel !armhf !kfreebsd-i386 !mips !mipsel !powerpc !sparc)_ZNSt6vectorI6mglPntSaIS0_EE7reserveEm at Base 2~rc1
+ (arch=i386 armel armhf kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorI6mglPntSaIS0_EE7reserveEj at Base 2~rc1
+ (arch=!armel !armhf !mips !mipsel !powerpc !s390)_ZNSt6vectorI6mglPntSaIS0_EE9push_backERKS0_ at Base 2~rc1
  _ZNSt6vectorI7mglPrimSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_ at Base 2~rc1
- (arch=!armel)_ZNSt6vectorI7mglPrimSaIS0_EED1Ev at Base 2~rc1
- (arch=!armel)_ZNSt6vectorI7mglPrimSaIS0_EED2Ev at Base 2~rc1
+ (arch=!armel !armhf)_ZNSt6vectorI7mglPrimSaIS0_EED1Ev at Base 2~rc1
+ (arch=!armel !armhf)_ZNSt6vectorI7mglPrimSaIS0_EED2Ev at Base 2~rc1
  _ZNSt6vectorI7mglTextSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_ at Base 2~rc1
  _ZNSt6vectorI7mglTextSaIS0_EED1Ev at Base 2~rc1
  _ZNSt6vectorI7mglTextSaIS0_EED2Ev at Base 2~rc1
@@ -949,8 +949,8 @@ libmgl.so.6 libmgl6 #MINVER#
  _ZNSt6vectorI8mglGroupSaIS0_EED1Ev at Base 2~rc1
  _ZNSt6vectorI8mglGroupSaIS0_EED2Ev at Base 2~rc1
  _ZNSt6vectorI8mglPointSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_ at Base 2~rc1
- (arch=!i386 !armel !kfreebsd-i386 !mips !mipsel !powerpc !sparc)_ZNSt6vectorI8mglPointSaIS0_EE7reserveEm at Base 2~rc1
- (arch=i386 armel kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorI8mglPointSaIS0_EE7reserveEj at Base 2~rc1
+ (arch=!i386 !armel !armhf !kfreebsd-i386 !mips !mipsel !powerpc !sparc)_ZNSt6vectorI8mglPointSaIS0_EE7reserveEm at Base 2~rc1
+ (arch=i386 armel armhf kfreebsd-i386 mips mipsel powerpc sparc)_ZNSt6vectorI8mglPointSaIS0_EE7reserveEj at Base 2~rc1
  _ZNSt6vectorI8mglPointSaIS0_EEaSERKS2_ at Base 2~rc1
  _ZNSt6vectorI9mglMatrixSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_ at Base 2~rc1
  _ZNSt6vectorIlSaIlEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPlS1_EERKl at Base 2~rc1
diff --git a/debian/libmgl6.symbols b/debian/libmgl6.symbols~
similarity index 100%
copy from debian/libmgl6.symbols
copy to debian/libmgl6.symbols~

-- 
Packaging for mathgl

More information about the debian-science-commits mailing list