[pkg-java] r18082 - in trunk/derby/debian: . patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Sat Apr 26 17:24:20 UTC 2014


Author: ebourg-guest
Date: 2014-04-26 17:24:20 +0000 (Sat, 26 Apr 2014)
New Revision: 18082

Removed:
   trunk/derby/debian/patches/stop_ant_fetching
Modified:
   trunk/derby/debian/changelog
   trunk/derby/debian/copyright
   trunk/derby/debian/patches/javacc5.diff
   trunk/derby/debian/patches/series
   trunk/derby/debian/rules
Log:
New upstream release (10.10.2.0)
Refreshed the patches



Modified: trunk/derby/debian/changelog
===================================================================
--- trunk/derby/debian/changelog	2014-04-26 08:37:30 UTC (rev 18081)
+++ trunk/derby/debian/changelog	2014-04-26 17:24:20 UTC (rev 18082)
@@ -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 <ebourg at apache.org>  Sat, 26 Apr 2014 10:01:40 +0200

Modified: trunk/derby/debian/copyright
===================================================================
--- trunk/derby/debian/copyright	2014-04-26 08:37:30 UTC (rev 18081)
+++ trunk/derby/debian/copyright	2014-04-26 17:24:20 UTC (rev 18082)
@@ -3,14 +3,14 @@
 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

Modified: trunk/derby/debian/patches/javacc5.diff
===================================================================
--- trunk/derby/debian/patches/javacc5.diff	2014-04-26 08:37:30 UTC (rev 18081)
+++ trunk/derby/debian/patches/javacc5.diff	2014-04-26 17:24:20 UTC (rev 18082)
@@ -2,23 +2,23 @@
 --- 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 @@
 --- 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>
+ 

Modified: trunk/derby/debian/patches/series
===================================================================
--- trunk/derby/debian/patches/series	2014-04-26 08:37:30 UTC (rev 18081)
+++ trunk/derby/debian/patches/series	2014-04-26 17:24:20 UTC (rev 18082)
@@ -1,2 +1 @@
-stop_ant_fetching
 javacc5.diff

Deleted: trunk/derby/debian/patches/stop_ant_fetching
===================================================================
--- trunk/derby/debian/patches/stop_ant_fetching	2014-04-26 08:37:30 UTC (rev 18081)
+++ trunk/derby/debian/patches/stop_ant_fetching	2014-04-26 17:24:20 UTC (rev 18082)
@@ -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>
- 
- <!-- ==================================================================== -->

Modified: trunk/derby/debian/rules
===================================================================
--- trunk/derby/debian/rules	2014-04-26 08:37:30 UTC (rev 18081)
+++ trunk/derby/debian/rules	2014-04-26 17:24:20 UTC (rev 18082)
@@ -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/[-+].*//' )




More information about the pkg-java-commits mailing list