From 384ab6b9cc20eddd292b95f3be9cae62b7450d23 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Fri, 26 Nov 2010 12:47:28 +0000
Subject: [PATCH] Add apache licensing for part of gmock.

---
 debian/copyright | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/debian/copyright b/debian/copyright
index e9d8c6b61..1e5b8644a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -61,6 +61,11 @@ Files: 3rdparty/gmock/*
 Copyright: 2008, Google Inc.
 License: BSD-Google
 
+Files: 3rdparty/gmock/scripts/generator/*
+Copyright: 2007, Neal Norwitz
+           2007, Google Inc.
+License: Apache-2.0
+
 Files: 3rdparty/libprojectm/*
 Copyright: 2003-2009 projectM Team
 License: LGPL-2.1
@@ -248,3 +253,19 @@ License: MPL-1.1
   and other provisions required by the GPL or the LGPL. If you do not delete
   the provisions above, a recipient may use your version of this file under
   the terms of any one of the MPL, the GPL or the LGPL.
+
+License: Apache-2.0
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the license at
+  .
+     http://www.apache.org/licenses/LICENSE-2.0
+  .
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  .
+  On Debian systems, the complete text of the Apache 2.0 license can be
+  found in the file /usr/share/common-licenses/Apache-2.0.