[mathgl] 08/08: Adjust the library package names to the new .so name
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Wed Jan 29 10:41:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch experimental
in repository mathgl.
commit 22a7ac58b2583ffc363055a02ea83530d9edcdca
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Wed Jan 29 12:38:16 2014 +0200
Adjust the library package names to the new .so name
---
CMakeLists.txt | 4 +-
debian/control | 190 ++++++++++-----------
debian/libmgl-data.install | 3 +-
debian/libmgl-qt7.1.0.install | 1 -
debian/libmgl-qt7.2.0.install | 2 +
.../{libmgl7.1.0.install => libmgl7.2.0.install} | 0
debian/patches/CMakeLists.txt.patch | 16 +-
7 files changed, 114 insertions(+), 102 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24285b0..2294903 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,7 +68,7 @@ option(enable-all "Enable all core features")
option(enable-all-widgets "Enable all Widgets")
option(enable-all-swig "Enable all SWIG based interfaces")
option(enable-pthread "Enable POSIX threads support" OFF)
-option(enable-openmp "Enable OpenMP support" ON)
+option(enable-openmp "Enable OpenMP support" OFF)
option(enable-lgpl "Enable only LGPL part of MathGL")
option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
#option(enable-ltdl "Enable loading modules support")
@@ -94,7 +94,7 @@ MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl" ON "
CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl" OFF)
MGL_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
MGL_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
-CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
+CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF)
MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
diff --git a/debian/control b/debian/control
index dc41420..eaef9d1 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/mathgl.
Package: mathgl
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl7.1.0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl7.2.0 (= ${binary:Version})
Description: library for scientific graphs (utilities and examples)
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
@@ -30,7 +30,7 @@ Description: library for scientific graphs (utilities and examples)
Package: udav
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl7.1.0 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl7.2.0 (= ${binary:Version})
Description: library for scientific graphs (window interface)
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
@@ -55,7 +55,7 @@ Description: library for scientific graphs (window interface)
# .
# This package contains the MathGL documentation in English.
-Package: libmgl7.1.0
+Package: libmgl7.2.0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
@@ -70,53 +70,53 @@ Description: library for scientific graphs (main runtime library)
.
This package contains the shared object files.
-Package: libmgl-mpi7.1.0
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
-Description: library for scientific graphs (mpi enhanced runtime library)
- 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, parallel interface enhanced, shared object
- files.
-
-Package: libmgl-wnd7.1.0
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
-Replaces: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5
-Conflicts: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5
-Description: library for scientific graphs (windows runtime library)
- 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 window opening related shared object files based
- on Fltk, Qt and Wx.
+# Package: libmgl-mpi7.1.0
+# Architecture: any
+# Section: libs
+# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
+# Description: library for scientific graphs (mpi enhanced runtime library)
+# 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, parallel interface enhanced, shared object
+# files.
-Package: libmgl-glut7.1.0
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
-Replaces: libmgl-glut5
-Conflicts: libmgl-glut5
-Description: library for scientific graphs (glut interface for windows)
- 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 glut interface shared object files for window
- opening.
+# Package: libmgl-wnd7.1.0
+# Architecture: any
+# Section: libs
+# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
+# Replaces: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5
+# Conflicts: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5
+# Description: library for scientific graphs (windows runtime library)
+# 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 window opening related shared object files based
+# on Fltk, Qt and Wx.
+#
+# Package: libmgl-glut7.1.0
+# Architecture: any
+# Section: libs
+# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
+# Replaces: libmgl-glut5
+# Conflicts: libmgl-glut5
+# Description: library for scientific graphs (glut interface for windows)
+# 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 glut interface shared object files for window
+# opening.
-Package: libmgl-qt7.1.0
+Package: libmgl-qt7.2.0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
@@ -132,37 +132,37 @@ Description: library for scientific graphs (Qt interface for windows)
This package contains the Qt interface shared object files for window
opening.
-Package: libmgl-fltk7.1.0
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
-Replaces: libmgl-fltk5
-Conflicts: libmgl-fltk5
-Description: library for scientific graphs (fltk interface for windows)
- 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 fltk interface shared object files for window
- opening.
-
-Package: libmgl-wx7.1.0
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
-Replaces: libmgl-wx5
-Conflicts: libmgl-wx5
-Description: library for scientific graphs (wx interface for windows)
- 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 wx interface shared object files for window
- opening.
+# Package: libmgl-fltk7.1.0
+# Architecture: any
+# Section: libs
+# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
+# Replaces: libmgl-fltk5
+# Conflicts: libmgl-fltk5
+# Description: library for scientific graphs (fltk interface for windows)
+# 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 fltk interface shared object files for window
+# opening.
+#
+# Package: libmgl-wx7.1.0
+# Architecture: any
+# Section: libs
+# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data
+# Replaces: libmgl-wx5
+# Conflicts: libmgl-wx5
+# Description: library for scientific graphs (wx interface for windows)
+# 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 wx interface shared object files for window
+# opening.
# Package: libmgl-lua7.1.0
# Architecture: any
@@ -193,10 +193,10 @@ Description: library for scientific graphs (data files)
Package: libmgl-dev
Architecture: any
Section: libdevel
-Depends: libmgl7.1.0 (= ${binary:Version}), libmgl-wnd7.1.0 (= ${binary:Version}),
- libmgl-wx7.1.0 (= ${binary:Version}), libmgl-fltk7.1.0 (= ${binary:Version}),
- libmgl-qt7.1.0 (= ${binary:Version}), libmgl-glut7.1.0 (= ${binary:Version}),
- libmgl-mpi7.1.0 (= ${binary:Version}), ${misc:Depends}, libgsl0-dev,
+Depends: libmgl7.2.0 (= ${binary:Version}), libmgl-wnd7.2.0 (= ${binary:Version}),
+ libmgl-wx7.2.0 (= ${binary:Version}), libmgl-fltk7.2.0 (= ${binary:Version}),
+ libmgl-qt7.2.0 (= ${binary:Version}), libmgl-glut7.2.0 (= ${binary:Version}),
+ libmgl-mpi7.2.0 (= ${binary:Version}), ${misc:Depends}, libgsl0-dev,
libgl1-mesa-dev | libgl-dev, libpng-dev
Description: library for scientific graphs (development files)
A free cross-platform library of fast C++ routines for plotting data in up
@@ -207,15 +207,15 @@ Description: library for scientific graphs (development files)
.
This package contains the development files.
-Package: python-mathgl
-Architecture: any
-Section: python
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy
-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.
\ No newline at end of file
+# Package: python-mathgl
+# Architecture: any
+# Section: python
+# Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy
+# 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.
\ No newline at end of file
diff --git a/debian/libmgl-data.install b/debian/libmgl-data.install
index 8145769..b7a7ddc 100644
--- a/debian/libmgl-data.install
+++ b/debian/libmgl-data.install
@@ -1,2 +1 @@
-debian/tmp/usr/share/mathgl/fonts
-debian/tmp/usr/share/mathgl/mathgl.tar.gz
\ No newline at end of file
+debian/tmp/usr/share/mathgl/fonts
\ No newline at end of file
diff --git a/debian/libmgl-qt7.1.0.install b/debian/libmgl-qt7.1.0.install
deleted file mode 100644
index b7066da..0000000
--- a/debian/libmgl-qt7.1.0.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/libmgl-qt.so.*
\ No newline at end of file
diff --git a/debian/libmgl-qt7.2.0.install b/debian/libmgl-qt7.2.0.install
new file mode 100644
index 0000000..1a85e9a
--- /dev/null
+++ b/debian/libmgl-qt7.2.0.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libmgl-qt.so.*
+debian/tmp/usr/lib/libmgl-qt4.so.*
\ No newline at end of file
diff --git a/debian/libmgl7.1.0.install b/debian/libmgl7.2.0.install
similarity index 100%
rename from debian/libmgl7.1.0.install
rename to debian/libmgl7.2.0.install
diff --git a/debian/patches/CMakeLists.txt.patch b/debian/patches/CMakeLists.txt.patch
index e05bba0..ea33049 100644
--- a/debian/patches/CMakeLists.txt.patch
+++ b/debian/patches/CMakeLists.txt.patch
@@ -1,11 +1,23 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -92,7 +92,7 @@
+@@ -68,7 +68,7 @@
+ option(enable-all-widgets "Enable all Widgets")
+ option(enable-all-swig "Enable all SWIG based interfaces")
+ option(enable-pthread "Enable POSIX threads support" OFF)
+-option(enable-openmp "Enable OpenMP support" ON)
++option(enable-openmp "Enable OpenMP support" OFF)
+ option(enable-lgpl "Enable only LGPL part of MathGL")
+ option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'")
+ #option(enable-ltdl "Enable loading modules support")
+@@ -92,9 +92,9 @@
MGL_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
MGL_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-lgpl" OFF)
-MGL_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
+MGL_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" ON "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
MGL_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-lgpl" ON "NOT enable-all-widgets" ON)
- CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
+-CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF)
++CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF)
MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+ MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
+ MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mathgl.git
More information about the debian-science-commits
mailing list