From 44d2eee6c4812a7145e19fec5ba221240d0b9774 Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Sun, 18 Dec 2016 11:58:14 +0000 Subject: [PATCH] Import dune-common_2.5.0-1.debian.tar.xz [dgit import tarball dune-common 2.5.0-1 dune-common_2.5.0-1.debian.tar.xz] --- changelog | 232 ++++++++++++++++++++++ compat | 1 + control | 59 ++++++ copyright | 146 ++++++++++++++ dune-debian.mk | 23 +++ get-orig-source | 135 +++++++++++++ libdune-common-dev.install | 8 + libdune-common-dev.lintian-overrides | 6 + libdune-common-dev.manpages | 1 + libdune-common-doc.install | 2 + patches/rename-git-whitespace-hook.patch | 40 ++++ patches/series | 3 + patches/skip-dirs-starting-with-dot.patch | 13 ++ patches/soname.patch | 33 +++ rules | 25 +++ source/format | 1 + 16 files changed, 728 insertions(+) create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 dune-debian.mk create mode 100755 get-orig-source create mode 100644 libdune-common-dev.install create mode 100644 libdune-common-dev.lintian-overrides create mode 100644 libdune-common-dev.manpages create mode 100644 libdune-common-doc.install create mode 100644 patches/rename-git-whitespace-hook.patch create mode 100644 patches/series create mode 100644 patches/skip-dirs-starting-with-dot.patch create mode 100644 patches/soname.patch create mode 100755 rules create mode 100644 source/format diff --git a/changelog b/changelog new file mode 100644 index 0000000..39f4458 --- /dev/null +++ b/changelog @@ -0,0 +1,232 @@ +dune-common (2.5.0-1) unstable; urgency=medium + + * New upstream release. + + -- Ansgar Burchardt Sun, 18 Dec 2016 12:58:14 +0100 + +dune-common (2.5.0~rc2-2) unstable; urgency=medium + + * Add Breaks+Replaces: libdune-functions-dev (<< 2.5.0~) + (Closes: #847142) + + -- Ansgar Burchardt Mon, 05 Dec 2016 23:41:24 +0100 + +dune-common (2.5.0~rc2-1) unstable; urgency=medium + + * Upload to unstable. + * New upstream release candidate. + * dune-debian.mk: Restore variable for configure options. + + -- Ansgar Burchardt Mon, 05 Dec 2016 23:09:55 +0100 + +dune-common (2.5.0~rc1-3) experimental; urgency=medium + + * Call dh_sphinxdoc only when building arch-indep packages. + + -- Ansgar Burchardt Tue, 22 Nov 2016 21:12:02 +0100 + +dune-common (2.5.0~rc1-2) experimental; urgency=medium + + * Patch: Add correct offset for end of chunk + This should fix the build failure on 32bit architectures. + + 0001-Add-correct-offset-for-end-of-chunk.patch + * Use dh_sphinxdoc. + + -- Ansgar Burchardt Tue, 22 Nov 2016 20:21:37 +0100 + +dune-common (2.5.0~rc1-1) experimental; urgency=medium + + * New upstream release candidate. + * Switch to CMake. + * dune-debian.mk: Simplify running tests. + * Bumped Standards-Version to 3.9.8 (no changes). + + -- Ansgar Burchardt Mon, 21 Nov 2016 20:37:38 +0100 + +dune-common (2.4.1-1) unstable; urgency=medium + + * New upstream release. + * Mark libdune-common-dev as Multi-Arch: same. + + -- Ansgar Burchardt Mon, 29 Feb 2016 10:19:18 +0100 + +dune-common (2.4.1~rc2-1) experimental; urgency=medium + + * New upstream release candidate. + + -- Ansgar Burchardt Sun, 28 Feb 2016 13:18:16 +0100 + +dune-common (2.4.0-1) unstable; urgency=medium + + * New upstream release. + + -- Ansgar Burchardt Fri, 25 Sep 2015 22:29:28 +0200 + +dune-common (2.4~20150912rc3-1) unstable; urgency=medium + + * New upstream release candidate. + * dune-debian.mk: Add options to enable UMFPack support. + + -- Ansgar Burchardt Sun, 13 Sep 2015 13:38:49 +0200 + +dune-common (2.4~20150825rc2-1) experimental; urgency=medium + + * New upstream release candidate. + * Move shared library into -dev package and provide a virtual package + that changes with the upstream version for shlib dependencies. See + also https://lists.debian.org/debian-devel/2015/07/msg00115.html + * libdune-common-dev: Add -doc package as a suggested package. + + -- Ansgar Burchardt Fri, 04 Sep 2015 14:24:36 +0200 + +dune-common (2.4~20150717rc1-1) experimental; urgency=medium + + * New upstream release candidate. + + -- Ansgar Burchardt Fri, 17 Jul 2015 20:45:00 +0200 + +dune-common (2.4~20150617g6f17141-1) experimental; urgency=medium + + * New upstream snapshot. + * get-orig-source: Use commit date instead of current date. + + -- Ansgar Burchardt Fri, 19 Jun 2015 23:11:40 +0200 + +dune-common (2.4~20150521g15491c4-1) experimental; urgency=medium + + * New upstream snapshot. + + -- Ansgar Burchardt Thu, 21 May 2015 21:46:50 +0200 + +dune-common (2.4~20150505g1ce8697-1) experimental; urgency=medium + + * New upstream snapshot. + * Change shared library package name to libdune-common-2.4git. + * Update debian/copyright for new upstream snapshot. + * Add Build-Depends-Indep: graphviz for "dot". + * dune-debian.mk: Continue to use autotools for now. + * Bumped Standards-Version to 3.9.6 (no changes). + + -- Ansgar Burchardt Tue, 05 May 2015 21:53:57 +0200 + +dune-common (2.3.1-1) unstable; urgency=medium + + * New upstream release. + * Install bash completion for dunecontrol. + + -- Ansgar Burchardt 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 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 Fri, 14 Feb 2014 09:12:40 +0100 + +dune-common (2.3~20140122g7a7cf2b-1) experimental; urgency=medium + + * New upstream snapshot. + + -- Ansgar Burchardt 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 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 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 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. + + * 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 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 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 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 Tue, 05 Jun 2012 10:17:59 +0200 + +dune-common (2.2~svn6684-1) experimental; urgency=low + + * New upstream snapshot. + + -- Ansgar Burchardt Sun, 06 May 2012 14:31:49 +0200 + +dune-common (2.2~svn6573-1) experimental; urgency=low + + * Initial release. (Closes: #661823) + + -- Ansgar Burchardt Sat, 17 Mar 2012 17:15:13 +0100 diff --git a/compat b/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +9 diff --git a/control b/control new file mode 100644 index 0000000..628f6da --- /dev/null +++ b/control @@ -0,0 +1,59 @@ +Source: dune-common +Section: libs +Priority: optional +Standards-Version: 3.9.8 +Maintainer: Debian Science Maintainers +Uploaders: Ansgar Burchardt , Oliver Sander +Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/dune-common.git +Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/dune-common.git +Homepage: http://www.dune-project.org/ +Build-Depends: debhelper (>= 9), + cmake, gfortran, mpi-default-bin, mpi-default-dev, pkg-config, python3 +Build-Depends-Indep: doxygen, ghostscript, graphviz, imagemagick, texlive-latex-extra, texlive-latex-recommended, pgf, python3-sphinx + +Package: libdune-common-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: ${misc:Depends}, ${shlibs:Depends}, + pkg-config, python, python-pyparsing +Breaks: libdune-functions-dev (<< 2.5.0~) +Replaces: libdune-functions-dev (<< 2.5.0~) +Recommends: cmake, python3 +Suggests: libdune-common-dbg (= ${binary:Version}), + libdune-common-doc (= ${source:Version}) +Provides: ${dune:shared-library} +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-dev (= ${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-doc +Section: doc +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends}, ${sphinxdoc: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 index 0000000..90fb7a1 --- /dev/null +++ b/copyright @@ -0,0 +1,146 @@ +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: + 2015--2016 Marco Agnese + 2015 Martin Alkämper + 2003--2010 Peter Bastian + 2004--2016 Markus Blatt + 2013 Andreas Buhr + 2011--2016 Ansgar Burchardt + 2004--2005 Adrian Burri + 2014 Benjamin Bykowski + 2014 Marco Cecchetti + 2006--2016 Andreas Dedner + 2003 Marc Droske + 2003--2016 Christian Engwer + 2004--2016 Jorrit Fahlke + 2016 Thomas Fetzer + 2008--2013 Bernd Flemisch + 2013--2014 Christoph Gersbacher + 2015 Stefan Girke + 2005--2016 Carsten Gräser + 2015--2016 Felix Gruber + 2010--2016 Christoph Grüninger + 2006 Bernhard Haasdonk + 2015 Claus-Justus Heine + 2015--2016 René Heß + 2012--2013 Olaf Ippisch + 2013--2016 Dominic Kempf + 2009 Leonard Kern + 2013 Torbjörn Klatt + 2003--2015 Robert Klöfkorn + 2005--2007 Sreejith Pulloor Kuttanikkad + 2012--2016 Arne Morten Kvarving + 2010--2014 Andreas Lauser + 2016 Tobias Leibner + 2015 Lars Lubkoll + 2012--2016 Tobias Malkmus + 2007--2011 Sven Marnach + 2010--2016 Rene Milk + 2011--2016 Steffen Müthing + 2003--2006 Thimo Neubauer + 2011 Rebecca Neumann + 2008--2016 Martin Nolte + 2014 Andreas Nüßing + 2004--2005 Mario Ohlberger + 2014 Steffen Persvold + 2008--2016 Elias Pipping + 2011 Dan Popovic + 2009 Atgeirr Rasmussen + 2006--2014 Uli Sack + 2003--2016 Oliver Sander + 2006 Klaus Schneider + 2004 Roland Schulz + 2015 Nicolas Schwenck + 2016 Linus Seelinger + 2009--2014 Bård Skaflestad + 2012 Matthias Wohlmuth + 2011--2016 Jonathan Youett +License: GPL-2 with DUNE exception + +Files: cmake/modules/CheckForPthreads.c cmake/modules/FindThreadsCMake31.cmake +Copyright: + 2002-2015 Kitware, Inc. + 2011-2014 Rolf Eike Beer +License: BSD-3-clause + CMake - Cross Platform Makefile Generator + Copyright 2000-2015 Kitware, Inc. + Copyright 2000-2011 Insight Software Consortium + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + * Neither the names of Kitware, Inc., the Insight Software Consortium, + nor the names of their contributors may be used to endorse or promote + products derived from this software without specific prior written + permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: cmake/modules/UseLATEX.cmake +Copyright: 2004-2015, 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: doc/dunecontrol.1 +Copyright: 2013-2015, Oliver Sander +License: GNU-All-Permissive-License + +Files: debian/* +Copyright: 2011-2015, Ansgar Burchardt +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: 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. diff --git a/dune-debian.mk b/dune-debian.mk new file mode 100644 index 0000000..44f69e2 --- /dev/null +++ b/dune-debian.mk @@ -0,0 +1,23 @@ +include /usr/share/dpkg/pkg-info.mk + +DUNE_CTEST ?= /usr/bin/dune-ctest + +DUNE_DEBIAN_CMAKE_FLAGS = -DBUILD_SHARED_LIBS=1 + +DUNE_DEBIAN_SHLIB = $(subst ~,.,lib$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)) + +override_dh_auto_configure: + dh_auto_configure -- $(DUNE_DEBIAN_CMAKE_FLAGS) + +# OpenMPI looks for a rsh program, even when it only starts local processes. +export OMPI_MCA_plm_rsh_agent=/bin/false + +override_dh_auto_test: + dh_auto_build -- build_tests + cd build; PATH=$(CURDIR)/debian/tmp-test:$$PATH $(DUNE_CTEST) + +override_dh_gencontrol: + dh_gencontrol -- -Vdune:shared-library='$(DUNE_DEBIAN_SHLIB)' + +override_dh_makeshlibs: + dh_makeshlibs --version-info='$(DUNE_DEBIAN_SHLIB)' diff --git a/get-orig-source b/get-orig-source new file mode 100755 index 0000000..1eeab41 --- /dev/null +++ b/get-orig-source @@ -0,0 +1,135 @@ +#! /bin/bash +# +# get-orig-source for dune +# +# (C) 2012, Ansgar Burchardt +# License: GPL-2 with DUNE exception + +set -e +set -u +set -o pipefail + +usage() { + echo "usage: get-orig-source [options...] [] [] + 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 : create orig tarball in directory + + 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=$(git log -1 --pretty="format:%ci" ${branch}) + date=${date%% *} + date=${date//-/} + 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) + safe-rm -r doc/grids/amiramesh + ;; + dune-uggrid) + safe-rm -r doc + ;; +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-dev.install b/libdune-common-dev.install new file mode 100644 index 0000000..397a7c7 --- /dev/null +++ b/libdune-common-dev.install @@ -0,0 +1,8 @@ +usr/bin +usr/include +usr/lib +usr/share/bash-completion +usr/share/dune-common +usr/share/dune + +debian/dune-debian.mk usr/share/dune diff --git a/libdune-common-dev.lintian-overrides b/libdune-common-dev.lintian-overrides new file mode 100644 index 0000000..c3689aa --- /dev/null +++ b/libdune-common-dev.lintian-overrides @@ -0,0 +1,6 @@ +# We don't build a separate shared library package. +# See also https://lists.debian.org/debian-devel/2015/07/msg00115.html +libdune-common-dev: non-dev-pkg-with-shlib-symlink * +libdune-common-dev: package-name-doesnt-match-sonames * +# ABI is too unstable to warrant extra work with a symbols file +libdune-common-dev: no-symbols-control-file diff --git a/libdune-common-dev.manpages b/libdune-common-dev.manpages new file mode 100644 index 0000000..76291e8 --- /dev/null +++ b/libdune-common-dev.manpages @@ -0,0 +1 @@ +doc/dunecontrol.1 diff --git a/libdune-common-doc.install b/libdune-common-doc.install new file mode 100644 index 0000000..fe56f80 --- /dev/null +++ b/libdune-common-doc.install @@ -0,0 +1,2 @@ +usr/share/doc/dune-common/* usr/share/doc/libdune-common-doc +build/doc/buildsystem/html usr/share/doc/libdune-common-doc/buildsystem diff --git a/patches/rename-git-whitespace-hook.patch b/patches/rename-git-whitespace-hook.patch new file mode 100644 index 0000000..3b1fd31 --- /dev/null +++ b/patches/rename-git-whitespace-hook.patch @@ -0,0 +1,40 @@ +From: Ansgar Burchardt +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 +@@ -476,17 +476,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 index 0000000..c1e38b1 --- /dev/null +++ b/patches/series @@ -0,0 +1,3 @@ +soname.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 index 0000000..633b9a9 --- /dev/null +++ b/patches/skip-dirs-starting-with-dot.patch @@ -0,0 +1,13 @@ +From: Ansgar Burchardt +Subject: skip directories starting with a dot when looking for dune.module +--- a/lib/dunemodules.lib ++++ b/lib/dunemodules.lib +@@ -250,7 +250,7 @@ + while read m; do + test -n "$m" && parse_control "$m" + done <