[SCM] Gerris Flow Solver branch, upstream, updated. e211f9f5b22b1b35b785821bf84c76fd3eccc0a5
Drew Parsons
dparsons at debian.org
Tue Apr 5 15:57:41 UTC 2011
The following commit has been merged in the upstream branch:
commit d9f767c0d2cb41ee9c6945c6cf8e9d1ba143c00c
Author: Drew Parsons <Drew.Parsons at anu.edu.au>
Date: Wed Apr 6 00:27:48 2011 +1000
remove upstream debian directory
debian directory and references in Makefile.am, configure.in
diff --git a/Makefile.am b/Makefile.am
index 9b6f1c8..755ee10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ KEY = 07AB22DC
# change this to the html changelog for this launchpad release
LOG = /var/www/gerris/version/gerris_changes
-SUBDIRS = modules src tools test doc desktop debian
+SUBDIRS = modules src tools test doc desktop
EXTRA_DIST = ChangeLog m4
diff --git a/configure.in b/configure.in
index d843b73..32e0aeb 100644
--- a/configure.in
+++ b/configure.in
@@ -522,7 +522,6 @@ doc/examples/gfs2doc
doc/examples/gfs-highlight
doc/examples/crossref.sh
desktop/Makefile
-debian/Makefile
])
diff --git a/debian/Makefile.am b/debian/Makefile.am
deleted file mode 100644
index 153216c..0000000
--- a/debian/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = changelog.sh compat control copyright docs gerris-snapshot.symbols rules
diff --git a/debian/Makefile.in b/debian/Makefile.in
deleted file mode 100644
index 6dfa6a9..0000000
--- a/debian/Makefile.in
+++ /dev/null
@@ -1,390 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = debian
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FC = @FC@
-FCFLAGS = @FCFLAGS@
-FFLAGS = @FFLAGS@
-FGREP = @FGREP@
-GFS2D_LIBS = @GFS2D_LIBS@
-GFS3D_LIBS = @GFS3D_LIBS@
-GFS_COMPILATION_FLAGS = @GFS_COMPILATION_FLAGS@
-GFS_MAJOR_VERSION = @GFS_MAJOR_VERSION@
-GFS_MICRO_VERSION = @GFS_MICRO_VERSION@
-GFS_MINOR_VERSION = @GFS_MINOR_VERSION@
-GFS_VERSION = @GFS_VERSION@
-GREP = @GREP@
-GSL_CFLAGS = @GSL_CFLAGS@
-GSL_CONFIG = @GSL_CONFIG@
-GSL_LIBS = @GSL_LIBS@
-GTS_CFLAGS = @GTS_CFLAGS@
-GTS_CONFIG = @GTS_CONFIG@
-GTS_DEPLIBS = @GTS_DEPLIBS@
-GTS_LIBS = @GTS_LIBS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_AGE = @LT_AGE@
-LT_CURRENT = @LT_CURRENT@
-LT_RELEASE = @LT_RELEASE@
-LT_REVISION = @LT_REVISION@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-MODULES = @MODULES@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NO_UNDEFINED = @NO_UNDEFINED@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-ODE_CFLAGS = @ODE_CFLAGS@
-ODE_LIBS = @ODE_LIBS@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-W3INIT = @W3INIT@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_FC = @ac_ct_FC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gts_cflags = @gts_cflags@
-gts_libs = @gts_libs@
-have_awk = @have_awk@
-have_gmodule = @have_gmodule@
-have_m4 = @have_m4@
-have_pkg_config = @have_pkg_config@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-ode = @ode@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-use_mpicc = @use_mpicc@
-EXTRA_DIST = changelog.sh compat control copyright docs gerris-snapshot.symbols rules
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu debian/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/debian/changelog.sh b/debian/changelog.sh
deleted file mode 100644
index bbeda3b..0000000
--- a/debian/changelog.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-version=20$(grep GFS_BUILD_VERSION src/version.h | awk 'BEGIN{FS=" |\"|-"}{print $4}')
-date=$(date +"%a, %e %b %Y %T %z")
-
-cat <<EOF > debian/changelog
-gerris-snapshot ($version) jaunty; urgency=low
-
-EOF
-
-if test -z $1; then
- cat <<EOF >> debian/changelog
- * gerris-snapshot release (based on Drew Parsons's official debian)
-
-EOF
-else
- if html2text < $1 | \
- grep -v "^[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\} " | \
- sed 's/^\([^ ]\{1,\}\)/ \1/g'>> debian/changelog; then :
- else
- exit 1
- fi
-fi
-
-cat <<EOF >> debian/changelog
- -- Stephane Popinet <popinet at users.sf.net> $date
-EOF
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
deleted file mode 100644
index d85f573..0000000
--- a/debian/control
+++ /dev/null
@@ -1,35 +0,0 @@
-Source: gerris-snapshot
-Section: science
-Priority: optional
-Maintainer: Stephane Popinet <popinet at users.sf.net>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libglib2.0-dev,
- libgts-snapshot-dev,
- libnetcdf-dev, libgsl0-dev, proj,
- libopenmpi-dev [i386 amd64], openmpi-bin [i386 amd64],
- python, g77 | gfortran, chrpath
-Homepage: http://gfs.sourceforge.net/
-
-Package: gerris-snapshot
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- openmpi-bin [i386 amd64],
- libgts-snapshot-dev,
- pkg-config, gcc, sed, gawk, m4
-Conflicts: gerris, libgfs-1.3-1, libgfs-dev
-Suggests: gfsview-snapshot, source-highlight, imagemagick, ffmpeg
-Description: Gerris Flow Solver (development snapshot)
- Gerris is a system for the solution of the partial differential
- equations describing fluid flow.
- .
- A brief summary of its main features:
- .
- * Quadtree-based (Octree in 3D) spatial discretisation with
- automatic and dynamic refinement.
- * Multigrid Poisson solver.
- * Second-order Godunov type advection scheme.
- * Solves the time-dependent incompressible Euler, Stokes ans Navier-Stokes
- equations.
- * Support for complex solid boundaries (automatic locally-refined
- mesh generation).
- .
- See http://gfs.sf.net for more information and documentation.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 82e0dd3..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright:
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this package; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 5502ed8..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-NEWS
-README
-TODO
diff --git a/debian/gerris-snapshot.symbols b/debian/gerris-snapshot.symbols
deleted file mode 100644
index 9a959a9..0000000
--- a/debian/gerris-snapshot.symbols
+++ /dev/null
@@ -1 +0,0 @@
-# dummy file just here to force dh_makeshlibs to call dpkg-gensymbols
diff --git a/debian/rules b/debian/rules
deleted file mode 100644
index 8cb8088..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-
-DEB_DH_MAKESHLIBS_ARGS_ALL = -- -c0
-
-# To look for shlibs and symbols file in locally compiled libgts-snapshot debian package
-# do something like:
-# % export DEB_DH_SHLIBDEPS_ARGS_ALL="-- -S$HOME/local/src/gts-mainline/debian/libgts-snapshot"
-
-clean::
- rm -f a.out
- rm -f doc/examples/gfs.lang
- rm -f doc/examples/gfs2tex.pyc
- rm -f doc/examples/Makefile.deps
- rm -f src/modules.c
- rm -f src/modules.h
-
-# Remove rpath added by libtool
-binary-post-install/gerris-snapshot ::
- - chrpath -d -k debian/gerris-snapshot/usr/bin/* 2> /dev/null
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list