This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository derby.
commit faa26ae77d3c6e7dea20f3a4678048b8d8801d36 Author: Emmanuel Bourg <[email protected]> Date: Sat Apr 26 17:24:20 2014 +0000 New upstream release (10.10.2.0) Refreshed the patches --- debian/changelog | 4 +- debian/copyright | 4 +- debian/patches/javacc5.diff | 82 ++++++++++++++++++++-------------------- debian/patches/series | 1 - debian/patches/stop_ant_fetching | 13 ------- debian/rules | 2 +- 6 files changed, 47 insertions(+), 59 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a16cf5..1029741 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -derby (10.10.1.1-2) UNRELEASED; urgency=medium +derby (10.10.2.0-1) UNRELEASED; urgency=medium + * New upstream release + - Refreshed the patches * Use XZ compression for the upstream tarball -- Emmanuel Bourg <[email protected]> Sat, 26 Apr 2014 10:01:40 +0200 diff --git a/debian/copyright b/debian/copyright index 0f4c375..641667f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,14 +3,14 @@ Upstream-Name: Apache Derby Source: http://db.apache.org/derby/ Files: * -Copyright: 2004-2012, The Apache Software Foundation +Copyright: 2004-2014, The Apache Software Foundation 1997-2004, International Business Machines Corporation License: Apache-2.0 On Debian systems you can find the complete text of the Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0' Files: debian/* -Copyright: 2013, Emmanuel Bourg +Copyright: 2013-2014, Emmanuel Bourg 2012-2013, Tim Booth License: BSD-2-clause Redistribution and use in source and binary forms, with or without diff --git a/debian/patches/javacc5.diff b/debian/patches/javacc5.diff index d497cbb..2ca3095 100644 --- a/debian/patches/javacc5.diff +++ b/debian/patches/javacc5.diff @@ -2,23 +2,23 @@ Patch from upstream - https://issues.apache.org/jira/secure/attachment/12473505/ --- a/java/tools/org/apache/derby/impl/tools/ij/ij.jj +++ b/java/tools/org/apache/derby/impl/tools/ij/ij.jj @@ -28,6 +28,7 @@ - UNICODE_INPUT = true; - IGNORE_CASE = true; - CACHE_TOKENS = true; -+ JDK_VERSION = "1.4"; - } - - PARSER_BEGIN(ij) + UNICODE_INPUT = true; + IGNORE_CASE = true; + CACHE_TOKENS = true; ++ JDK_VERSION = "1.4"; + } + + PARSER_BEGIN(ij) --- a/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj +++ b/java/tools/org/apache/derby/impl/tools/ij/mtGrammar.jj @@ -27,6 +27,7 @@ - IGNORE_CASE = true; - CACHE_TOKENS = true; - LOOKAHEAD = 1; -+ JDK_VERSION = "1.4"; - } - - PARSER_BEGIN(mtGrammar) + IGNORE_CASE = true; + CACHE_TOKENS = true; + LOOKAHEAD = 1; ++ JDK_VERSION = "1.4"; + } + + PARSER_BEGIN(mtGrammar) --- /dev/null +++ b/java/engine/org/apache/derby/impl/sql/compile/TokenBase.java @@ -0,0 +1,35 @@ @@ -60,34 +60,34 @@ Patch from upstream - https://issues.apache.org/jira/secure/attachment/12473505/ --- a/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj +++ b/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj @@ -11,6 +11,8 @@ - COMMON_TOKEN_ACTION = true; - CACHE_TOKENS = true; - UNICODE_INPUT = true; -+ JDK_VERSION = "1.4"; -+ TOKEN_EXTENDS = "org.apache.derby.impl.sql.compile.TokenBase"; - } - - PARSER_BEGIN(SQLParser) + COMMON_TOKEN_ACTION = true; + CACHE_TOKENS = true; + UNICODE_INPUT = true; ++ JDK_VERSION = "1.4"; ++ TOKEN_EXTENDS = "org.apache.derby.impl.sql.compile.TokenBase"; + } + + PARSER_BEGIN(SQLParser) --- a/java/engine/org/apache/derby/impl/sql/build.xml +++ b/java/engine/org/apache/derby/impl/sql/build.xml @@ -57,11 +57,10 @@ - Token.java - TokenMgrError.java - -- 3 of those files are checked into the codeline: -+ 2 of those files are checked into the codeline: - - CharStream.java - ParseException.java -- Token.java - - We don't want generated code to clash with the checked-in versions. So - we delete the conflicting classes here. + Token.java + TokenMgrError.java + +- 3 of those files are checked into the codeline: ++ 2 of those files are checked into the codeline: + + CharStream.java + ParseException.java +- Token.java + + We don't want generated code to clash with the checked-in versions. So + we delete the conflicting classes here. @@ -70,7 +69,6 @@ - <fileset dir="${generated.src.dir}/${derby.dir}/impl/sql/compile"> - <include name="CharStream.java"/> - <include name="ParseException.java"/> -- <include name="Token.java"/> - </fileset> - </delete> - + <fileset dir="${generated.src.dir}/${derby.dir}/impl/sql/compile"> + <include name="CharStream.java"/> + <include name="ParseException.java"/> +- <include name="Token.java"/> + </fileset> + </delete> + diff --git a/debian/patches/series b/debian/patches/series index c6e9c21..96d37c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -stop_ant_fetching javacc5.diff diff --git a/debian/patches/stop_ant_fetching b/debian/patches/stop_ant_fetching deleted file mode 100644 index 2cacf8d..0000000 --- a/debian/patches/stop_ant_fetching +++ /dev/null @@ -1,13 +0,0 @@ -Description: Prevents Ant from downloading external jars -Forwarded: not-needed ---- a/build.xml -+++ b/build.xml -@@ -215,7 +215,7 @@ - </target> - - <target name="install_junit" depends="junit_check" unless="junit.exists" description="installs junit.jar into derby"> -- <get src="${junit.url}" dest="${basedir}/tools/java/junit.jar" verbose="true" ignoreerrors="true"/> -+ <fail message="Cannot fetch from network during package build"/> - </target> - - <!-- ==================================================================== --> diff --git a/debian/rules b/debian/rules index 12b7223..d245c8f 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ # DH_VERBOSE := 1 # Try to convince ant not to connect to the network -export ANT_OPTS=-Dhttp.proxyHost=127.0.0.1 -Dhttp.proxyPort=8888 -Duser.home=`pwd`/debian +export ANT_OPTS=-Dhttp.proxyHost=127.0.0.1 -Dhttp.proxyPort=8888 -Duser.home=`pwd`/debian -Djunit.url=file:/usr/share/java/junit.jar pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') version=$(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 -d' ' | sed 's/[-+].*//' ) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/derby.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
