Author: eugene-guest Date: 2014-09-14 18:00:50 +0000 (Sun, 14 Sep 2014) New Revision: 18422
Modified: trunk/saxonhe/debian/README.source trunk/saxonhe/debian/changelog trunk/saxonhe/debian/compat trunk/saxonhe/debian/control trunk/saxonhe/debian/copyright trunk/saxonhe/debian/libsaxonhe-java.poms trunk/saxonhe/debian/maven.publishedRules trunk/saxonhe/debian/maven.rules trunk/saxonhe/debian/orig-tar.sh trunk/saxonhe/debian/patches/pom_added.patch trunk/saxonhe/debian/rules Log: 9.5.1.1 upstream release Modified: trunk/saxonhe/debian/README.source =================================================================== --- trunk/saxonhe/debian/README.source 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/README.source 2014-09-14 18:00:50 UTC (rev 18422) @@ -9,7 +9,7 @@ the Debian policy. The pom.xml provided by patch is my own work. -src/main/java/net/sf/saxon/dotnet and src/main/java/net/sf/saxon/option +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. Modified: trunk/saxonhe/debian/changelog =================================================================== --- trunk/saxonhe/debian/changelog 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/changelog 2014-09-14 18:00:50 UTC (rev 18422) @@ -1,3 +1,9 @@ +saxonhe (9.5.1.1.dfsg-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Eugene Zhukov <[email protected]> Sun, 14 Sep 2014 11:42:27 +0000 + saxonhe (9.4.0.7.dfsg-2) unstable; urgency=low [ Eugene Zhukov ] Modified: trunk/saxonhe/debian/compat =================================================================== --- trunk/saxonhe/debian/compat 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/compat 2014-09-14 18:00:50 UTC (rev 18422) @@ -1 +1 @@ -8 +9 Modified: trunk/saxonhe/debian/control =================================================================== --- trunk/saxonhe/debian/control 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/control 2014-09-14 18:00:50 UTC (rev 18422) @@ -11,7 +11,8 @@ libdom4j-java, libjdom1-java (>= 1.1), libxml-commons-resolver1.1-java (>= 1.2), - libxom-java + libxom-java, + libcomment-preprocessor-java Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/saxonhe Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/saxonhe/ Modified: trunk/saxonhe/debian/copyright =================================================================== --- trunk/saxonhe/debian/copyright 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/copyright 2014-09-14 18:00:50 UTC (rev 18422) @@ -3,12 +3,12 @@ Source: http://www.saxonica.com/ Files: * -Copyright: 1999-2013, Saxonica -License: MPL-1.0 +Copyright: 1999-2014, Saxonica +License: MPL-2.0 The contents of this file are subject to the Mozilla Public License - Version 1.0 (the "License"); you may not use this file except in + Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + http://www.mozilla.org/MPL/2.0 . Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the @@ -18,11 +18,8 @@ The Original Code is Saxon-HE - The XSLT and XQuery Processor. . The Initial Developer of the Original Code is Michael H. Kay. -Comment: - The complete text of the Mozilla Public License can be found in - the `MPL' file in the same directory as this file. -Files: src/main/java/net/sf/saxon/expr/sort/GenericSorter.java +Files: sf/saxon/expr/sort/GenericSorter.java Copyright: 1999 CERN - European Organization for Nuclear Research. License: Permission to use, copy, moNumbererdify, distribute and sell this software @@ -34,5 +31,5 @@ Files: debian/* Copyright: 2013, Eugene Zhukov <[email protected]> -License: MPL-1.0 +License: MPL-2.0 same as above Modified: trunk/saxonhe/debian/libsaxonhe-java.poms =================================================================== --- trunk/saxonhe/debian/libsaxonhe-java.poms 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/libsaxonhe-java.poms 2014-09-14 18:00:50 UTC (rev 18422) @@ -25,4 +25,4 @@ # --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. # Empty by default. [mh_install] # -pom.xml --no-parent --has-package-version +pom.xml --has-package-version Modified: trunk/saxonhe/debian/maven.publishedRules =================================================================== --- trunk/saxonhe/debian/maven.publishedRules 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/maven.publishedRules 2014-09-14 18:00:50 UTC (rev 18422) @@ -1,2 +1,2 @@ -net.sf.saxon Saxon-HE jar s/9\..*/9.x/ * * +net.sf.saxon Saxon-HE jar s/.*/debian/ * * Modified: trunk/saxonhe/debian/maven.rules =================================================================== --- trunk/saxonhe/debian/maven.rules 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/maven.rules 2014-09-14 18:00:50 UTC (rev 18422) @@ -1,3 +1,3 @@ s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * * -net.sf.saxon Saxon-HE jar s/9\..*/9.x/ * * +net.sf.saxon Saxon-HE jar s/.*/debian/ * * Modified: trunk/saxonhe/debian/orig-tar.sh =================================================================== --- trunk/saxonhe/debian/orig-tar.sh 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/orig-tar.sh 2014-09-14 18:00:50 UTC (rev 18422) @@ -5,6 +5,6 @@ DIR=saxonhe-$VERSION TAG="$VERSION" -svn -q export https://www.saxonica.co.uk/repos/archive/opensource/tags/${TAG}/hej/net $DIR/src/main/java/net +svn -q export https://www.saxonica.co.uk/repos/archive/opensource/tags/${TAG}/hej/net $DIR XZ_OPT=--best tar cJf $TAR --exclude 'sf/saxon/dotnet' --exclude 'sf/saxon/option' --exclude 'sf/saxon/xqj' $DIR rm -rf $DIR ../$TAG Modified: trunk/saxonhe/debian/patches/pom_added.patch =================================================================== --- trunk/saxonhe/debian/patches/pom_added.patch 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/patches/pom_added.patch 2014-09-14 18:00:50 UTC (rev 18422) @@ -1,28 +1,32 @@ Description: Adds pom.xml for building * The pom.xml created for packaging purposes Author: Eugene Zhukov <[email protected]> -Last-Update: 2014-04-29 +Last-Update: 2014-09-14 --- /dev/null +++ b/pom.xml -@@ -0,0 +1,128 @@ +@@ -0,0 +1,163 @@ +<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.4.0.7</version> ++ <version>9.5.1.1</version> + <packaging>jar</packaging> + + <name>Saxon-HE</name> + <description>The XSLT and XQuery Processor</description> + <url>http://www.saxonica.com/</url> ++ <organization> ++ <name>Saxonica</name> ++ <url>http://www.saxonica.com</url> ++ </organization> + + <licenses> + <license> -+ <name>Mozilla Public License Version 1.0</name> -+ <url>http://www.mozilla.org/MPL/1.0/</url> ++ <name>Mozilla Public License Version 2.0</name> ++ <url>http://www.mozilla.org/MPL/2.0/</url> + <distribution>repo</distribution> + </license> + </licenses> @@ -60,12 +64,7 @@ + <version>1.2</version> + </dependency> + </dependencies> -+ -+ <parent> -+ <groupId>org.sonatype.oss</groupId> -+ <artifactId>oss-parent</artifactId> -+ <version>7</version> -+ </parent> ++ + <build> + <pluginManagement> + <plugins> @@ -97,6 +96,7 @@ + <version>1.6</version> + <executions> + <execution> ++ <id>generate-resources</id> + <phase>generate-resources</phase> + <configuration> + <target> @@ -115,6 +115,30 @@ + <goal>run</goal> + </goals> + </execution> ++ <execution> ++ <id>fix-sources</id> ++ <phase>generate-sources</phase> ++ <configuration> ++ <target> ++ <taskdef resource="com/igormaznitsa/jcp/ant/tasks.properties" classpath="/usr/share/java/jcp.jar"/> ++ <preprocess source="sf" destination="src/main/java/net" verbose="false"> ++ <global name="EE" value="false"/> ++ <global name="PE" value="false"/> ++ <global name="DOTNET" value="false"/> ++ </preprocess> ++ ++ <replaceregexp match="import com\.saxonica(.*)" replace="" flags="g"> ++ <fileset dir="src/main/java/net" includes="**/*.java" /> ++ </replaceregexp> ++ <replaceregexp match="import net\.sf\.saxon\.dotnet(.*)" replace="" flags="g"> ++ <fileset dir="src/main/java/net" includes="**/*.java" /> ++ </replaceregexp> ++ </target> ++ </configuration> ++ <goals> ++ <goal>run</goal> ++ </goals> ++ </execution> + </executions> + </plugin> + <plugin> @@ -131,6 +155,17 @@ + </archive> + </configuration> + </plugin> ++ <plugin> ++ <artifactId>maven-clean-plugin</artifactId> ++ <version>2.5</version> ++ <configuration> ++ <filesets> ++ <fileset> ++ <directory>src</directory> ++ </fileset> ++ </filesets> ++ </configuration> ++ </plugin> + </plugins> + </build> +</project> Modified: trunk/saxonhe/debian/rules =================================================================== --- trunk/saxonhe/debian/rules 2014-09-13 09:46:58 UTC (rev 18421) +++ trunk/saxonhe/debian/rules 2014-09-14 18:00:50 UTC (rev 18422) @@ -6,4 +6,4 @@ JAVA_HOME := /usr/lib/jvm/default-java get-orig-source: - uscan --download-current-version --force-download --rename + uscan --verbose --download-current-version --force-download --rename --no-symlink _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
