diff --git a/debian/control b/debian/control index e45fd9bf0..3e89360aa 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: build-essential, debhelper (>= 9), libboost-filesystem-dev, libdune-common-dev, libdune-istl-dev, cmake, libtinyxml-dev, bc, libert.ecl-dev, git, zlib1g-dev, libtool, doxygen, texlive-latex-extra, texlive-latex-recommended, ghostscript, - libopm-core-dev, libopm-material-dev, + libopm-core-dev, libopm-material-dev, libeigen3-dev, libopm-parser-dev, libboost-iostreams-dev, libopm-common-dev, libopm-grid-dev, libdune-grid-dev, libug-dev, libopm-output-dev, libtrilinos-zoltan-dev, libopenmpi-dev, mpi-default-bin, libewoms-dev diff --git a/debian/mk_orig_source b/debian/mk_orig_source deleted file mode 100755 index 809b8d1e9..000000000 --- a/debian/mk_orig_source +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -ORIGDIR=`pwd` -TOPDIR=`dirname $0` -tmp=`mktemp -d` -pushd . -cd $TOPDIR/.. -git archive --prefix opm-simulators-$1/ -o $tmp/opm-simulators.tar.gz $2 -cd $tmp -wget https://github.com/OPM/eigen3/archive/master.tar.gz -O eigen3-master.tar.gz -tar zxvf opm-simulators.tar.gz -cd opm-simulators-$1 -tar zxvf ../eigen3-master.tar.gz -cd .. -tar zcvf $ORIGDIR/opm-simulators-$1.tar.gz opm-simulators-$1/ -popd -rm $tmp -Rf diff --git a/debian/rules b/debian/rules index b0d296980..20fd372c2 100755 --- a/debian/rules +++ b/debian/rules @@ -21,10 +21,7 @@ override_dh_auto_build: # consider using -DUSE_VERSIONED_DIR=ON if backporting override_dh_auto_configure: - mkdir build-eigen - cd build-eigen && cmake $(CURDIR)/eigen3-master -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/tmp/install-eigen3 - cd build-eigen && make install - dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=Release -DUSE_MPI=1 -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-simulators1 -DWHOLE_PROG_OPTIM=OFF -DUSE_RUNPATH=OFF -DCMAKE_PREFIX_PATH=/tmp/install-eigen3 + dh_auto_configure --buildsystem=cmake -- -DCMAKE_BUILD_TYPE=Release -DUSE_MPI=1 -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_DOCDIR=share/doc/libopm-simulators1 -DWHOLE_PROG_OPTIM=OFF -DUSE_RUNPATH=OFF override_dh_auto_install: dh_auto_install -- install-html