[SCM] Packaging for mathgl branch, master, updated. debian/1.11.2-6-1-g8f96038
Dimitrios Eftaxiopoulos
eftaxi12 at otenet.gr
Mon Jan 2 19:16:57 UTC 2012
The following commit has been merged in the master branch:
commit 8f96038743db754bfb58fe3516d06da9f1f16dc6
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Mon Jan 2 21:02:44 2012 +0200
Fix dependence of libmgl-dev package to shared lib packages
diff --git a/debian/changelog b/debian/changelog
index 9227f23..46230ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,30 @@
+mathgl (1.11.2-7) unstable; urgency=low
+
+ * Fix FTBFS for sparc64.
+ * Ammend symbols files for alpha.
+ * Make libmgl-dev package dependent on libmgl-*5 packages (Closes: #646923).
+ * Create new texinfo-png-Makefile.patch in the place of
+ createpngdirectory.patch.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Mon, 2 Jan 2012 18:32:00 +0200
+
mathgl (1.11.2-6) unstable; urgency=low
- * Fix FTBFS for sparc (Closes: 642654).
+ * Fix FTBFS for sparc (Closes: #642654).
-- Dimitrios Eftaxiopoulos <eftaxi12 at 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 at 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).
+ dh_numpy in binary-arch in debian/rules (Closes: #641793).
* Ammend symbols files for ia64, sparc and sh4 architectures (Closes: 642654).
-- Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr> Sat, 24 Sep 2011 23:16:00 +0300
@@ -23,7 +33,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 at otenet.gr> Wed, 7 Sep 2011 06:04:00 +0300
diff --git a/debian/control b/debian/control
index 7622bcc..c572f16 100644
--- a/debian/control
+++ b/debian/control
@@ -85,7 +85,10 @@ Description: library for scientific graphs. (data files)
Package: libmgl-dev
Architecture: any
Section: libdevel
-Depends: libmgl5 (= ${binary:Version}), ${misc:Depends}, libgsl0-dev, libgl1-mesa-dev | libgl-dev, libpng-dev
+Depends: libmgl5 (= ${binary:Version}), ${misc:Depends},
+ libmgl-fltk5 (= ${binary:Version}), libmgl-qt5 (= ${binary:Version}),
+ libmgl-wx5 (= ${binary:Version}), libmgl-glut5 (= ${binary:Version}),
+ libgsl0-dev, libpng-dev, libgl1-mesa-dev | libgl-dev
Description: library for scientific graphs. (development files)
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/libmgl-fltk5.symbols b/debian/libmgl-fltk5.symbols
index 49f3657..1ae3f5d 100644
--- a/debian/libmgl-fltk5.symbols
+++ b/debian/libmgl-fltk5.symbols
@@ -59,7 +59,7 @@ libmgl-fltk.so.5 libmgl-fltk5 #MINVER#
_ZN9Fl_MathGLD1Ev at Base 1.11
_ZN9Fl_MathGLD2Ev at Base 1.11
(arch=!powerpcspe)_ZN9Fl_PixmapC1EPKPKc at Base 1.11
- (arch=!sparc64)_ZN9Fl_PixmapC2EPKPKc at Base 1.11
+ _ZN9Fl_PixmapC2EPKPKc at Base 1.11
_ZN9Fl_Widget12as_gl_windowEv at Base 1.11
_ZN9Fl_Widget8as_groupEv at Base 1.11
_ZN9Fl_Widget9as_windowEv at Base 1.11
diff --git a/debian/libmgl-qt5.symbols b/debian/libmgl-qt5.symbols
index f4b200d..539e6a1 100644
--- a/debian/libmgl-qt5.symbols
+++ b/debian/libmgl-qt5.symbols
@@ -4,7 +4,6 @@ libmgl-qt.so.5 libmgl-qt5 #MINVER#
_Z12setExtensionRK7QStringPKc at Base 1.11
_Z16convertFromGraphR7QPixmapP10mglGraphABPPh at Base 1.11
_Z8mglQtRunv at Base 1.11
- (arch=sparc64)_ZGVZ13qvariant_castI8QVariantET_RKS0_E3vid at Base 1.11
(optional)_ZN10QByteArrayD1Ev at Base 1.11
_ZN10mglGraphAB8GetRatioEv at Base 1.11
_ZN10mglGraphQT10ToggleZoomEv at Base 1.11
@@ -88,7 +87,7 @@ libmgl-qt.so.5 libmgl-qt5 #MINVER#
_ZN7QMathGLD2Ev at Base 1.11
(optional)_ZN7QStringC1ERKS_ at Base 1.11
_ZN7QStringD1Ev at Base 1.11
- (arch=!alpha !sparc64)_ZN7QStringD2Ev at Base 1.11
+ _ZN7QStringD2Ev at Base 1.11
_ZNK7QMathGL10metaObjectEv at Base 1.11
_ZTI10mglGraphQT at Base 1.11
_ZTI7QMathGL at Base 1.11
diff --git a/debian/libmgl5.symbols b/debian/libmgl5.symbols
index 3bcaf82..3e09928 100644
--- a/debian/libmgl5.symbols
+++ b/debian/libmgl5.symbols
@@ -621,7 +621,7 @@ libmgl.so.5 libmgl5 #MINVER#
_Z9normal_1dRK7mglDatafPfb at Base 1.11
_Z9normal_3dRK7mglDatafffPfS2_S2_b at Base 1.11
_ZN10_mgl_sliceD1Ev at Base 1.11
- (arch=!alpha !sparc64 !powerpcspe)_ZN10_mgl_sliceD2Ev at Base 1.11
+ (arch=!powerpcspe)_ZN10_mgl_sliceD2Ev at Base 1.11
_ZN10mglFormula5ErrorE at Base 1.11
_ZN10mglFormulaC1EPKc at Base 1.11
_ZN10mglFormulaC2EPKc at Base 1.11
@@ -797,7 +797,7 @@ libmgl.so.5 libmgl5 #MINVER#
(arch=!alpha !amd64 !kfreebsd-amd64 !ia64 !s390 !s390x !sparc64 !powerpcspe)_ZN10u3dLineSet7AddLineEjjj at Base 1.11
_ZN10u3dLineSet9line_plotEPfS0_S0_S0_ at Base 1.11
_ZN10u3dLineSetD1Ev at Base 1.11
- (arch=!alpha !sparc64 !powerpcspe)_ZN10u3dLineSetD2Ev at Base 1.11
+ (arch=!powerpcspe)_ZN10u3dLineSetD2Ev at Base 1.11
_ZN10u3dTexture13print_textureEPKcRSt14basic_ofstreamIcSt11char_traitsIcEE at Base 1.11
(optional)_ZN10u3dTextureD1Ev at Base 1.11
_ZN11TGAImageMin10DeallocateEv at Base 1.11
@@ -815,7 +815,7 @@ libmgl.so.5 libmgl5 #MINVER#
_ZN11u3dMaterial12print_shaderERSt14basic_ofstreamIcSt11char_traitsIcEE at Base 1.11
_ZN11u3dMaterial14print_materialERSt14basic_ofstreamIcSt11char_traitsIcEE at Base 1.11
_ZN11u3dMaterialD1Ev at Base 1.11
- (arch=!alpha !sparc64 !powerpcspe)_ZN11u3dMaterialD2Ev at Base 1.11
+ (arch=!powerpcspe)_ZN11u3dMaterialD2Ev at Base 1.11
_ZN11u3dPointSet10point_plotERK8mglPointRK8mglColor at Base 1.11
_ZN11u3dPointSet20print_model_resourceERSt14basic_ofstreamIcSt11char_traitsIcEE at Base 1.11
_ZN11u3dPointSetC1ERKSsP12mglGraphIDTF at Base 1.11
@@ -949,8 +949,8 @@ libmgl.so.5 libmgl5 #MINVER#
_ZN7mglDataC1ERKS_ at Base 1.11
_ZN7mglDataC2ERKS_ at Base 1.11
_ZN7mglDataD0Ev at Base 1.11
- (arch=amd64 alpha i386 ia64 armel armhf sparc sparc64 sh4 powerpcspe kfreebsd-amd64 kfreebsd-i386 mipsel powerpc s390 s390x)_ZN7mglDataD1Ev at Base 1.11
- (arch=amd64 armel armhf ia64 i386 kfreebsd-amd64 kfreebsd-i386 mipsel powerpc s390 s390x sh4 sparc)_ZN7mglDataD2Ev at Base 1.11
+ _ZN7mglDataD1Ev at Base 1.11
+ _ZN7mglDataD2Ev at Base 1.11
_ZN7mglDataaSERKS_ at Base 1.11
_ZN7mglDataaSEf at Base 1.11
_ZN7mglDatadVERKS_ at Base 1.11
@@ -994,7 +994,7 @@ libmgl.so.5 libmgl5 #MINVER#
_ZN7mglFuncC1ElPKwPS_ at Base 1.11
_ZN7mglFuncC2ElPKwPS_ at Base 1.11
_ZN7mglFuncD1Ev at Base 1.11
- (arch=!sparc64)_ZN7mglFuncD2Ev at Base 1.11
+ _ZN7mglFuncD2Ev at Base 1.11
_ZN7mglPrim4DrawEP10mglGraphPS at Base 1.11
_ZN7mglPrim6IsSameEfPfi at Base 1.11
_ZN7u3dBall10print_nodeERSt14basic_ofstreamIcSt11char_traitsIcEE at Base 1.11
@@ -1009,10 +1009,10 @@ libmgl.so.5 libmgl5 #MINVER#
_ZN7u3dMesh9quad_plotEPfS0_S0_S0_S0_S0_S0_S0_ at Base 1.11
_ZN7u3dMesh9trig_plotEPfS0_S0_S0_S0_S0_ at Base 1.11
_ZN7u3dMeshD1Ev at Base 1.11
- (arch=!alpha !sparc64 !powerpcspe)_ZN7u3dMeshD2Ev at Base 1.11
+ (arch=!powerpcspe)_ZN7u3dMeshD2Ev at Base 1.11
_ZN7u3dNode5printERSt14basic_ofstreamIcSt11char_traitsIcEE at Base 1.11
_ZN7u3dNodeD1Ev at Base 1.11
- (arch=!alpha !sparc64 !powerpcspe)_ZN7u3dNodeD2Ev at Base 1.11
+ (arch=!powerpcspe)_ZN7u3dNodeD2Ev at Base 1.11
_ZN8mglColor3SetES_f at Base 1.11
_ZN8mglColor3SetEcf at Base 1.11
_ZN8mglGraph10ColumnPlotEiif at Base 1.11
@@ -1443,7 +1443,7 @@ libmgl.so.5 libmgl5 #MINVER#
_ZN8u3dModel8AddPointERK8mglPoint at Base 1.11
_ZN8u3dModelC1ESsP12mglGraphIDTFRKb at Base 1.11
_ZN8u3dModelC2ESsP12mglGraphIDTFRKb at Base 1.11
- (arch=!alpha !sparc64 !powerpcspe)_ZN8u3dModelD1Ev at Base 1.11
+ (arch=!powerpcspe)_ZN8u3dModelD1Ev at Base 1.11
_ZN8u3dModelD2Ev at Base 1.11
_ZNK10mglFormula4CalcEPKf at Base 1.11
_ZNK10mglFormula4CalcEffff at Base 1.11
diff --git a/debian/patches/createpngdirectory.patch b/debian/patches/createpngdirectory.patch
deleted file mode 100644
index 439dc25..0000000
--- a/debian/patches/createpngdirectory.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Create /png directory in the topmost source directory
---- a/texinfo/png/Makefile.am
-+++ b/texinfo/png/Makefile.am
-@@ -7,5 +7,6 @@
-
- $(png_images): hotdogs.pts # $(top_builddir)/examples/mgl_example
- $(top_builddir)/examples/mgl_example -kind=${@:.png=}
-+ if test ! -d ../../png; then mkdir ../../png/; fi
- cp ${@} ../../png/
- touch $(srcdir)/../mathgl.texi
diff --git a/debian/patches/series b/debian/patches/series
index 3bb53c1..bb58b3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+texinfo-png-Makefile.patch
dircategory-and-direntry-mathgl-en-texi.patch
dircategory-and-direntry-mathgl-ru-texi.patch
dircategory-and-direntry-mgl-ru-texi.patch
diff --git a/debian/patches/texinfo-png-Makefile.patch b/debian/patches/texinfo-png-Makefile.patch
new file mode 100644
index 0000000..680127e
--- /dev/null
+++ b/debian/patches/texinfo-png-Makefile.patch
@@ -0,0 +1,20 @@
+Create /png directory in the topmost source directory
+--- a/texinfo/png/Makefile.am
++++ b/texinfo/png/Makefile.am
+@@ -7,5 +7,6 @@
+
+ $(png_images): hotdogs.pts # $(top_builddir)/examples/mgl_example
+ $(top_builddir)/examples/mgl_example -kind=${@:.png=}
++ if test ! -d ../../png; then mkdir ../../png/; fi
+ cp ${@} ../../png/
+ touch $(srcdir)/../mathgl.texi
+--- a/texinfo/png/Makefile.in
++++ b/texinfo/png/Makefile.in
+@@ -463,6 +463,7 @@
+
+ $(png_images): hotdogs.pts # $(top_builddir)/examples/mgl_example
+ $(top_builddir)/examples/mgl_example -kind=${@:.png=}
++ if test ! -d ../../png; then mkdir ../../png/; fi
+ cp ${@} ../../png/
+ touch $(srcdir)/../mathgl.texi
+
diff --git a/texinfo/png/Makefile.am b/texinfo/png/Makefile.am
index 80e5143..1d28940 100644
--- a/texinfo/png/Makefile.am
+++ b/texinfo/png/Makefile.am
@@ -7,5 +7,6 @@ CLEANFILES = $(png_images)
$(png_images): hotdogs.pts # $(top_builddir)/examples/mgl_example
$(top_builddir)/examples/mgl_example -kind=${@:.png=}
+ if test ! -d ../../png; then mkdir ../../png/; fi
cp ${@} ../../png/
touch $(srcdir)/../mathgl.texi
diff --git a/texinfo/png/Makefile.in b/texinfo/png/Makefile.in
index f5e89c6..8ed1804 100644
--- a/texinfo/png/Makefile.in
+++ b/texinfo/png/Makefile.in
@@ -463,6 +463,7 @@ uninstall-am: uninstall-pngDATA
$(png_images): hotdogs.pts # $(top_builddir)/examples/mgl_example
$(top_builddir)/examples/mgl_example -kind=${@:.png=}
+ if test ! -d ../../png; then mkdir ../../png/; fi
cp ${@} ../../png/
touch $(srcdir)/../mathgl.texi
--
Packaging for mathgl
More information about the debian-science-commits
mailing list