Import dune-common_2.3.1-1.debian.tar.xz
authorAnsgar Burchardt <ansgar@debian.org>
Tue, 17 Jun 2014 17:46:31 +0000 (18:46 +0100)
committerAnsgar Burchardt <ansgar@debian.org>
Tue, 17 Jun 2014 17:46:31 +0000 (18:46 +0100)
[dgit import tarball dune-common 2.3.1-1 dune-common_2.3.1-1.debian.tar.xz]

19 files changed:
changelog [new file with mode: 0644]
clean [new file with mode: 0644]
compat [new file with mode: 0644]
control [new file with mode: 0644]
copyright [new file with mode: 0644]
dune-debian.mk [new file with mode: 0644]
get-orig-source [new file with mode: 0755]
libdune-common-2.3.1.install [new file with mode: 0644]
libdune-common-2.3.1.lintian-overrides [new file with mode: 0644]
libdune-common-dev.install [new file with mode: 0644]
libdune-common-dev.manpages [new file with mode: 0644]
libdune-common-doc.install [new file with mode: 0644]
patches/dune-autogen.patch [new file with mode: 0644]
patches/rename-git-whitespace-hook.patch [new file with mode: 0644]
patches/series [new file with mode: 0644]
patches/skip-dirs-starting-with-dot.patch [new file with mode: 0644]
patches/soname.patch [new file with mode: 0644]
rules [new file with mode: 0755]
source/format [new file with mode: 0644]

diff --git a/changelog b/changelog
new file mode 100644 (file)
index 0000000..5babd1e
--- /dev/null
+++ b/changelog
@@ -0,0 +1,121 @@
+dune-common (2.3.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Install bash completion for dunecontrol.
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Tue, 17 Jun 2014 19:46:31 +0200
+
+dune-common (2.3.1~rc1-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Change shared library package name to libdune-common-2.3.1.
+  * dune-debian.mk: Enable support for UG.
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Tue, 10 Jun 2014 19:54:09 +0200
+
+dune-common (2.3.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Change shared library package name to libdune-common-2.3.0.
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Fri, 14 Feb 2014 09:12:40 +0100
+
+dune-common (2.3~20140122g7a7cf2b-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Wed, 22 Jan 2014 23:10:56 +0100
+
+dune-common (2.3~20140117beta2-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+  * Remove patches that should be obsoleted by upstream changes.
+  * dune-debian.mk: Remove obsolete --enable-fieldvector-size-is-method flag.
+  * libdune-common-dev.install: Install /usr/lib/*/cmake.
+  * Backport 073167e61070a5e952c738c02d85c3f946717e40 ([dune-autogen]
+    Prevents overriding am_dir with installed modules) from master branch.
+    + New patch: 0001-dune-autogen-Prevents-overriding-am_dir-with-install.patch
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Mon, 20 Jan 2014 13:42:47 +0100
+
+dune-common (2.3~20140111beta1-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+  * Rename git-whitespace-hook to dune-git-whitespace-hook.
+  * Install cmake modules. Note that it is still not possible to use
+    cmake with the Debian packages.
+  * debian/control: Remove ${shlibs:Depends} from -dev and -dbg package.
+  * debian/dune-debian.mk: Use default compression for binary packages.
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Wed, 15 Jan 2014 13:33:04 +0100
+
+dune-common (2.3~20140103g107b57a-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+  * Install man page using dh_installman as "make install" is not called
+    for the doc subdirectory and thus dh_install cannot find usr/share/man.
+  * debian/dune-debian.mk: Restore --without-parmetis.
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Fri, 03 Jan 2014 00:40:13 +0100
+
+dune-common (2.3~20131227g6c02812-1) experimental; urgency=medium
+
+  * New upstream snapshot.
+  * Add Build-Depends on texlive-latex-extra (for subfigure.sty).
+  * Change shared library package name to libdune-common-2.3svn.
+  * Patch dunecontrol to skip directories starting with a dot when
+    looking for dune.module.
+    + new patch: skip-dirs-starting-with-dot.patch
+  * Install dune_cxa_demangle.m4.
+    + new patch: 0001-Install-dune_cxa_demangle.m4.patch
+  * debian/dune-debian.mk: Do not pass --without-parmetis to configure
+    as doing so triggers a bug causing the configure script to abort, cf.
+    <https://dune-project.org/flyspray/index.php?do=details&task_id=1404>
+  * debian/control: Use canonical Vcs-* URIs.
+  * debian/control: Drop pre-depends on dpkg (>= 1.15.6) which is
+    already satisfied in Debian 6.
+  * debian/rules: Install am2cmake.py as dune-am2cmake.
+  * libdune-common-dev: Add dependency on python and python-pyparsing
+    for am2cmake.py.
+  * libdune-common-dev: Include man page for dunecontrol.
+  * Bumped Standards-Version to 3.9.5 (no changes).
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Wed, 01 Jan 2014 19:40:32 +0100
+
+dune-common (2.2.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Bumped Standards-Version to 3.9.4 (no changes).
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Sun, 12 May 2013 18:30:12 +0200
+
+dune-common (2.2.1-1) experimental; urgency=low
+
+  * New upstream release. (Closes: #701866)
+  * debian/copyright: Update for new upstream release.
+  * Mark runtime and debug packages as Multi-Arch: same.
+  * lib/dunemodules.lib: Fix PARSER_TRIM.
+    + new patch: fix-PARSER_TRIM.diff
+  * Update aclocal.patch.
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Sat, 02 Mar 2013 02:17:38 +0100
+
+dune-common (2.2.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Install dunemodules.lib to /usr/lib.
+  * Update debian/copyright.
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Tue, 05 Jun 2012 10:17:59 +0200
+
+dune-common (2.2~svn6684-1) experimental; urgency=low
+
+  * New upstream snapshot.
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Sun, 06 May 2012 14:31:49 +0200
+
+dune-common (2.2~svn6573-1) experimental; urgency=low
+
+  * Initial release. (Closes: #661823)
+
+ -- Ansgar Burchardt <ansgar@debian.org>  Sat, 17 Mar 2012 17:15:13 +0100
diff --git a/clean b/clean
new file mode 100644 (file)
index 0000000..ae4000c
--- /dev/null
+++ b/clean
@@ -0,0 +1 @@
+doc/buildsystem/buildsystem.pdf
diff --git a/compat b/compat
new file mode 100644 (file)
index 0000000..ec63514
--- /dev/null
+++ b/compat
@@ -0,0 +1 @@
+9
diff --git a/control b/control
new file mode 100644 (file)
index 0000000..4c07be7
--- /dev/null
+++ b/control
@@ -0,0 +1,67 @@
+Source: dune-common
+Section: libs
+Priority: optional
+Standards-Version: 3.9.5
+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
+Uploaders: Ansgar Burchardt <ansgar@debian.org>, Oliver Sander <sander@mi.fu-berlin.de>
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/dune-common.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/dune-common.git
+Homepage: http://www.dune-project.org/
+Build-Depends: debhelper (>= 9),
+ automake, autoconf, gfortran, libtool, mpi-default-bin, mpi-default-dev, pkg-config
+Build-Depends-Indep: doxygen, ghostscript, texlive-latex-extra, texlive-latex-recommended, pgf
+
+Package: libdune-common-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libdune-common-2.3.1 (= ${binary:Version}),
+ pkg-config, python, python-pyparsing
+Recommends: automake, autoconf, libtool
+Suggests: libdune-common-dbg (= ${binary:Version})
+Description: toolbox for solving PDEs -- basic classes (development files)
+ DUNE, the Distributed and Unified Numerics Environment is a modular toolbox
+ for solving partial differential equations (PDEs) with grid-based methods.
+ It supports the easy implementation of methods like Finite Elements (FE),
+ Finite Volumes (FV), and also Finite Differences (FD).
+ .
+ This package contains the development files for the basic classes.
+
+Package: libdune-common-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, libdune-common-2.3.1 (= ${binary:Version})
+Description: toolbox for solving PDEs -- basic classes (debug symbols)
+ DUNE, the Distributed and Unified Numerics Environment is a modular toolbox
+ for solving partial differential equations (PDEs) with grid-based methods.
+ It supports the easy implementation of methods like Finite Elements (FE),
+ Finite Volumes (FV), and also Finite Differences (FD).
+ .
+ This package contains the debug symbols for the basic classes.
+
+Package: libdune-common-2.3.1
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Description: toolbox for solving PDEs -- basic classes (library)
+ DUNE, the Distributed and Unified Numerics Environment is a modular toolbox
+ for solving partial differential equations (PDEs) with grid-based methods.
+ It supports the easy implementation of methods like Finite Elements (FE),
+ Finite Volumes (FV), and also Finite Differences (FD).
+ .
+ This package contains the library for the basic classes.
+
+Package: libdune-common-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: toolbox for solving PDEs -- basic classes (documentation)
+ DUNE, the Distributed and Unified Numerics Environment is a modular toolbox
+ for solving partial differential equations (PDEs) with grid-based methods.
+ It supports the easy implementation of methods like Finite Elements (FE),
+ Finite Volumes (FV), and also Finite Differences (FD).
+ .
+ This package contains the documentation for the basic classes.
diff --git a/copyright b/copyright
new file mode 100644 (file)
index 0000000..2d03b0b
--- /dev/null
+++ b/copyright
@@ -0,0 +1,163 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: dune-common
+Source: http://www.dune-project.org/downloadsvn.html
+
+Files: *
+Copyright:
+  2003-2010    Peter Bastian
+  2004-2013    Markus Blatt
+  2013         Andreas Buhr
+  2011-2013    Ansgar Burchardt
+  2004-2005    Adrian Burri
+  2006-2013    Andreas Dedner
+  2003         Marc Droske
+  2003-2013    Christian Engwer
+  2004-2012    Jorrit Fahlke
+  2008-2013    Bernd Flemisch
+  2013         Christoph Gersbacher
+  2005-2013    Carsten Gräser
+  2010-2013    Christoph Grüninger
+  2006         Bernhard Haasdonk
+  2012-2013    Olaf Ippisch
+  2013         Dominic Kempf
+  2009         Leonard Kern
+  2013         Torbjörn Klatt
+  2003-2013    Robert Klöfkorn
+  2005-2007    Sreejith Pulloor Kuttanikkad
+  2012-2013    Arne Morten Kvarving
+  2010-2013    Andreas Lauser
+  2007-2011    Sven Marnach
+  2012-2013    Tobias Malkmus
+  2010         Rene Milk
+  2011-2013    Steffen Müthing
+  2003-2006    Thimo Neubauer
+  2011         Rebecca Neumann
+  2008-2013    Martin Nolte
+  2004-2005    Mario Ohlberger
+  2008-2013    Elias Pipping
+  2011         Dan Popovic
+  2009         Atgeirr Rasmussen
+  2003-2013    Oliver Sander
+  2006-2011    Uli Sack
+  2006         Klaus Schneider
+  2004         Roland Schulz
+  2009-2012    Bård Skaflestad
+  2012         Matthias Wohlmuth
+  2011         Jonathan Youett
+License: GPL-2 with DUNE exception
+
+Files: cmake/modules/UseLATEX.cmake
+Copyright: 2004, Sandia Corporation
+License: other
+ Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
+ license for use of this work by or on behalf of the
+ U.S. Government. Redistribution and use in source and binary forms, with
+ or without modification, are permitted provided that this Notice and any
+ statement of authorship are reproduced on all copies.
+
+Files: dune/common/exprtmpl.hh
+Copyright: 2005, Christian Engwer
+License: LGPL-2.1
+Comment: Oversight from relicensing, see also
+ <http://www.dune-project.org/flyspray/index.php?do=details&task_id=1050>
+
+Files: m4/acx_blas.m4 m4/acx_lapack.m4 m4/acx_mpi.m4 m4/acx_pthread.m4
+Copyright: 2001-2005, Steven G. Johnson <stevenj@alum.mit.edu>
+License: GPL-2+ with Autoconf Macro exception
+Comment: see older autoconf-archive packages
+
+Files: m4/ax_boost_base.m4
+Copyright:
+  2008, Thomas Porschberg <thomas@randspringer.de>
+  2009, Peter Adolphs
+License: GNU-All-Permissive-License
+
+Files: m4/ax_check_gl.m4 m4/ax_lang_compiler_ms.m4
+Copyright: 2004, Braden McDaniel <braden@endoframe.com>
+License: GNU-All-Permissive-License
+Comment: see older autoconf-archive packages
+
+Files: m4/immdx_lib_metis.m4
+Copyright: 2003, Ben Bergen <ben@cs.fau.de>
+License: GNU-All-Permissive-License
+Comment: see older autoconf-archive packages
+
+Files: m4/shared_ptr.m4
+Copyright: 2009, Sun Microsystems
+License: SUN-All-Permissive-License
+
+Files: debian/*
+Copyright: 2011-2012, Ansgar Burchardt <ansgar@debian.org>
+License: GPL-2 with DUNE exception
+
+License: GPL-2 with DUNE exception
+ The DUNE library and headers are licensed under version 2 of the GNU General
+ Public License, with a special exception for linking and compiling against
+ DUNE, the so-called "runtime exception." The license is intended to be
+ similar to the GNU Lesser General Public License, which by itself isn't
+ suitable for a template library.
+ .
+ The exact wording of the exception reads as follows:
+ .
+ As a special exception, you may use the DUNE library without
+ restriction.  Specifically, if other files instantiate templates or
+ use macros or inline functions from one or more of the DUNE source
+ files, or you compile one or more of the DUNE source files and link
+ them with other files to produce an executable, this does not by
+ itself cause the resulting executable to be covered by the GNU
+ General Public License.  This exception does not however invalidate
+ any other reasons why the executable file might be covered by the
+ GNU General Public License.
+ .
+ This license clones the one of the libstdc++ library.
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file  `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2+ with Autoconf Macro exception
+ This program 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; either version 2 of the License, or (at your
+ option) any later version.
+ .
+ This program 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 program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ As a special exception, the respective Autoconf Macro's copyright owner
+ gives unlimited permission to copy, distribute and modify the configure
+ scripts that are the output of Autoconf when processing the Macro. You
+ need not follow the terms of the GNU General Public License when using
+ or distributing such scripts, even though portions of the text of the
+ Macro appear in them. The GNU General Public License (GPL) does govern
+ all other use of the material that constitutes the Autoconf Macro.
+ .
+ This special exception to the GPL applies to versions of the Autoconf
+ Macro released by the Autoconf Archive. When you make and distribute a
+ modified version of the Autoconf Macro, you may extend this special
+ exception to the GPL to apply to your modified version as well.
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file  `/usr/share/common-licenses/GPL-2'.
+
+License: LGPL-2.1
+ This file is part of DUNE, a Distributed and Unified Numerics Environment.
+ It is distributed under the terms of the GNU Lesser General Public License
+ version 2.1.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public License
+ version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
+License: GNU-All-Permissive-License
+ Copying and distribution of this file, with or without modification, are
+ permitted in any medium without royalty provided the copyright notice
+ and this notice are preserved.
+
+License: SUN-All-Permissive-License
+ This file is free software; Sun Microsystems gives unlimited permission to
+ copy and/or distribute it, with or without modifications, as long as this
+ notice is preserved.
diff --git a/dune-debian.mk b/dune-debian.mk
new file mode 100644 (file)
index 0000000..d7fb6f4
--- /dev/null
@@ -0,0 +1,32 @@
+
+DUNE_DEBIAN_DUNECONTROL ?= /usr/bin/dunecontrol
+DUNE_DEBIAN_CONFIGURE_FLAGS ?= \
+       --enable-parallel \
+       --enable-shared \
+       --with-alberta=/usr \
+       --with-gmp \
+       --without-grape \
+       --without-metis \
+       --without-parmetis \
+       --with-superlu \
+       --with-ug=/usr \
+       --without-x
+
+override_dh_auto_configure:
+       $(DUNE_DEBIAN_DUNECONTROL) autogen
+       dh_auto_configure -- $(DUNE_DEBIAN_CONFIGURE_FLAGS)
+
+override_dh_auto_test:
+       # OpenMPI expects rsh/ssh to be in PATH even when it only starts local processes:
+       mkdir debian/tmp-test
+       ln -s /bin/false debian/tmp-test/ssh
+       ln -s /bin/false debian/tmp-test/rsh
+       PATH=$(CURDIR)/debian/tmp-test:$$PATH dh_auto_test
+       rm -rf debian/tmp-test
+
+override_dh_clean:
+       dh_clean
+       find . -name Makefile.in -delete
+       rm -f aclocal.m4 compile config.guess config.h.in config.sub configure dependencies.m4 depcomp install-sh ltmain.sh missing test-driver
+       rm -rf doc/doxygen/Doxyfile.in doc/doxygen/doxyerr.log doc/doxygen/doxygen-tag doc/doxygen/doxygen.log doc/doxygen/html
+       rm -rf debian/tmp-test
diff --git a/get-orig-source b/get-orig-source
new file mode 100755 (executable)
index 0000000..161201c
--- /dev/null
@@ -0,0 +1,134 @@
+#! /bin/bash
+#
+# get-orig-source for dune
+#
+# (C) 2012, Ansgar Burchardt <ansgar@debian.org>
+# License: GPL-2 with DUNE exception
+
+set -e
+set -u
+set -o pipefail
+
+usage() {
+  echo "usage: get-orig-source [options...] <module> <version> [<tree>] [<rev>]
+  module:  name of dune module (eg. dune-common)
+  version: upstream version number
+  tree:    branch (default: master)
+  rev:     revision number
+
+  options:
+  --snapshot: date and Git revision is appended to the version number
+  --dch:      run dch to update version number
+  -d <dir>:   create orig tarball in directory <dir>
+
+  environment:
+  DUNE_SOURCE path to DUNE repositories"
+  exit 1
+}
+
+safe-rm() {
+  local -a args
+  args=(--verbose)
+  while [[ $# -gt 0 ]]; do
+    case "${1}" in
+      -*) args+=("${1}"); shift ;;
+      *)  break ;;
+    esac
+  done
+
+  local path
+  local n d r
+  for path in "$@"; do
+    r="${path}"
+    d="."
+    while [[ ${r} =~ .*/.* ]]; do
+      n="${r%%/*}"
+      r="${r#*/}"
+      if [[ $n == "" ]]; then
+        d=""
+        continue
+      fi
+      d="${d}/${n}"
+      if [[ -L "${d}" ]]; then
+        echo "safe-rm: ${d} is a symbolic link (while removing ${path})" >&2
+        exit 1
+      fi
+    done
+  done
+
+  rm "${args[@]}" "${@}"
+}
+
+if [[ $# -lt 2 ]]; then
+  usage
+fi
+
+if [[ -z "${DUNE_SOURCE:-}" ]]; then
+  echo "DUNE_SOURCE is not set" >&2
+  echo "----------------------" >&2
+  echo "Please set DUNE_SOURCE to a directory containing" >&2
+  echo "checkouts of the DUNE modules to avoid cloning them." >&2
+  exit 1
+fi
+
+snapshot=
+dch=
+dir=.
+
+while :; do
+  case "$1" in
+    --snapshot) snapshot=1; shift ;;
+    --dch)      dch=1; shift ;;
+    -d)         dir="$2"; shift 2 ;;
+    *)          break ;;
+  esac
+done
+
+module="$1"
+version="$2"
+branch="${3:-master}"
+if [[ -d "${DUNE_SOURCE}/${module}.git" ]]; then
+  GIT_DIR="${DUNE_SOURCE}/${module}.git"
+elif [[ -d "${DUNE_SOURCE}/${module}/.git" ]]; then
+  GIT_DIR="${DUNE_SOURCE}/${module}/.git"
+else
+  echo "Could not find Git repository for ${module} in ${DUNE_SOURCE}" >&2
+  exit 1
+fi
+
+export GIT_DIR
+
+if [[ $snapshot ]]; then
+  rev="$(git rev-parse --short ${branch})"
+  date="$(date +%Y%m%d)"
+  version="${version}${date}g${rev}"
+fi
+
+origdir="$module-$version.orig"
+tarball="$dir/${module}_$version.orig.tar.xz"
+
+if [[ -e "$origdir" || -e "$tarball" ]]; then
+  echo "source directory or tarball already exists" >&2
+  exit 1
+fi
+
+mkdir "${origdir}"
+git archive --format=tar ${branch} | tar -C "${origdir}" -x
+cd "$origdir"
+case "$module" in
+  dune-grid)
+    find doc/grids/amiramesh -name "[a-z]*.am" -delete
+    ;;
+  ug)
+    safe-rm -r doc
+    safe-rm -r dom/lgm/ngin/ngin.ps
+    ;;
+esac
+cd ..
+
+tar --owner=root --group=root -c "$origdir" | xz -9 > "$tarball"
+rm -rf "$origdir"
+
+if [[ $dch ]]; then
+  dch --newversion "$version-1" "New upstream release ($version)."
+fi
diff --git a/libdune-common-2.3.1.install b/libdune-common-2.3.1.install
new file mode 100644 (file)
index 0000000..81d0bc9
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/*/libdunecommon-*.so
diff --git a/libdune-common-2.3.1.lintian-overrides b/libdune-common-2.3.1.lintian-overrides
new file mode 100644 (file)
index 0000000..e8ee81f
--- /dev/null
@@ -0,0 +1,3 @@
+# I prefer libdune-common as the module is named dune-common upstream.
+#  -- ansgar 2012-03-01
+libdune-common-2.3.1: package-name-doesnt-match-sonames libdunecommon-2.3.1
diff --git a/libdune-common-dev.install b/libdune-common-dev.install
new file mode 100644 (file)
index 0000000..49dd98d
--- /dev/null
@@ -0,0 +1,13 @@
+usr/bin
+usr/include
+usr/lib/*/cmake
+usr/lib/*/dunecontrol usr/lib
+usr/lib/*/dunemodules.lib usr/lib
+usr/lib/*/libdunecommon.a
+usr/lib/*/libdunecommon.so
+usr/lib/*/pkgconfig
+usr/share/bash-completion
+usr/share/dune-common
+usr/share/dune
+
+debian/dune-debian.mk usr/share/dune
diff --git a/libdune-common-dev.manpages b/libdune-common-dev.manpages
new file mode 100644 (file)
index 0000000..76291e8
--- /dev/null
@@ -0,0 +1 @@
+doc/dunecontrol.1
diff --git a/libdune-common-doc.install b/libdune-common-doc.install
new file mode 100644 (file)
index 0000000..6dbcbb2
--- /dev/null
@@ -0,0 +1 @@
+usr/share/doc/dune-common/* usr/share/doc/libdune-common-doc
diff --git a/patches/dune-autogen.patch b/patches/dune-autogen.patch
new file mode 100644 (file)
index 0000000..a39bcca
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/bin/dune-autogen
++++ b/bin/dune-autogen
+@@ -27,7 +27,7 @@
+ rm -f $name.m4
+ # add current dir to PATH
+-PATH=`dirname "$0"`:$PATH
++#PATH=`dirname "$0"`:$PATH
+ # guess libtool prefix
+ if test -n "$LIBTOOLIZE"; then
diff --git a/patches/rename-git-whitespace-hook.patch b/patches/rename-git-whitespace-hook.patch
new file mode 100644 (file)
index 0000000..2bd94a6
--- /dev/null
@@ -0,0 +1,40 @@
+From: Ansgar Burchardt <ansgar@debian.org>
+Subject: Rename git-whitespace-hook to dune-git-whitespace-hook.
+
+The name git-whitespace-hook is a bit too generic for a DUNE-specific
+tool.
+
+--- a/bin/dunecontrol
++++ b/bin/dunecontrol
+@@ -471,17 +471,28 @@
+         fi
+       else
+         # standard handling of Git whitespace hook
++        for f in dune-git-whitespace-hook git-whitespace-hook; do
++          f="${PREFIX_DIR}/bin/${f}"
++          if [ -e "${f}" ]; then
++            git_whitespace_hook="${f}"
++            break
++          fi
++        done
++        if [ -z "${git_whitespace_hook:-}" ]; then
++          echo "Did not find git-whitespace-hook." >&2
++          exit 1
++        fi
+         if [ ! -e "$GITHOOKPATH" ]; then
+           # there is no hook yet, we can safely install ours
+           echo "--> Installing Git pre-commit hook to enforce whitespace policy"
+-          cp -p "$PREFIX_DIR/bin/git-whitespace-hook" "$GITHOOKPATH"
++          cp -p "${git_whitespace_hook}" "$GITHOOKPATH"
+         else
+           # there is already a hook, check whether it is our whitespace hook
+           local HOOKTAG="$(eval head -n 2 \"$GITHOOKPATH\" | tail -n 1)"
+           if [ "x$HOOKTAG" = "x# dune-git-whitespace-hook" ]; then
+-            if [ "$PREFIX_DIR/bin/git-whitespace-hook" -nt "$GITHOOKPATH" ]; then
++            if [ "${git_whitespace_hook}" -nt "$GITHOOKPATH" ]; then
+               echo "--> Updating Git pre-commit hook with newer version"
+-              cp -p "$PREFIX_DIR/bin/git-whitespace-hook" "$GITHOOKPATH"
++              cp -p "${git_whitespace_hook}" "$GITHOOKPATH"
+             fi
+           else
+             echo "WARNING: Existing pre-commit hook found!"
diff --git a/patches/series b/patches/series
new file mode 100644 (file)
index 0000000..ed2211d
--- /dev/null
@@ -0,0 +1,4 @@
+soname.patch
+dune-autogen.patch
+skip-dirs-starting-with-dot.patch
+rename-git-whitespace-hook.patch
diff --git a/patches/skip-dirs-starting-with-dot.patch b/patches/skip-dirs-starting-with-dot.patch
new file mode 100644 (file)
index 0000000..ab89582
--- /dev/null
@@ -0,0 +1,13 @@
+From: Ansgar Burchardt <ansgar@debian.org>
+Subject: skip directories starting with a dot when looking for dune.module
+--- a/lib/dunemodules.lib
++++ b/lib/dunemodules.lib
+@@ -241,7 +241,7 @@
+         while read m; do
+           test -n "$m" && parse_control "$m"
+         done <<EOFM
+-        $(find -H "$dir" -name $CONTROL | $GREP -v 'dune-[-_a-zA-Z]/dune-[-a-zA-Z_]*-[0-9]\{1,\}.[0-9]\{1,\}/')
++        $(find -H "$dir" -name '.?*' -prune -o -name $CONTROL -print | $GREP -v 'dune-[-_a-zA-Z]/dune-[-a-zA-Z_]*-[0-9]\{1,\}.[0-9]\{1,\}/')
+ EOFM
+         else
+         parse_control "$dir"
diff --git a/patches/soname.patch b/patches/soname.patch
new file mode 100644 (file)
index 0000000..bd89823
--- /dev/null
@@ -0,0 +1,9 @@
+--- dune-common.orig/lib/Makefile.am
++++ dune-common/lib/Makefile.am
+@@ -14,5 +14,6 @@
+ nodist_EXTRA_libdunecommon_la_SOURCES = dummy.cc
+ sourcescheck_DUMMY = dummy.cc
+ libdunecommon_la_LIBADD = ../dune/common/libcommon.la
++libdunecommon_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
+ include $(top_srcdir)/am/global-rules
diff --git a/rules b/rules
new file mode 100755 (executable)
index 0000000..33021fd
--- /dev/null
+++ b/rules
@@ -0,0 +1,27 @@
+#! /usr/bin/make -f
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+DUNE_DEBIAN_DUNECONTROL := $(CURDIR)/bin/dunecontrol
+include debian/dune-debian.mk
+
+%:
+       dh $@ --parallel
+
+override_dh_auto_install-arch:
+       set -e; for d in am bin cmake dune lib m4 share; do \
+         $(MAKE) -C $$d install DESTDIR="$(CURDIR)/debian/tmp"; \
+       done
+       $(MAKE) install-data-am install-exec-am DESTDIR="$(CURDIR)/debian/tmp"
+       mkdir doc/doxygen/html
+       $(MAKE) -C doc/doxygen install-data-am DESTDIR="$(CURDIR)/debian/tmp"
+
+       mv debian/tmp/usr/bin/mpi-config debian/tmp/usr/bin/dune-mpi-config
+       mv debian/tmp/usr/bin/am2cmake.py debian/tmp/usr/bin/dune-am2cmake
+       mv debian/tmp/usr/bin/git-whitespace-hook debian/tmp/usr/bin/dune-git-whitespace-hook
+
+override_dh_auto_install-indep:
+       $(MAKE) -C doc install DESTDIR="$(CURDIR)/debian/tmp"
+
+override_dh_strip:
+       dh_strip --dbg-package=libdune-common-dbg
diff --git a/source/format b/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)