[saxonhe] 02/03: Changes for new upstream 9.8.0.8 version

Eugene Zhukov eugene at moszumanska.debian.org
Fri Feb 16 11:22:40 UTC 2018 

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

eugene pushed a commit to branch master
in repository saxonhe.

commit 432465f3ee2998ce88c566ed0699b5f22372834c
Author: Eugene Zhukov <eugene at debian.org>
Date:   Fri Feb 16 08:44:32 2018 +0000

    Changes for new upstream 9.8.0.8 version
---
 debian/README.Debian           | 68 ------------------------------------------
 debian/README.source           |  7 ++---
 debian/changelog               |  6 ++++
 debian/orig-tar.sh             |  5 ++--
 debian/patches/pom_added.patch | 10 ++++---
 5 files changed, 17 insertions(+), 79 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index cc62954..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,68 +0,0 @@
-Some source java files from upstream were removed. Namely all files from
-directory:
-
-  net/sf/saxon/xqj/*
-
-indeed:
-
-saxonhe-9.4.0.7\src\main\java\javax\xml\xquery\*:
-    Copyright # 2003, 2004, 2005, 2006, 2007, 2008 Oracle.  All rights
-    reserved.
-
-are licensed under non-free terms:
-
-[...]
-(c)
-does not modify, subset, superset or otherwise extend those public
-class or interface declarations whose names begin with "Java"
-[...]
-
-ref:
-http://lists.alioth.debian.org/pipermail/pkg-java-maintainers/2013-September/043308.html
-
-full text:
-
----------- Forwarded message ----------
-From: Michael Kay <mike at saxonica.com>
-Date: Mon, Sep 2, 2013 at 11:24 PM
-Subject: Re: Saxon-HE copyright
-To: Eugene Zhukov <jevgeni.zh at gmail.com>
-
-
-These Java interface definitions are taken from the XQJ specification,
-JSR 225, which you can find here:
-
-http://jcp.org/aboutJava/communityprocess/final/jsr225/index.html
-
-along with the licensing terms.
-
-An extract of the license is:
-
-In addition, to the extent that an implementation of the Specification
-would be considered
-a derivative work under applicable law requiring a license grant from
-the holder of the
-copyright in the Specification, the Spec Lead grants a copyright
-license solely for the
-purpose of making and/or distributing an implementation of the
-Specification that: (a)
-except for the RI code licensed from Oracle under the RI License which
-is attached
-hereto as Exhibit B, does not include or otherwise make any use of the
-RI; (b) fully
-implements the Specification including all of its required interfaces
-and functionality; (c)
-does not modify, subset, superset or otherwise extend those public
-class or interface
-declarations whose names begin with “java;” and (d) passes the TCK.
-
-In other words: Saxon, as an implementation of the XQJ specification,
-takes advantage
-of the copyright license granted by Oracle, and satisfies the terms
-of this license insofar
-as it is a complete implementation of the specification and passes the TCK.
-
-NOTE: I am not a lawyer and this is not legal advice.
-
-Michael Kay
-Saxonica
diff --git a/debian/README.source b/debian/README.source
index 77026cc..cbf6c27 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -9,8 +9,7 @@ anything from the Internet, making the build compliant with
 the Debian policy.
 
 The pom.xml provided by patch is my own work.
-sf/saxon/dotnet and sf/saxon/option and sf/saxon/xqj
-packages are dropped as they are also omitted from original
-build process by Saxonica.
+net/sf/saxon/dotnet and net/sf/saxon/option packages are dropped as they are
+also omitted from original build process by Saxonica.
 
--- Eugene Zhukov <jevgeni.zh at gmail.com>  Fri, 17 May 2013 11:19:39 +0000
+-- Eugene Zhukov <eugene at debian.org>  Fri, 17 May 2013 11:19:39 +0000
diff --git a/debian/changelog b/debian/changelog
index 18173ae..18c20be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saxonhe (9.8.0.8+dfsg+1-1.1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Eugene Zhukov <eugene at debian.org>  Fri, 16 Feb 2018 07:42:40 +0000
+
 saxonhe (9.7.0.10+dfsg+1-1) unstable; urgency=medium
 
   * Include upstream resources (dfsg+1)
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 5482cd3..045acae 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -5,11 +5,10 @@ TAR=../saxonhe_$VERSION+dfsg+1.orig.tar.xz
 DIR=saxonhe-$VERSION
 TAG="$VERSION"
 
-svn -q export https://www.saxonica.co.uk/repos/archive/opensource/tags/${TAG}/hej $DIR
+svn -q export https://dev.saxonica.com/repos/archive/opensource/tags/${TAG}/hej $DIR
 XZ_OPT=--best tar cJf $TAR \
  --exclude 'javax' \
- --exclude 'data/lib' \
- --exclude 'data/w3c' \
  --exclude 'net/sf/saxon/dotnet' \
+ --exclude 'net/sf/saxon/data/w3c' \
  --exclude 'net/sf/saxon/option' $DIR
 rm -rf $DIR ../$TAG
diff --git a/debian/patches/pom_added.patch b/debian/patches/pom_added.patch
index f81f6de..c6aa7ce 100644
--- a/debian/patches/pom_added.patch
+++ b/debian/patches/pom_added.patch
@@ -5,13 +5,13 @@ Last-Update: 2014-09-14
 
 --- /dev/null
 +++ b/pom.xml
-@@ -0,0 +1,164 @@
+@@ -0,0 +1,166 @@
 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 +  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 +  <modelVersion>4.0.0</modelVersion>
 +  <groupId>net.sf.saxon</groupId>
 +  <artifactId>Saxon-HE</artifactId>
-+  <version>9.7.0.10</version>
++  <version>9.8.0.8</version>
 +  <packaging>jar</packaging>
 +  <name>Saxon-HE</name>
 +  <description>The XSLT and XQuery Processor</description>
@@ -81,7 +81,7 @@ Last-Update: 2014-09-14
 +	</resource>
 +	<resource>
 +		<directory>data/</directory>
-+		<targetPath>.</targetPath>
++		<targetPath>net/sf/saxon/data</targetPath>
 +	</resource>
 +    </resources>
 +    <plugins>
@@ -119,7 +119,9 @@ Last-Update: 2014-09-14
 +                  <global name="EE" value="false"/>
 +                  <global name="PE" value="false"/>
 +                  <global name="DOTNET" value="false"/>
-+                  <global name="saxonc" value="false"/>
++                  <global name="OPT" value="false"/>
++                  <global name="SAXONC" value="false"/>
++                  <global name="BYTECODE" value="false"/>
 +                </preprocess>
 +
 +                <replaceregexp match="import com\.saxonica(.*)" replace="" flags="g">

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

More information about the pkg-java-commits mailing list