[netbeans] 02/12: Clarify license of ClassManager.js and remove PHP testfiles.

[Markus Koschany]

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

apo pushed a commit to branch master
in repository netbeans.

commit 46d2c3cadfc9d111e224a80c1f3761b4a88060e2
Author: Markus Koschany <apo at debian.org>
Date:   Thu May 26 08:02:10 2016 +0200

    Clarify license of ClassManager.js and remove PHP testfiles.
    
    Closes: #823812
---
 debian/copyright   | 13 ++++++++++++-
 debian/orig-tar.sh |  3 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 49646cd..4585144 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -750,13 +750,24 @@ Copyright: 2004-2010 Apple Computer, Inc., Mozilla Foundation, and Opera Softwar
 License: WHATWG-HTML-5-spec-License
  You are granted a license to use, reproduce and create derivative works of this document.
 
+Files: javascript2.extjs/test/unit/data/testfiles/completion/applyMethod/ClassManager.js
+Copyright: Sencha
+License: GPL-3
+Comment:
+ https://www.sencha.com/legal/
+
+
 License: GPL-2+
- On Debian systems the full text of the GNU General Public License can be
+ On Debian systems the full text of the GNU General Public License 2 can be
  found in the `/usr/share/common-licenses/GPL-2' file.
  .
  You can also use (at your option) any later version of the GNU General Public
  License 2.
 
+License: GPL-3
+ On Debian systems the full text of the GNU General Public License 3 can be
+ found in the `/usr/share/common-licenses/GPL-3' file.
+
 License: LGPL-2.1+
  On Debian systems the full text of the GNU Lesser General Public License can be found
  in the `/usr/share/common-licenses/LGPL-2.1' file.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 165098b..4b72714 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -142,6 +142,9 @@ rm -rf $BASE/versioning.util/test/unit/data/
 # Remove W3C spec files #823813
 rm -r websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/catalog/resources/
 
+# Remove PHP testfiles like performance.php from SMF 1.1 #823812
+rm -r php.editor/test/unit/data/testfiles/parser/performance/performance.php
+
 
 # Make our ".orig.tar.xz"
 tar caf $TAR $BASE

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