[gerris] 01/06: Remove serial version of gerris.
Anton Gladky
gladk at moszumanska.debian.org
Sun May 22 19:08:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gerris.
commit 07e7d308d94c9572ccf123cc2b822f7c0e19ccc0
Author: Anton Gladky <gladk at debian.org>
Date: Sun May 22 19:27:45 2016 +0200
Remove serial version of gerris.
---
debian/control | 89 ++++---------------------------
debian/gerris-mpi.docs | 5 --
debian/gerris-mpi.install | 3 --
debian/gerris.install | 2 +-
debian/{gerris-mpi.links => gerris.links} | 2 +-
debian/libgfs-1.3-2.install | 2 +-
debian/libgfs-dev.install | 6 +--
debian/libgfs-mpi-1.3-2.install | 1 -
debian/libgfs-mpi-dev.install | 3 --
debian/rules | 20 +------
10 files changed, 17 insertions(+), 116 deletions(-)
diff --git a/debian/control b/debian/control
index 019ca63..87a338a 100644
--- a/debian/control
+++ b/debian/control
@@ -23,41 +23,11 @@ Homepage: http://gfs.sourceforge.net/
Package: gerris
Architecture: any
-Depends: libgfs-dev,
- libgts-dev,
- libav-tools,
- ${misc:Depends},
- ${shlibs:Depends}
-Recommends: gfsview
-Suggests: python
-Conflicts: gerris-mpi
-Replaces: gerris-mpi
-Description: Fluid Flow Solver
- Gerris is a system for the solution of the partial differential
- equations describing fluid flow.
- .
- A brief summary of its main (current) features:
- .
- * Solves the time-dependent incompressible variable-density Euler,
- Stokes or Navier-Stokes equations
- * Adaptive mesh refinement: the resolution is adapted dynamically to
- the features of the flow
- * Entirely automatic mesh generation in complex geometries
- * Second-order in space and time
- * Unlimited number of advected/diffused passive tracers
- * Flexible specification of additional source terms
- * Portable parallel support using the MPI library
- * Volume of Fluid advection scheme for interfacial flows
- .
- For multi-cpu MPI support, install gerris-mpi instead.
-
-Package: gerris-mpi
-Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
Suggests: python
-Conflicts: gerris
-Replaces: gerris
+Breaks: gerris-mpi (<<20131206+dfsg-7)
+Replaces: gerris-mpi (<<20131206+dfsg-7)
Description: Fluid Flow Solver
Gerris is a system for the solution of the partial differential
equations describing fluid flow.
@@ -82,67 +52,26 @@ Architecture: any
Section: devel
Depends: ${misc:Depends},
${shlibs:Depends}
-Conflicts: libgfs-1.3-1,
- libgfs-mpi-1.3-2
-Replaces: libgfs-1.3-1,
- libgfs-mpi-1.3-2
+Breaks: libgfs-mpi-1.3-2 (<<20131206+dfsg-7)
+Replaces: libgfs-mpi-1.3-2 (<<20131206+dfsg-7)
Description: Fluid Flow Solver -- shared libraries
Gerris is a system for the solution of the partial differential
equations describing fluid flow.
.
This package contains the shared libraries for libgfs.
-
-Package: libgfs-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: libgfs-1.3-2 (= ${binary:Version}) | libgfs-mpi-1.3-2 (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Description: Fluid Flow Solver -- libraries with debugging symbols
- Gerris is a system for the solution of the partial differential
- equations describing fluid flow.
.
- This package contains the debugging symbols for libgfs.
+ This package has MPI support built in.
Package: libgfs-dev
Architecture: any
Section: libdevel
Depends: libgfs-1.3-2 (= ${binary:Version}),
${misc:Depends},
+ libgts-dev,
+ libav-tools,
${shlibs:Depends}
-Conflicts: libgfs-mpi-dev
-Replaces: libgfs-mpi-dev
-Description: Fluid Flow Solver -- development libraries and headers
- Gerris is a system for the solution of the partial differential
- equations describing fluid flow.
- .
- This package contains the headers and development libraries needed to
- build applications using libgfs.
-
-Package: libgfs-mpi-1.3-2
-Architecture: any
-Section: devel
-Depends: ${misc:Depends},
- ${shlibs:Depends}
-Conflicts: libgfs-1.3-2
-Replaces: libgfs-1.3-2
-Description: Fluid Flow Solver -- shared libraries
- Gerris is a system for the solution of the partial differential
- equations describing fluid flow.
- .
- This package contains the shared libraries for libgfs.
- .
- This package has MPI support built in.
-
-Package: libgfs-mpi-dev
-Architecture: any
-Section: libdevel
-Depends: libgfs-mpi-1.3-2 (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Conflicts: libgfs-dev
-Replaces: libgfs-dev
+Breaks: libgfs-mpi-dev (<<20131206+dfsg-7)
+Replaces: libgfs-mpi-dev (<<20131206+dfsg-7)
Description: Fluid Flow Solver -- development libraries and headers
Gerris is a system for the solution of the partial differential
equations describing fluid flow.
diff --git a/debian/gerris-mpi.docs b/debian/gerris-mpi.docs
deleted file mode 100644
index 7a44eec..0000000
--- a/debian/gerris-mpi.docs
+++ /dev/null
@@ -1,5 +0,0 @@
-README
-NEWS
-AUTHORS
-TODO
-THANKS
diff --git a/debian/gerris-mpi.install b/debian/gerris-mpi.install
deleted file mode 100644
index f46af85..0000000
--- a/debian/gerris-mpi.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/lib/*/gerris/libstokes*
-usr/share
diff --git a/debian/gerris.install b/debian/gerris.install
index 6645160..f46af85 100644
--- a/debian/gerris.install
+++ b/debian/gerris.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/bin
+usr/bin
usr/lib/*/gerris/libstokes*
usr/share
diff --git a/debian/gerris-mpi.links b/debian/gerris.links
similarity index 52%
rename from debian/gerris-mpi.links
rename to debian/gerris.links
index 44f171f..7e83c92 100644
--- a/debian/gerris-mpi.links
+++ b/debian/gerris.links
@@ -1,2 +1,2 @@
usr/share/gerris/lib/gfs2tex.py usr/lib/gerris/gfs2tex.py
-usr/share/gerris/lib/m4.awk usr/lib/gerris/m4.awk
+usr/share/gerris/lib/m4.awk usr/lib/gerris/m4.awk
diff --git a/debian/libgfs-1.3-2.install b/debian/libgfs-1.3-2.install
index 578e57d..d3d16c1 100644
--- a/debian/libgfs-1.3-2.install
+++ b/debian/libgfs-1.3-2.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*/libgfs*.so.*
+usr/lib/*/libgfs*.so.*
diff --git a/debian/libgfs-dev.install b/debian/libgfs-dev.install
index 1689889..b673259 100644
--- a/debian/libgfs-dev.install
+++ b/debian/libgfs-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib/*/libgfs*.so
-debian/tmp/usr/lib/*/pkgconfig/gerris*.pc
+usr/include
+usr/lib/*/libgfs*.so
+usr/lib/*/pkgconfig/gerris*.pc
diff --git a/debian/libgfs-mpi-1.3-2.install b/debian/libgfs-mpi-1.3-2.install
deleted file mode 100644
index d3d16c1..0000000
--- a/debian/libgfs-mpi-1.3-2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libgfs*.so.*
diff --git a/debian/libgfs-mpi-dev.install b/debian/libgfs-mpi-dev.install
deleted file mode 100644
index b673259..0000000
--- a/debian/libgfs-mpi-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*/libgfs*.so
-usr/lib/*/pkgconfig/gerris*.pc
diff --git a/debian/rules b/debian/rules
index 9ee11ef..c09d8f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,20 +2,17 @@
export DEB_BUILD_OPTIONS=nocheck
BUILDDIR=debian/build
-BUILDDIR_MPI=debian/build-mpi
%:
dh $@ --parallel --with autoreconf
override_dh_auto_configure:
- dh_auto_configure --builddirectory=$(BUILDDIR) -- --disable-mpi
- dh_auto_configure --builddirectory=$(BUILDDIR_MPI) -- --enable-mpi
+ dh_auto_configure --builddirectory=$(BUILDDIR) -- --enable-mpi
# some autogenerated files get left behind by upstream autotools clean
# so remove them here
override_dh_auto_clean:
dh_auto_clean --builddirectory=$(BUILDDIR)
- dh_auto_clean --builddirectory=$(BUILDDIR_MPI)
- for bdir in $(BUILDDIR) $(BUILDDIR_MPI); do \
+ for bdir in $(BUILDDIR); do \
rm $$bdir/doc/examples/gerris.dic || true; \
rm $$bdir/doc/examples/gfs.lang || true; \
rm $$bdir/src/modules.c || true; \
@@ -25,11 +22,9 @@ override_dh_auto_clean:
override_dh_auto_build:
dh_auto_build --builddirectory=$(BUILDDIR)
- dh_auto_build --builddirectory=$(BUILDDIR_MPI)
override_dh_auto_install:
dh_auto_install --builddirectory=$(BUILDDIR) --dest=debian/tmp
- dh_auto_install --builddirectory=$(BUILDDIR_MPI) --dest=debian/tmp-mpi
find $(CURDIR)/debian/ -name "*.la" | xargs rm -f
sed -i -e "s/mpicc/gcc/g" $(CURDIR)/debian/tmp/usr/share/gerris/build_function
@@ -39,25 +34,14 @@ override_dh_install:
dh_install -pgerris --exclude=darcs2dist
dh_install -plibgfs-1.3-2
dh_install -plibgfs-dev
-# dh_install can't figure out the mpi install dirs on its own, so use --sourcedir
- dh_install -pgerris-mpi --sourcedir=debian/tmp-mpi --exclude=darcs2dist
- dh_install -plibgfs-mpi-1.3-2 --sourcedir=debian/tmp-mpi
- dh_install -plibgfs-mpi-dev --sourcedir=debian/tmp-mpi
override_dh_installchangelogs:
dh_installchangelogs ChangeLog
-override_dh_strip:
- dh_strip --dbg-package=libgfs-dbg
-
# gerris will pick up a dependency on libgfs-mpi-1.3-2
# unless we specific -Llibgfs-1.3-2 here
override_dh_shlibdeps:
dh_shlibdeps -pgerris -Llibgfs-1.3-2
dh_shlibdeps -plibgfs-1.3-2
dh_shlibdeps -plibgfs-dev
- dh_shlibdeps -pgerris-mpi -Llibgfs-mpi-1.3-2
- dh_shlibdeps -plibgfs-mpi-1.3-2
- dh_shlibdeps -plibgfs-mpi-dev
- dh_shlibdeps -plibgfs-dbg
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gerris.git
More information about the debian-science-commits
mailing list