diff options
author | Benjamin Barenblat <bbaren@debian.org> | 2018-12-29 14:30:26 -0500 |
---|---|---|
committer | Benjamin Barenblat <bbaren@debian.org> | 2018-12-29 14:30:26 -0500 |
commit | d7d80c5bea564b7cb0eadc33e9ee38c9d9de1cd8 (patch) | |
tree | 898be92436f5fcb20a2eea78fab18aa6f8f60707 | |
parent | 5a38d3c4d185cd2248b483de3f64228d5f948d2d (diff) |
Update and firm up excluded files list
Coq has introduced many new files in the last couple of years,
including several that are not DFSG-free. Rebuild and document the list
of files to be excluded from git-buildpackage imports.
Additionally, delete the purify_tarball script, as it’s been replaced
with the import filter.
-rw-r--r-- | debian/gbp.conf | 50 | ||||
-rwxr-xr-x | debian/purify_tarball | 30 |
2 files changed, 45 insertions, 35 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf index 126a7b7a..f9ed7826 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -2,17 +2,57 @@ pristine-tar = True filter-pristine-tar = True filter = [ + # Source from the Nullsoft Scriptable Install System wiki, which is not + # licensed. + "dev/build/windows/patches_coq/ReplaceInFile.nsh", + "dev/build/windows/patches_coq/StrRep.nsh", + "dev/nsis/FileAssociation.nsh", + + # Material connected to the reference manual, licensed under the non-free + # Open Publication License. "doc/common/styles/html/coqremote/cover.html", "doc/common/styles/html/coqremote/hevea.css", + "doc/common/styles/html/coqremote/modules", + "doc/common/styles/html/coqremote/sites", "doc/common/styles/html/coqremote/styles.hva", "doc/common/styles/html/simple/cover.html", "doc/common/styles/html/simple/hevea.css", + "doc/common/styles/html/simple/modules", + "doc/common/styles/html/simple/sites", "doc/common/styles/html/simple/styles.hva", "doc/common/macros.tex", "doc/common/title.tex", - "doc/RecTutorial", - "doc/faq", "doc/refman", - "doc/rt", - "doc/tools", - "doc/tutorial" ] + "doc/sphinx", + "doc/tools/coqrst/regen_readme.py", + "doc/tools/latex_filter", + "doc/tools/show_latex_messages", + "doc/tools/Translator.tex", + "interp/doc.tex", + "kernel/doc.tex", + "lib/doc.tex", + "library/doc.tex", + "pretyping/doc.tex", + "proofs/doc.tex", + "tactics/doc.tex", + "vernac/doc.tex", + + # The Coq Tutorial, licensed under the non-free Open Publication License. + "doc/tutorial", + + # The Tutorial on [Co-]Inductive Types, licensed under the non-free Open + # Publication License. + "doc/RecTutorial", + + # Fonts licensed under the non-free Ubuntu Font Licence. + "doc/tools/coqrst/notations/CoqNotations.ttf", + "doc/tools/coqrst/notations/UbuntuMono-B.ttf", + + # Code with CeCILL-B license headers. bbaren believes CeCILL-B to be + # nonfree; see + # https://lists.debian.org/msgid-search/875zvih02a.jfx@benwick.benjamin.barenblat.name. + # + # These files will be patched in with properly licensed replacements once + # https://github.com/coq/coq/pull/9282 is merged. + "plugins/ssrmatching/ssrmatching.mli", + "plugins/ssrmatching/ssrmatching.v" ] diff --git a/debian/purify_tarball b/debian/purify_tarball deleted file mode 100755 index f1d79961..00000000 --- a/debian/purify_tarball +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -set -e - -CURDIR=`pwd` -ORIG=$1 -WORKDIR=`dirname $ORIG` -ORIGFILE=`basename $ORIG` -VERSION=`echo "$ORIGFILE" | sed "s/^coq-\([0-9\.a-z-]\+\)\.tar\.gz$/\1/"` - -cd $WORKDIR - -tar zxf $ORIGFILE - -mv coq-$VERSION/doc/common/styles/html/simple/{style.css,header.html,footer.html} coq-$VERSION -rm -rf coq-$VERSION/doc/common -mkdir -p coq-$VERSION/doc/common/styles/html/simple -mv coq-$VERSION/{style.css,header.html,footer.html} coq-$VERSION/doc/common/styles/html/simple -rm -rf coq-$VERSION/doc/faq -rm -rf coq-$VERSION/doc/RecTutorial -rm -rf coq-$VERSION/doc/refman -rm -rf coq-$VERSION/doc/rt -rm -rf coq-$VERSION/doc/tools -rm -rf coq-$VERSION/doc/tutorial -find coq-$VERSION -name '*~' -delete - -tar zcf coq_$VERSION+dfsg.orig.tar.gz coq-$VERSION/ -rm -rf coq-$VERSION - -cd $CURDIR |