Basic build

diff --git a/debian/changelog b/debian/changelog
index 7e62e0cca527b6cf130aabb4caa62a9e71c2c261..27a32a7f7fe2f676b3f650cd7cadcd4e413d9bce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mathgl (2~rc2+svn358-1) experimental; urgency=low
+
+  * Updated source from svn repository.
+
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Fri, 9 Mar 2012 09:16:00 +0200
+
 mathgl (2~rc2-1) experimental; urgency=low
 
   * Updated source from svn repository.

diff --git a/debian/control b/debian/control
index c2af3584e9c45cec67dcec5add59bc9ac2f1bec6..e58d13e816c9e417b95f60b014974a775fd1ac47 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -28,34 +28,6 @@ Description: library for scientific graphs. (utilities and examples)
  .
  This package contains MathGL utilities and examples.
 
-Package: mathgl-doc-en
-Architecture: all
-Section: doc
-Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
-Replaces: mathgl-doc
-Description: library for scientific graphs. (English documentation)
- 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
- files. There are simple window interfaces based on GLUT, FLTK and/or Qt.
- MathGL can also be used in the console. There are interfaces to a set of
- languages, such as, C, Fortran, Pascal, Forth, Python, Octave.
- .
- This package contains the MathGL documentation in English.
-
-Package: mathgl-doc-ru
-Architecture: all
-Section: doc
-Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
-Replaces: mathgl-doc
-Description: library for scientific graphs. (Russian documentation)
- 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
- files. There are simple window interfaces based on GLUT, FLTK and/or Qt.
- MathGL can also be used in the console. There are interfaces to a set of
- languages, such as, C, Fortran, Pascal, Forth, Python, Octave.
- .
- This package contains the MathGL documentation in Russian.
-
 Package: libmgl6
 Architecture: any
 Section: libs
@@ -107,18 +79,4 @@ Description: library for scientific graphs. (development files)
  MathGL can also be used in the console. There are interfaces to a set of
  languages, such as, C, Fortran, Pascal, Forth, Python, Octave.
  .
- This package contains the development files.
-
-Package: python-mathgl
-Architecture: any
-Section: python
-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
- files. There are simple window interfaces based on GLUT, FLTK and/or Qt.
- MathGL can also be used in the console. There are interfaces to a set of
- languages, such as, C, Fortran, Pascal, Forth, Python, Octave.
- .
- This package provides the Python module for mathgl. 
+ This package contains the development files. 

diff --git a/debian/libmgl-data.install b/debian/libmgl-data.install
index f98f41bf2b15466f12c5ebdf59988ff47cdfe2cb..b3773b6c27fd4fb8559855a03c2ece311b058f28 100644 (file)
--- a/debian/libmgl-data.install
+++ b/debian/libmgl-data.install
@@ -1 +1 @@
-debian/tmp/usr/share/mathgl
+debian/tmp/usr/local/share/mathgl

diff --git a/debian/libmgl-dev.install b/debian/libmgl-dev.install
index 4ed7342fb333b1996df34d8a313858a8d597edb0..4d184b5420ff3179f1490e3bc18a85ccec8a5490 100644 (file)
--- a/debian/libmgl-dev.install
+++ b/debian/libmgl-dev.install
@@ -1,4 +1,3 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/*.la
+debian/tmp/usr/local/include/*
+debian/tmp/usr/local/lib/*.so
+debian/tmp/usr/local/lib/*.a

diff --git a/debian/libmgl-wnd6.install b/debian/libmgl-wnd6.install
index f9595a3bf84374f87c7e2b638c36722084d87c04..d3d865881296037d6ee29649431cef024a9bd77d 100644 (file)
--- a/debian/libmgl-wnd6.install
+++ b/debian/libmgl-wnd6.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libmgl-wnd.so.*
\ No newline at end of file
+debian/tmp/usr/local/lib/libmgl-wnd.so.*
\ No newline at end of file

diff --git a/debian/libmgl6.install b/debian/libmgl6.install
index 248a51b133bfb1761fe5565cbb35aeab74f73e47..6c4f5ba8a00a3d88c404a4c21ceec38b2b0b46f7 100644 (file)
--- a/debian/libmgl6.install
+++ b/debian/libmgl6.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libmgl.so.*
\ No newline at end of file
+debian/tmp/usr/local/lib/libmgl.so.*
\ No newline at end of file

diff --git a/debian/mathgl.install b/debian/mathgl.install
index dba26b586c9ddaea0186fe58999c43080fc6b614..ceea6f53eef61ba120a6843addda439d85189c8f 100644 (file)
--- a/debian/mathgl.install
+++ b/debian/mathgl.install
@@ -1 +1 @@
-debian/tmp/usr/bin/*
\ No newline at end of file
+debian/tmp/usr/local/bin/*
\ No newline at end of file

diff --git a/debian/python-mathgl.install b/debian/python-mathgl.install
index 18106cb6501abc937ee7f58ed4d1bf47f308be80..08038b90d05cf751cdb1c74fdd3e41677bac66dc 100644 (file)
--- a/debian/python-mathgl.install
+++ b/debian/python-mathgl.install
@@ -1 +1 @@
-debian/tmp/usr/lib/python*/dist-packages/*
+debian/tmp/usr/local/lib/python*/dist-packages/*

diff --git a/debian/rules b/debian/rules
index 477669a9a30a851bbf9459e65b2ec178818fae72..f1b3d3f618e3182a0b99c456b0b9c5efd6a951cf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,22 @@ export DH_OPTIONS=-v
 
 clean:
        dh_testdir
-       rm -f png/*.png
+       rm -rf png/*.png lang/CMakeFiles/_mathgl.dir/mglPYTHON_wrap.cxx.o \
+             CMakeFiles/CompilerIdC/a.out CMakeFiles/CompilerIdCXX/a.out \
+             lang/_mathgl.so CMakeCache.txt CMakeFiles Makefile\
+             cmake_install.cmake examples/CMakeFiles examples/Makefile \
+             examples/cmake_install.cmake include/CMakeFiles \
+             include/Makefile include/cmake_install.cmake \
+             include/mgl/config.h lang/CMakeFiles lang/Makefile \
+             lang/cmake_install.cmake lang/mathgl.py lang/mglPYTHON_wrap.cxx \
+             src/CMakeFiles src/Makefile src/cmake_install.cmake \
+             texinfo/CMakeFiles texinfo/Makefile texinfo/cmake_install.cmake \
+             udav/CMakeFiles udav/Makefile udav/cmake_install.cmake \
+             udav/udav.qrc.depends utils/CMakeFiles utils/Makefile \
+             utils/cmake_install.cmake widgets/CMakeFiles widgets/Makefile \
+             widgets/cmake_install.cmake widgets/libmgl-wnd.so src/libmgl.so \
+             widgets/libmgl-wnd.so.6.0.0 examples/mgl_example utils/mglconv \
+             src/libmgl.a src/libmgl.so.6.0.0 widgets/libmgl-wnd.a
        dh_auto_clean
        dh_clean 
 
@@ -21,7 +36,7 @@ build-arch: build-stamp
 build-indep: build-stamp
 build-stamp:
        dh_testdir
-       dh_auto_configure -- --enable-all --enable-octave --enable-python
+       cmake .
        dh_auto_build
 #      dh_auto_test
 
@@ -76,11 +91,11 @@ binary-arch:
        dh_installdirs -a
        dh_auto_install -a
        rm -f debian/tmp/usr/bin/*_example
-       for file in debian/tmp/usr/lib/*.la; do \
-               sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
-       done
-       chrpath -d debian/tmp/usr/lib/*so.6
-       chrpath -d debian/tmp/usr/lib/python*/dist-packages/_mathgl.so
+#      for file in debian/tmp/usr/lib/*.la; do \
+#              sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
+#      done
+#      chrpath -d debian/tmp/usr/lib/*so.6
+#      chrpath -d debian/tmp/usr/lib/python*/dist-packages/_mathgl.so
        dh_install -a
        dh_installdocs -a
        dh_installchangelogs -a

diff --git a/debian/source/options b/debian/source/options
index 5e38540c1a915a929ae26d3f0cef2363224894f9..e957e3fcec154b8cf41ecbfe7537a507d86d3c4e 100644 (file)
--- a/debian/source/options
+++ b/debian/source/options
@@ -1 +1 @@
- extend-diff-ignore = "(^|/)(config\.log|lang/numpy\.i|texinfo/Makefile\.am)$"
\ No newline at end of file
+ extend-diff-ignore = "(^|/)(config\.log|lang/numpy\.i|texinfo/Makefile\.am|install_manifest\.txt)$"
\ No newline at end of file

diff --git a/install_manifest.txt b/install_manifest.txt
new file mode 100644 (file)
index 0000000..92e77f9
--- /dev/null
+++ b/install_manifest.txt
@@ -0,0 +1,38 @@
+/usr/local/share/mathgl/fonts/STIX_b.vfm
+/usr/local/share/mathgl/fonts/STIX.vfm
+/usr/local/share/mathgl/fonts/STIX_bi.vfm
+/usr/local/share/mathgl/fonts/STIX_i.vfm
+/usr/local/lib/libmgl.so.6.0.0
+/usr/local/lib/libmgl.so
+/usr/local/lib/libmgl.a
+/usr/local/lib/libmgl-wnd.so.6.0.0
+/usr/local/lib/libmgl-wnd.so
+/usr/local/lib/libmgl-wnd.a
+/usr/local/bin/mglconv
+/usr/local/bin/mgl_example
+/usr/local/include/mgl/fit.h
+/usr/local/include/mgl/mgl.h
+/usr/local/include/mgl/evalc.h
+/usr/local/include/mgl/base_cf.h
+/usr/local/include/mgl/vect.h
+/usr/local/include/mgl/font.h
+/usr/local/include/mgl/type.h
+/usr/local/include/mgl/volume.h
+/usr/local/include/mgl/surf.h
+/usr/local/include/mgl/canvas_cf.h
+/usr/local/include/mgl/canvas.h
+/usr/local/include/mgl/eval.h
+/usr/local/include/mgl/other.h
+/usr/local/include/mgl/addon.h
+/usr/local/include/mgl/config.h
+/usr/local/include/mgl/config.h.in
+/usr/local/include/mgl/plot.h
+/usr/local/include/mgl/define.h
+/usr/local/include/mgl/mgl_cf.h
+/usr/local/include/mgl/base.h
+/usr/local/include/mgl/opengl.h
+/usr/local/include/mgl/cont.h
+/usr/local/include/mgl/prim.h
+/usr/local/include/mgl/parser.h
+/usr/local/include/mgl/window.h
+/usr/local/include/mgl/data.h