From 7c83981c407fa6a52a6f8db76b17aaeb83fa41d9 Mon Sep 17 00:00:00 2001
From: Shaun Crampton <shaun@tigera.io>
Date: Mon, 10 Feb 2020 16:27:49 +0000
Subject: [PATCH] Update package licenses.

---
 debian/copyright  | 23 ++++++++++++++++++++++-
 debian/rules      |  2 +-
 rpm/felix.spec.in |  3 ++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 53d014417f..4fb7f75d5c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: calico
 Source: http://github.com/projectcalico/felix
 
 Files: *
-Copyright: 2014-2019 Tigera, Inc
+Copyright: 2014-2020 Tigera, Inc
 License: Apache-2
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -19,3 +19,24 @@ License: Apache-2
  .
  On Debian-based systems the full text of the Apache version 2.0 license
  can be found in `/usr/share/common-licenses/Apache-2.0'
+
+Files: bpf-gpl/*
+Copyright: 2020 Tigera, Inc
+License: GPL-2
+ 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, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian-based systems the full text of the GPL version 2.0 license
+ can be found in `/usr/share/common-licenses/GPL-2'
+
diff --git a/debian/rules b/debian/rules
index 729188d126..c8e6e2df60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 
 %:
 	dh $@  --with systemd
diff --git a/rpm/felix.spec.in b/rpm/felix.spec.in
index d522d42179..c6177052f6 100644
--- a/rpm/felix.spec.in
+++ b/rpm/felix.spec.in
@@ -4,7 +4,8 @@ Name:           felix
 Summary:        Project Calico virtual networking for cloud data centers
 Version:        -- filled in by 'make rpm' when building packages --
 Release:        -- filled in by 'make rpm' when building packages --
-License:        Apache-2
+# All code is Apache 2.0 except files in bpf-gpl which are GPL-2.
+License:        ASL 2.0 and GPLv2
 URL:            http://projectcalico.org
 Source0:        felix-%{version}.tar.gz
 Source1:        calico-felix.logrotate