[jenkins-winstone] 06/14: Removed the notes about the JEE spec files in README.source and debian/copyright

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository jenkins-winstone.

commit 1cc117f8ef7203bcbd4ee79a130a91171e741023
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 5 15:33:40 2014 +0200

    Removed the notes about the JEE spec files in README.source and debian/copyright
---
 debian/README.source | 13 -------------
 debian/changelog     |  3 ++-
 debian/copyright     | 34 ----------------------------------
 debian/orig-tar.sh   |  1 -
 4 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index c2414f9..32f8d98 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -11,16 +11,3 @@ the Debian policy.
 This package is the Jenkins branch of the Winstone servlet
 container; it should probably only be used by the Jenkins 
 project.
-
-Files removed to support DFSG compliance
-----------------------------------------
-
-XSD and DTD files supporting the Servlet and JSP specifications 
-(everything in src/conf/javax) copyrighted to Sun Microsystems 
-have been removed from the upstream source distribution as no 
-license appears to have been granted to the winstone project 
-for these files.
-
-Sun Microsystems did released these files under CDDL or GPL-2;
-these versions are patched into the source tree during package build.
-(see debian/patches/specification-resources.patch)
diff --git a/debian/changelog b/debian/changelog
index 00ea25b..2ca4754 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ jenkins-winstone (2.3-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Added a dependency on libjetty8-java and libjetty8-extra-java
-    - Removed specification-resources.patch (no longer needed)
+    - Removed specification-resources.patch since the JEE spec files now come
+      with Jetty. Removed the related notes in README.source and d/copyright.
     - Refreshed java8-compatibility.patch
     - Disabled the SPDY connector
     - Disabled the tests (requires org.kohsuke:ajp-client)
diff --git a/debian/copyright b/debian/copyright
index 1ba2c54..c4d749b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,10 +14,6 @@ Files: debian/*
 Copyright: 2011, Canonical Ltd (http://www.canonical.com/)
 License: CDDL
 
-Files: debian/patches/specification-resources.patch
-Copyright: 1999-2007, Sun Microsystems, Inc
-License: CDDL or GPL-2 with Classpath exception
-
 License: CDDL
   COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
   .
@@ -407,33 +403,3 @@ License: LGPL-2.1
 License: LGPL-2
   On Debian GNU/Linux system you can find the complete text of the
   LGPL-2 license in '/usr/share/common-licenses/LGPL-2'
-
-License: GPL-2 with Classpath exception
-  On Debian GNU/Linux system you can find the complete text of the
-  GPL-2 license in '/usr/share/common-licenses/GPL-2'
-  .
-  "CLASSPATH" EXCEPTION TO THE GPL VERSION 2
-  .
-  Certain source files distributed by Sun Microsystems, Inc. are subject 
-  to the following clarification and special exception to the GPL Version 
-  2, but only where Sun has expressly included in the particular source 
-  file's header the words
-  .
-   "Sun designates this particular file as subject to the "Classpath" exception
-   as provided by Sun in the License file that accompanied this code."
-  .
-   Linking this library statically or dynamically with other modules is making 
-   a combined work based on this library. Thus, the terms and conditions of the 
-   GNU General Public License Version 2 cover the whole combination.
-  .
-  As a special exception, the copyright holders of this library give you 
-  permission to link this library with independent modules to produce an 
-  executable, regardless of the license terms of these independent modules, 
-  and to copy and distribute the resulting executable under terms of your choice, 
-  provided that you also meet, for each linked independent module, the terms and 
-  conditions of the license of that module.? An independent module is a module 
-  which is not derived from or based on this library.? If you modify this 
-  library, you may extend this exception to your version of the library, but 
-  you are not obligated to do so.? If you do not wish to do so, delete this 
-  exception statement from your version.
-
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 67303c3..5bcb899 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -15,7 +15,6 @@ XZ_OPT=--best tar -c -J -v -f $TAR \
     --exclude '*.class' \
     --exclude 'CVS' \
     --exclude '.svn' \
-    --exclude 'src/conf/javax' \
     $DIR
 rm -rf $DIR
 

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