r36790 - in /packages/madlib/trunk/debian: README.Debian changelog control libMAdLib1.install libmadlib-dev.install libmadlib.install madlib-doc.examples rules
prudhomm at users.alioth.debian.org
prudhomm at users.alioth.debian.org
Thu Aug 12 14:22:48 UTC 2010
Author: prudhomm
Date: Thu Aug 12 14:22:43 2010
New Revision: 36790
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36790
Log:
update to devel version
Added:
packages/madlib/trunk/debian/libMAdLib1.install
Removed:
packages/madlib/trunk/debian/libmadlib.install
Modified:
packages/madlib/trunk/debian/README.Debian
packages/madlib/trunk/debian/changelog
packages/madlib/trunk/debian/control
packages/madlib/trunk/debian/libmadlib-dev.install
packages/madlib/trunk/debian/madlib-doc.examples
packages/madlib/trunk/debian/rules
Modified: packages/madlib/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/madlib/trunk/debian/README.Debian?rev=36790&op=diff
==============================================================================
--- packages/madlib/trunk/debian/README.Debian (original)
+++ packages/madlib/trunk/debian/README.Debian Thu Aug 12 14:22:43 2010
@@ -1,9 +1,10 @@
-madlib for Debian
+MAdLib for Debian
-----------------
The header files are in /usr/include/MAdLib.
-In order to link yor own code with MAdLib use the following link flags
- -lMAdLib -llapack -lblas -lm
+In order to link yor own code with MAdLib use the following link flags
+-lMAdLib, MAdLib library is already linked to the libraries it depends
+on.
- -- Christophe Prud'homme <prudhomm at debian.org>, Tue, 4 Aug 2009 08:36:30 +0200
+ -- Christophe Prud'homme <prudhomm at debian.org>, Thu, 12 Aug 2010 16:21:38 +0200
Modified: packages/madlib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/madlib/trunk/debian/changelog?rev=36790&op=diff
==============================================================================
--- packages/madlib/trunk/debian/changelog (original)
+++ packages/madlib/trunk/debian/changelog Thu Aug 12 14:22:43 2010
@@ -1,3 +1,9 @@
+madlib (1.3.svn-head~svn145-1) experimental; urgency=low
+
+ * New upstream release
+
+ -- Christophe Prud'homme <prudhomm at debian.org> Thu, 12 Aug 2010 15:06:21 +0200
+
madlib (1.3.0-3) unstable; urgency=low
[Christophe Prud'homme]
Modified: packages/madlib/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/madlib/trunk/debian/control?rev=36790&op=diff
==============================================================================
--- packages/madlib/trunk/debian/control (original)
+++ packages/madlib/trunk/debian/control Thu Aug 12 14:22:43 2010
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), quilt, autotools-dev, libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so,
+Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so,
mpi-default-dev,
libopencascade-modeling-dev,
gmsh
@@ -12,7 +12,7 @@
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/madlib/trunk
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/madlib/trunk
-Package: libmadlib
+Package: libMAdLib1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, gmsh
@@ -41,7 +41,7 @@
Package: libmadlib-dev
Section: libdevel
Architecture: any
-Depends: libmadlib, ${shlibs:Depends}, ${misc:Depends}
+Depends: libMAdLib1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: mesh adaptation library
This package contains the development files (headers, so and static
libraries) for MAdLib.
@@ -67,7 +67,7 @@
Package: libmadlib-dbg
Section: debug
Architecture: any
-Depends: libmadlib, ${shlibs:Depends}, ${misc:Depends}
+Depends: libMAdLib1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: mesh adaptation library
This package contains the debug symbols for MAdLib.
.
Added: packages/madlib/trunk/debian/libMAdLib1.install
URL: http://svn.debian.org/wsvn/debian-science/packages/madlib/trunk/debian/libMAdLib1.install?rev=36790&op=file
==============================================================================
--- packages/madlib/trunk/debian/libMAdLib1.install (added)
+++ packages/madlib/trunk/debian/libMAdLib1.install Thu Aug 12 14:22:43 2010
@@ -1,0 +1,2 @@
+debian/tmp/usr/lib/lib*.so.* /usr/lib
+
Modified: packages/madlib/trunk/debian/libmadlib-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/madlib/trunk/debian/libmadlib-dev.install?rev=36790&op=diff
==============================================================================
--- packages/madlib/trunk/debian/libmadlib-dev.install (original)
+++ packages/madlib/trunk/debian/libmadlib-dev.install Thu Aug 12 14:22:43 2010
@@ -1,5 +1,4 @@
debian/tmp/usr/include
debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/lib*.la /usr/lib
-debian/tmp/usr/lib/lib*.a /usr/lib
-MAdConfig.h /usr/include/MAdLib
+debian/tmp/usr/lib/lib*.a
+
Modified: packages/madlib/trunk/debian/madlib-doc.examples
URL: http://svn.debian.org/wsvn/debian-science/packages/madlib/trunk/debian/madlib-doc.examples?rev=36790&op=diff
==============================================================================
--- packages/madlib/trunk/debian/madlib-doc.examples (original)
+++ packages/madlib/trunk/debian/madlib-doc.examples Thu Aug 12 14:22:43 2010
@@ -1,4 +1,4 @@
Tutorial
-variables
+
Modified: packages/madlib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/madlib/trunk/debian/rules?rev=36790&op=diff
==============================================================================
--- packages/madlib/trunk/debian/rules (original)
+++ packages/madlib/trunk/debian/rules Thu Aug 12 14:22:43 2010
@@ -1,30 +1,35 @@
#!/usr/bin/make -f
+DEB_AUTO_CLEANUP_RCS := yes
+DEB_COMPRESS_EXCLUDE := .pdf
+
+include /usr/share/cdbs/1/class/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-# Add here any variable or target overrides you need.
-DEB_CONFIGURE_EXTRA_FLAGS := \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info\
- --with-gmsh-prefix=/usr \
- --with-occ-prefix=/usr \
- --with-mpi-prefix=/usr \
- --enable-gmsh --enable-occ \
- --enable-ann --enable-benchmarks
+WITH_OCC=yes
+WITH_MPI=no
+ifeq ($(WITH_OCC),yes)
+ CFLAGS += -I/usr/include/opencascade -DHAVE_NO_OCC_CONFIG_H
+ CXXFLAGS += -I/usr/include/opencascade -DHAVE_NO_OCC_CONFIG_H
+ CPPFLAGS += -I/usr/include/opencascade -DHAVE_NO_OCC_CONFIG_H
+endif
-DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.*$$//p')
-MADLIB_VERSION=$(DEB_STRIPPED_UPSTREAM_VERSION)
+# To enable med support
+CFLAGS +=-I/usr/include/mpi -DOMPI_SKIP_MPICXX
+CXXFLAGS +=-I/usr/include/mpi -DOMPI_SKIP_MPICXX
+CPPFLAGS +=-I/usr/include/mpi -DOMPI_SKIP_MPICXX
-clean::
- -rm Contrib/mathex/mathex.o
- -rm config.log
- -rm config.status
- -rm Benchmarks/checkMesh/Makefile Benchmarks/meshInfo/Makefile Benchmarks/moveIt/Makefile Benchmarks/optimize/Makefile Contrib/ANN/Makefile/Makefile
+DEB_CMAKE_EXTRA_FLAGS=
+ -DMADLIB_BUILD_BENCHMARKS=ON \
+ -DMADLIB_INSTALL_EXTENDED_API=ON\
+ -DMADLIB_USE_GMSH=ON \
+ -DGMSH_INCLUDE_DIRS=/usr/include/gmsh \
+ -DMADLIB_USE_ANN=ON \
+ -DMADLIB_USE_OCC=ON \
+ -DOCC_INCLUDE_DIRS=/usr/include/opencascade
+
+build/libmadlib::
+ cd $(DEB_BUILDDIR) && $(MAKE) shared
get-orig-source:
uscan --force-download --rename --verbose --upstream-version $(MADLIB_VERSION)
More information about the debian-science-commits
mailing list