From cf916fd97fbac51af6fa68ec2704da2a28ef9ede Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Sat, 2 Feb 2019 19:12:28 -0500 Subject: Prepare to import ssrmatching in 8.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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). --- debian/gbp.conf | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'debian/gbp.conf') 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" ] -- cgit v1.2.3