diff options
| author |  Benjamin Barenblat <bbaren@debian.org> | 2019-02-02 19:12:28 -0500 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@debian.org> | 2019-02-02 19:12:28 -0500 |
| commit | cf916fd97fbac51af6fa68ec2704da2a28ef9ede (patch) | |
| tree | 310a4de0b2f9b4fd368b9b742a879c05b6cc43e8 /debian/gbp.conf | |
| parent | 4b8ec4bcaa087e35b5a82afc2c325fee2a67f7a4 (diff) | |
Prepare to import ssrmatching in 8.9.0
Upstream has corrected most of the licensing issues with ssrmatching
in 8.9.0. That version introduced one new file with a CeCILL-B license,
but it’s an .mli file, so OCaml should be able to infer its contents.
Don’t import the offending .mli, but do import the files with corrected
license headers. Remove the patch introduced in
5d3dc22cc205021e517a81943952655c51777083 (which backported the
correctly licensed files).
Diffstat (limited to 'debian/gbp.conf')
| -rw-r--r-- | debian/gbp.conf | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/debian/gbp.conf b/debian/gbp.conf index a4ee2a5f..92f87323 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -51,11 +51,7 @@ filter = [ # 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", + "plugins/ssrmatching/g_ssrmatching.mli", # This tries to build upstream's CI on Salsa, which doesn't work. ".travis.yml" ] |