r46825 - in /packages/ngsolve/trunk/debian: ./ patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri Jul 18 07:14:51 UTC 2014
Author: trophime-guest
Date: Fri Jul 18 07:14:50 2014
New Revision: 46825
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46825
Log:
update
Added:
packages/ngsolve/trunk/debian/libngsolve-dev.install
packages/ngsolve/trunk/debian/libngsolve.install
packages/ngsolve/trunk/debian/ngsolve.install
packages/ngsolve/trunk/debian/patches/ngsolve.patch
packages/ngsolve/trunk/debian/patches/shared-version.patch
Removed:
packages/ngsolve/trunk/debian/patches/configure.diff
packages/ngsolve/trunk/debian/patches/g++-4.7.patch
packages/ngsolve/trunk/debian/patches/openmp.diff
packages/ngsolve/trunk/debian/patches/shlibs.diff
Modified:
packages/ngsolve/trunk/debian/control
packages/ngsolve/trunk/debian/patches/configure.patch
packages/ngsolve/trunk/debian/patches/series
packages/ngsolve/trunk/debian/rules
Modified: packages/ngsolve/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/control?rev=46825&op=diff
==============================================================================
--- packages/ngsolve/trunk/debian/control (original)
+++ packages/ngsolve/trunk/debian/control Fri Jul 18 07:14:50 2014
@@ -2,16 +2,31 @@
Section: math
Priority: extra
Maintainer: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Build-Depends: cdbs, debhelper (>= 9), quilt,
- autotools-dev, automake, libtool,
+Build-Depends: debhelper (>= 9), quilt, dh-autoreconf,
+ subversion,
g++ (>= 4.0), gfortran (>= 4.0),
+ mpi-default-dev,
libnglib-dev (>= 5.1~),
- libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so,
- libmumps-seq-dev, tcl8.6-dev
+ libblas-dev, liblapack-dev,
+ libblacs-mpi-dev, libscalapack-mpi-dev,
+ libmumps-seq-dev, libmumps-dev, libmumps-scotch-dev, libmumps-ptscotch-dev,
+ libscotch-dev, libptscotch-dev,
+ libmetis-dev, libparmetis-dev,
+ tcl8.6-dev
Standards-Version: 3.9.5
Homepage: http://sourceforge.net/projects/ngsolve/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/ngsolve
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/ngsolve
+
+Package: ngsolve
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}, netgen
+Description: Finite Element Library on top of Netgen
+ NGSolve is a general purpose Finite Element Library on top of Netgen.
+ With the basic library one can solve heat flow equations, Maxwell
+ equations, and solid mechanical problems. Several add-ons are
+ available for particular application classes.
Package: libngsolve
Architecture: any
@@ -34,14 +49,3 @@
available for particular application classes.
.
This package contains files needed for developpement
-
-Package: libngsolve-examples
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, netgen
-Description: Finite Element Library on top of Netgen - examples
- NGSolve is a general purpose Finite Element Library on top of Netgen.
- With the basic library one can solve heat flow equations, Maxwell
- equations, and solid mechanical problems. Several add-ons are
- available for particular application classes.
- .
- This package contains files needed for examples
Added: packages/ngsolve/trunk/debian/libngsolve-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/libngsolve-dev.install?rev=46825&op=file
==============================================================================
--- packages/ngsolve/trunk/debian/libngsolve-dev.install (added)
+++ packages/ngsolve/trunk/debian/libngsolve-dev.install Fri Jul 18 07:14:50 2014
@@ -0,0 +1,2 @@
+debian/tmp/usr/include/*.* usr/include/ngsolve
+debian/tmp/usr/lib/*/*.so
Added: packages/ngsolve/trunk/debian/libngsolve.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/libngsolve.install?rev=46825&op=file
==============================================================================
--- packages/ngsolve/trunk/debian/libngsolve.install (added)
+++ packages/ngsolve/trunk/debian/libngsolve.install Fri Jul 18 07:14:50 2014
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/*.tcl usr/share/netgen
+usr/lib/*/lib*-5.1.so
Added: packages/ngsolve/trunk/debian/ngsolve.install
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/ngsolve.install?rev=46825&op=file
==============================================================================
--- packages/ngsolve/trunk/debian/ngsolve.install (added)
+++ packages/ngsolve/trunk/debian/ngsolve.install Fri Jul 18 07:14:50 2014
@@ -0,0 +1,9 @@
+usr/bin/ng*
+
+pde_tutorial/*.pde usr/share/doc/ngsolve/pde_tutorial
+pde_tutorial/*.vol* usr/share/doc/ngsolve/pde_tutorial
+pde_tutorial/*.geo usr/share/doc/ngsolve/pde_tutorial
+pde_tutorial/*.in2d usr/share/doc/ngsolve/pde_tutorial
+
+programming_demos/*.cpp usr/share/doc/ngsolve/programming_demos
+programming_demos/Makefile usr/share/doc/ngsolve/programming_demos
Modified: packages/ngsolve/trunk/debian/patches/configure.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/patches/configure.patch?rev=46825&op=diff
==============================================================================
--- packages/ngsolve/trunk/debian/patches/configure.patch (original)
+++ packages/ngsolve/trunk/debian/patches/configure.patch Fri Jul 18 07:14:50 2014
@@ -1,13 +1,26 @@
-Index: ngsolve-4.9.12/configure.ac
+Index: ngsolve-5.1/configure.ac
===================================================================
---- ngsolve-4.9.12.orig/configure.ac 2010-07-06 16:01:41.000000000 +0200
-+++ ngsolve-4.9.12/configure.ac 2010-07-06 16:02:11.000000000 +0200
-@@ -67,7 +67,7 @@
- AC_ARG_ENABLE([mumps],
- [ --enable-mumps enable sparse direct solver MUMPS],
- [AC_SUBST([MUMPS_INCLUDES], ["-DUSE_MUMPS"])]
-- [AC_SUBST([MUMPS_LIBS], ["-ldmumps -lzmumps -lmumps_common -lpord -lmpiseq -lgfortran"])]
-+ [AC_SUBST([MUMPS_LIBS], ["-ldmumps -lzmumps -lmumps_common -lpord -lmpiseq_seq -lgfortran"])]
- )
+--- ngsolve-5.1.orig/configure.ac
++++ ngsolve-5.1/configure.ac
+@@ -18,6 +18,8 @@ AC_PREFIX_DEFAULT(["/opt/netgen"])
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+
++AM_PROG_AR
++
+ CXXFLAGS="$CXXFLAGS -DUSE_TIMEOFDAY -DLAPACK"
+@@ -93,11 +95,8 @@ AC_ARG_ENABLE([MKLpardiso],
+ AC_ARG_ENABLE([mumps],
+ [AC_HELP_STRING([--enable-mumps],[enable sparse direct solver MUMPS])],
+ [AC_SUBST([MUMPS_INCLUDES], ["-DUSE_MUMPS"])]
+- [AC_SUBST([MUMPS_LIBS], ["-L/usr/local/lib -ldmumps -lzmumps -lmumps_common -lpord -L/home/joachim/Downloads/scotch_5.1.12_esmumps/lib -lscalapack -lmpi_f90 -lgfortran"])]
++ [AC_SUBST([MUMPS_LIBS], ["-ldmumps -lzmumps -lmumps_common -lpord -lptesmumps -lptscotch -lptscotcherr -lblacsCinit-openmpi -lblacsF77init-openmpi -lblacs-openmpi -lparmetis -lmetis -lgfortran -lmpi_f77"])]
+ )
+-# -lgfortran
+-# [AC_SUBST([MUMPS_LIBS], ["-L/opt/mumps/lib -ldmumps -lzmumps -lmumps_common -lpord -L/home/joachim/Downloads/scotch_5.1.12_esmumps/lib -lptesmumps -lptscotch -lptscotcherr /usr/local/lib/libscalapack.a /usr/local/lib/blacs_MPI-LINUX-0.a /usr/local/lib/blacsCinit_MPI-LINUX-0.a /usr/local/lib/blacs_MPI-LINUX-0-fake.a -lparmetis -lmetis -lgfortran -lmpi_f77"])]
+-
+
+
+
Added: packages/ngsolve/trunk/debian/patches/ngsolve.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/patches/ngsolve.patch?rev=46825&op=file
==============================================================================
--- packages/ngsolve/trunk/debian/patches/ngsolve.patch (added)
+++ packages/ngsolve/trunk/debian/patches/ngsolve.patch Fri Jul 18 07:14:50 2014
@@ -0,0 +1,13 @@
+Index: ngsolve-5.1/solve/Makefile.am
+===================================================================
+--- ngsolve-5.1.orig/solve/Makefile.am
++++ ngsolve-5.1/solve/Makefile.am
+@@ -39,7 +39,7 @@ ngs_LDADD = libngsolve.la \
+ $(top_builddir)/basiclinalg/libngbla.la \
+ $(top_builddir)/ngstd/libngstd.la \
+ $(LAPACK_LIBS) \
+- -L$(libdir) -lnglib -linterface
++ -L$(libdir) -lnglib
+
+
+
Modified: packages/ngsolve/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/patches/series?rev=46825&op=diff
==============================================================================
--- packages/ngsolve/trunk/debian/patches/series (original)
+++ packages/ngsolve/trunk/debian/patches/series Fri Jul 18 07:14:50 2014
@@ -1,4 +1,3 @@
-g++-4.7.patch
-configure.diff
-shlibs.diff
-openmp.diff
+configure.patch
+ngsolve.patch
+shared-version.patch
Added: packages/ngsolve/trunk/debian/patches/shared-version.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/patches/shared-version.patch?rev=46825&op=file
==============================================================================
--- packages/ngsolve/trunk/debian/patches/shared-version.patch (added)
+++ packages/ngsolve/trunk/debian/patches/shared-version.patch Fri Jul 18 07:14:50 2014
@@ -0,0 +1,36 @@
+Index: ngsolve-5.1/comp/Makefile.am
+===================================================================
+--- ngsolve-5.1.orig/comp/Makefile.am
++++ ngsolve-5.1/comp/Makefile.am
+@@ -22,5 +22,5 @@ include_HEADERS = bilinearform.hpp comp.
+ l2hofespace.hpp linearform.hpp meshaccess.hpp ngsobject.hpp \
+ postproc.hpp preconditioner.hpp vectorfacetfespace.hpp hypre_precond.hpp
+
+-libngcomp_la_LDFLAGS = -avoid-version
++libngcomp_la_LDFLAGS = -release $(PACKAGE_VERSION)
+ # -L/opt/hypre-2.8.0b/lib -lHYPRE
+Index: ngsolve-5.1/parallel/Makefile.am
+===================================================================
+--- ngsolve-5.1.orig/parallel/Makefile.am
++++ ngsolve-5.1/parallel/Makefile.am
+@@ -11,6 +11,6 @@ libparallel_la_SOURCES = parallelvvector
+ include_HEADERS = parallelngs.hpp parallelvector.hpp parallel_matrices.hpp
+
+
+-libparallel_la_LDFLAGS = -avoid-version
++libparallel_la_LDFLAGS = -release $(PACKAGE_VERSION)
+
+
+Index: ngsolve-5.1/solve/Makefile.am
+===================================================================
+--- ngsolve-5.1.orig/solve/Makefile.am
++++ ngsolve-5.1/solve/Makefile.am
+@@ -24,7 +24,7 @@ $(top_builddir)/basiclinalg/libngbla.la
+ $(top_builddir)/multigrid/libngmg.la \
+ $(LAPACK_LIBS) $(TCL_LIB_SPEC)
+
+-libngsolve_la_LDFLAGS = -avoid-version
++libngsolve_la_LDFLAGS = -release $(PACKAGE_VERSION)
+ # -rdynamic
+
+
Modified: packages/ngsolve/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/ngsolve/trunk/debian/rules?rev=46825&op=diff
==============================================================================
--- packages/ngsolve/trunk/debian/rules (original)
+++ packages/ngsolve/trunk/debian/rules Fri Jul 18 07:14:50 2014
@@ -1,48 +1,57 @@
#!/usr/bin/make -f
-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
+
+export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+%:
+ dh $@ --with autoreconf
+
+# to avoid lintian warnings
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
+# --disable-openmp do not use OpenMP
+# --enable-static[=PKGS] build static libraries [default=no]
+# --enable-shared[=PKGS] build shared libraries [default=yes]
+# --disable-gui don't build ngsolve with GUI
+# --enable-pardiso enable sparse direct solver pardiso
+# --enable-pardiso4 enable sparse direct solver pardiso
+# --enable-MKLpardiso enable sparse direct solver pardiso from MKL
+# --enable-mumps enable sparse direct solver MUMPS
+# --enable-parallel enable mpi parallelization
+# --enable-vt enable vampirtrace
# Add here any variable or target overrides you need.
-DEB_CONFIGURE_EXTRA_FLAGS := --with-netgen=/usr --with-tcl=/usr/lib/tcl8.5 --enable-mumps --enable-openmp
+extra_flags += \
+ --with-netgen=/usr \
+ --with-tcl=/usr/lib/tcl8.6 \
+ --disable-openmp \
+ --enable-mumps \
+ --enable-parallel \
+ CXX=mpic++ CC=mpicc FC=mpif90 F77=mpif77
-# add openmp support
-#CXXFLAGS += -fopenmp
-#CFLAGS += -fopenmp
-#LDFLAGS += -fopenmp
-clean::
- find . -name Makefile -exec rm {} \;
- find . -name Makefile.in -exec rm {} \;
+override_dh_auto_clean:
+ rm -rf $(CURDIR)/debian/tmp
+ rm -f configure.in
rm -f config.log config.status
- rm -f aclocal.m4 config.h.in configure ltmain.sh m4/ltversion.m4
+ -dh_auto_clean
-makebuilddir/libngsolve::
- autoreconf --install
-
-install/libngsolve::
- mkdir -p debian/libngsolve/usr/share/netgen
- mv $(DEB_DESTDIR)/usr/bin/*.tcl debian/libngsolve/usr/share/netgen
- chmod 644 debian/libngsolve/usr/share/netgen/*.tcl
- mkdir -p debian/libngsolve/usr/lib
- mv $(DEB_DESTDIR)/usr/lib/*-$(DEB_UPSTREAM_VERSION).so debian/libngsolve/usr/lib
-
-install/libngsolve-dev::
- mkdir -p debian/libngsolve-dev/usr/include/ngsolve
- mv $(DEB_DESTDIR)/usr/include/*.* debian/libngsolve-dev/usr/include/ngsolve
- mkdir -p debian/libngsolve-dev/usr/lib
- mv $(DEB_DESTDIR)/usr/lib/*.so debian/libngsolve-dev/usr/lib
+override_dh_auto_configure:
+ dh_auto_configure -- $(extra_flags) --enable-shared
-install/libngsolve-examples::
- mkdir -p debian/libngsolve-examples/usr/share/doc/ngsolve/pde_tutorial
- install -m644 pde_tutorial/*.pde debian/libngsolve-examples/usr/share/doc/ngsolve/pde_tutorial
- install -m644 pde_tutorial/*.vol debian/libngsolve-examples/usr/share/doc/ngsolve/pde_tutorial
- install -m644 pde_tutorial/*.geo debian/libngsolve-examples/usr/share/doc/ngsolve/pde_tutorial
- install -m644 pde_tutorial/*.in2d debian/libngsolve-examples/usr/share/doc/ngsolve/pde_tutorial
- mkdir -p debian/libngsolve-examples/usr/share/doc/ngsolve/programming_demos
- install -m644 programming_demos/*.cpp debian/libngsolve-examples/usr/share/doc/ngsolve/programming_demos
- install -m644 programming_demos/Makefile debian/libngsolve-examples/usr/share/doc/ngsolve/programming_demos
+override_dh_auto_install:
+ dh_auto_install
+
+ #rm -f debian/tmp/usr/share/doc/netgen-doc/examples/Makefile*
+
+override_dh_fixperms:
+ dh_fixperms
+ chmod ugo-x debian/ngsolve/usr/share/netgen/*.tcl
get-orig-source:
uscan --force-download --verbose --destdir $(USCAN_DESTDIR)
More information about the debian-science-commits
mailing list