[Pkg-virtualbox-commits] [kbuild] 04/10: Fix copyright issue

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch experimental
in repository kbuild.

commit c3ad8cd3be90ad37e6ddd0fd43aa9d9af633c76f
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date:   Fri Jan 13 17:55:39 2017 +0100

    Fix copyright issue
---
 debian/changelog |  3 +--
 debian/copyright | 22 ----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e7f965..5daeb31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
-kbuild (1:0.1.9998svn2997+dfsg-1) UNRELEASED; urgency=medium
+kbuild (1:0.1.9998svn3025+dfsg-1) experimental; urgency=medium
 
   * New upstream release, update copyright.
-    (don't upload now, there is an incompatible GPL-2 only source file)
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Wed, 07 Sep 2016 09:55:18 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 455ba0a..ca5ddc0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -21,10 +21,6 @@ Files: src/sed/*
 Copyright: 2003 Free Software Foundation, Inc.
 License: GPL-2+
 
-Files: src/kWorker/tst-1-c1xx-xcpt.cpp
-Copyright: 2006-2016 Oracle Corporation
-License: GPL-2
-
 Files: src/lib/kDep.*
        src/lib/kStuff/*
 Copyright: 2004-2013 knut st. osmundsen <bird-kBuild-spamx at anduin.net>
@@ -50,24 +46,6 @@ Copyright:
  2014-2016 Gianfranco Costamagna <locutusofborg at debian.org>
 License: GPL-3+
 
-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; version 2 of the License.
- .
- 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 systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
-
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/kbuild.git