[xsom] 01/01: add a patch from trunk to fix SCD.jj license header

[Timo Aaltonen]

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

tjaalton-guest pushed a commit to branch master
in repository xsom.

commit 77510d00ae62f91bc8dbaf9432a058e2a832397a
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Mon Jun 23 15:03:51 2014 +0300

    add a patch from trunk to fix SCD.jj license header
---
 debian/patches/04-fix-scdjj-header.patch | 51 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 2 files changed, 52 insertions(+)

diff --git a/debian/patches/04-fix-scdjj-header.patch b/debian/patches/04-fix-scdjj-header.patch
new file mode 100644
index 0000000..3cc81dc
--- /dev/null
+++ b/debian/patches/04-fix-scdjj-header.patch
@@ -0,0 +1,51 @@
+Author: Timo Aaltonen <tjaalton at ubuntu.com>
+Description: backport SCD.jj license header from trunk
+
+https://svn.java.net/svn/xsom~sources/trunk/SCD.jj
+
+--- a/SCD.jj
++++ b/SCD.jj
+@@ -1,3 +1,43 @@
++/*
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
++ *
++ * Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
++ *
++ * The contents of this file are subject to the terms of either the GNU
++ * General Public License Version 2 only ("GPL") or the Common Development
++ * and Distribution License("CDDL") (collectively, the "License").  You
++ * may not use this file except in compliance with the License.  You can
++ * obtain a copy of the License at
++ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
++ * or packager/legal/LICENSE.txt.  See the License for the specific
++ * language governing permissions and limitations under the License.
++ *
++ * When distributing the software, include this License Header Notice in each
++ * file and include the License file at packager/legal/LICENSE.txt.
++ *
++ * GPL Classpath Exception:
++ * Oracle designates this particular file as subject to the "Classpath"
++ * exception as provided by Oracle in the GPL Version 2 section of the License
++ * file that accompanied this code.
++ *
++ * Modifications:
++ * If applicable, add the following below the License Header, with the fields
++ * enclosed by brackets [] replaced by your own identifying information:
++ * "Portions Copyright [year] [name of copyright owner]"
++ *
++ * Contributor(s):
++ * If you wish your version of this file to be governed by only the CDDL or
++ * only the GPL Version 2, indicate your decision by adding "[Contributor]
++ * elects to include this software in this distribution under the [CDDL or GPL
++ * Version 2] license."  If you don't indicate a single choice of license, a
++ * recipient has the option to distribute your version of this file under
++ * either the CDDL, the GPL Version 2 or to extend the choice of license to
++ * its licensees as provided above.  However, if you add GPL Version 2 code
++ * and therefore, elected the GPL Version 2 license, then the option applies
++ * only if the new code is made subject to such option by the copyright
++ * holder.
++ */
++
+ /**
+  * Grammar for schema component designator
+  */
diff --git a/debian/patches/series b/debian/patches/series
index 82c031b..7463da8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-disable-license-ant-task.patch
 02-disable-tests.patch
 03-run-javacc.patch
+04-fix-scdjj-header.patch

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