[pkg-java] r18088 - in tags/derby: . 10.10.2.0-1/debian 10.10.2.0-1/debian/patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Apr 28 11:23:35 UTC 2014
Author: ebourg-guest
Date: 2014-04-28 11:23:35 +0000 (Mon, 28 Apr 2014)
New Revision: 18088
Added:
tags/derby/10.10.2.0-1/
tags/derby/10.10.2.0-1/debian/changelog
tags/derby/10.10.2.0-1/debian/control
tags/derby/10.10.2.0-1/debian/copyright
tags/derby/10.10.2.0-1/debian/orig-tar.sh
tags/derby/10.10.2.0-1/debian/patches/javacc5.diff
tags/derby/10.10.2.0-1/debian/patches/series
tags/derby/10.10.2.0-1/debian/rules
Removed:
tags/derby/10.10.2.0-1/debian/changelog
tags/derby/10.10.2.0-1/debian/control
tags/derby/10.10.2.0-1/debian/copyright
tags/derby/10.10.2.0-1/debian/orig-tar.sh
tags/derby/10.10.2.0-1/debian/patches/javacc5.diff
tags/derby/10.10.2.0-1/debian/patches/series
tags/derby/10.10.2.0-1/debian/patches/stop_ant_fetching
tags/derby/10.10.2.0-1/debian/rules
Log:
[svn-buildpackage] Tagging derby 10.10.2.0-1
Deleted: tags/derby/10.10.2.0-1/debian/changelog
===================================================================
--- trunk/derby/debian/changelog 2014-04-25 21:23:12 UTC (rev 18080)
+++ tags/derby/10.10.2.0-1/debian/changelog 2014-04-28 11:23:35 UTC (rev 18088)
@@ -1,7 +0,0 @@
-derby (10.10.1.1-1) unstable; urgency=low
-
- * Initial release (Closes: #617425)
- Package developed with the help of Tim Booth <tbooth at ceh.ac.uk>,
- Zied Abid <ziedabid at free.fr> and Emmanuel Bourg <ebourg at apache.org>
-
- -- Emmanuel Bourg <ebourg at apache.org> Wed, 12 Jun 2013 15:26:34 +0200
Copied: tags/derby/10.10.2.0-1/debian/changelog (from rev 18085, trunk/derby/debian/changelog)
===================================================================
--- tags/derby/10.10.2.0-1/debian/changelog (rev 0)
+++ tags/derby/10.10.2.0-1/debian/changelog 2014-04-28 11:23:35 UTC (rev 18088)
@@ -0,0 +1,16 @@
+derby (10.10.2.0-1) unstable; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+ * Use XZ compression for the upstream tarball
+ * Standards-Version updated to 3.9.5 (no changes)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sat, 26 Apr 2014 19:27:30 +0200
+
+derby (10.10.1.1-1) unstable; urgency=low
+
+ * Initial release (Closes: #617425)
+ Package developed with the help of Tim Booth <tbooth at ceh.ac.uk>,
+ Zied Abid <ziedabid at free.fr> and Emmanuel Bourg <ebourg at apache.org>
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 12 Jun 2013 15:26:34 +0200
Deleted: tags/derby/10.10.2.0-1/debian/control
===================================================================
--- trunk/derby/debian/control 2014-04-25 21:23:12 UTC (rev 18080)
+++ tags/derby/10.10.2.0-1/debian/control 2014-04-28 11:23:35 UTC (rev 18088)
@@ -1,85 +0,0 @@
-Source: derby
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Tim Booth <tbooth at ceh.ac.uk>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), default-jdk, javacc (>= 5.0-5), junit,
- liboro-java, ant (>= 1.7), maven-repo-helper, libservlet3.0-java
-Standards-Version: 3.9.4
-Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/derby
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/derby
-Homepage: http://db.apache.org/derby/
-
-Package: libderbyclient-java
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: derby-tools, derby-doc
-Description: Apache Derby Client JDBC Driver
- The Derby network client provides network connectivity to the Derby Network
- Server. It is distributed as an additional jar file, derbyclient.jar, with an
- entirely independent code base from the embedded driver.
- .
- The Derby network client is a type 4, JDBC compliant Driver, which attempts
- to match the Derby Embedded JDBC driver as much as possible.
- .
- The Derby Network Server is provided by the derby-core package.
-
-Package: libderby-java
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: libservlet3.0-java
-Suggests: derby-doc
-Description: Apache Derby Database Engine and Embedded JDBC Driver
- Apache Derby is an open source relational database implemented entirely
- in Java.
- * Derby has a small footprint -- about 2.6 megabytes for the base engine and
- embedded JDBC driver.
- * Derby is based on the Java, JDBC, and SQL standards.
- * Derby provides an embedded JDBC driver that lets you embed Derby in any
- Java-based solution.
- * Derby also supports the more familiar client/server mode with the Derby
- Network Client JDBC driver and Derby Network Server.
- * Derby is easy to install, deploy, and use.
- .
- This package includes the database server, the embedded JDBC driver and
- localisations.
-
-Package: derby-tools
-Architecture: all
-Depends: ${misc:Depends}, libderby-java, libderbyclient-java, java-wrappers, default-jre | java6-runtime-headless
-Description: Apache Derby Tools
- The Derby tools and utilities are a set of routines supplied with Derby
- that are typically used to create, inspect, and update a Derby database.
- .
- These tools and utilities include:
- * NetworkServerControl, provides the ability to start a Network Server or
- connect to a running Network Server to shutdown, configure or retrieve
- diagnostic information.
- * ij, the Derby's interactive JDBC scripting tool. It is a simple utility
- for running scripts against a Derby database. You can also use it
- interactively to run ad hoc queries. ij provides several commands for ease
- in accessing a variety of JDBC features.
- ij can be used in an embedded or a client/server environment.
- * sysinfo, provides information about your version of Derby and your
- environment.
- * dblook, the Derby's Data Definition Language (DDL) Generation Utility,
- more informally called a schema dump tool. It is a simple utility that
- dumps the DDL of a user-specified database to either a console or a file.
- The generated DDL can then be used for such things as recreating all or
- parts of a database, viewing a subset of a database's objects (for example,
- those which pertain to specific tables and schemas), or documenting
- a database's schema.
- * SignatureChecker, a tool that identifies any SQL functions and procedures
- in a database that do not follow the SQL Standard argument matching rules.
- * PlanExporter, a tool to export query plan data for further analysis.
-
-Package: derby-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Description: Apache Derby API documentation and examples
- Apache Derby is an open source relational database implemented entirely
- in Java.
- .
- This package contains a Javadoc documenting the API and demo software
- for Apache Derby.
Copied: tags/derby/10.10.2.0-1/debian/control (from rev 18084, trunk/derby/debian/control)
===================================================================
--- tags/derby/10.10.2.0-1/debian/control (rev 0)
+++ tags/derby/10.10.2.0-1/debian/control 2014-04-28 11:23:35 UTC (rev 18088)
@@ -0,0 +1,95 @@
+Source: derby
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Tim Booth <tbooth at ceh.ac.uk>, Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: ant (>= 1.7),
+ debhelper (>= 9),
+ default-jdk,
+ javacc (>= 5.0-5),
+ junit,
+ liboro-java,
+ libservlet3.0-java,
+ maven-repo-helper
+Standards-Version: 3.9.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/derby
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/derby
+Homepage: http://db.apache.org/derby/
+
+Package: libderbyclient-java
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: derby-doc, derby-tools
+Description: Apache Derby Client JDBC Driver
+ The Derby network client provides network connectivity to the Derby Network
+ Server. It is distributed as an additional jar file, derbyclient.jar, with an
+ entirely independent code base from the embedded driver.
+ .
+ The Derby network client is a type 4, JDBC compliant Driver, which attempts
+ to match the Derby Embedded JDBC driver as much as possible.
+ .
+ The Derby Network Server is provided by the derby-core package.
+
+Package: libderby-java
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: libservlet3.0-java
+Suggests: derby-doc
+Description: Apache Derby Database Engine and Embedded JDBC Driver
+ Apache Derby is an open source relational database implemented entirely
+ in Java.
+ * Derby has a small footprint -- about 2.6 megabytes for the base engine and
+ embedded JDBC driver.
+ * Derby is based on the Java, JDBC, and SQL standards.
+ * Derby provides an embedded JDBC driver that lets you embed Derby in any
+ Java-based solution.
+ * Derby also supports the more familiar client/server mode with the Derby
+ Network Client JDBC driver and Derby Network Server.
+ * Derby is easy to install, deploy, and use.
+ .
+ This package includes the database server, the embedded JDBC driver and
+ localisations.
+
+Package: derby-tools
+Architecture: all
+Depends: default-jre | java6-runtime-headless,
+ java-wrappers,
+ libderby-java,
+ libderbyclient-java,
+ ${misc:Depends}
+Description: Apache Derby Tools
+ The Derby tools and utilities are a set of routines supplied with Derby
+ that are typically used to create, inspect, and update a Derby database.
+ .
+ These tools and utilities include:
+ * NetworkServerControl, provides the ability to start a Network Server or
+ connect to a running Network Server to shutdown, configure or retrieve
+ diagnostic information.
+ * ij, the Derby's interactive JDBC scripting tool. It is a simple utility
+ for running scripts against a Derby database. You can also use it
+ interactively to run ad hoc queries. ij provides several commands for ease
+ in accessing a variety of JDBC features.
+ ij can be used in an embedded or a client/server environment.
+ * sysinfo, provides information about your version of Derby and your
+ environment.
+ * dblook, the Derby's Data Definition Language (DDL) Generation Utility,
+ more informally called a schema dump tool. It is a simple utility that
+ dumps the DDL of a user-specified database to either a console or a file.
+ The generated DDL can then be used for such things as recreating all or
+ parts of a database, viewing a subset of a database's objects (for example,
+ those which pertain to specific tables and schemas), or documenting
+ a database's schema.
+ * SignatureChecker, a tool that identifies any SQL functions and procedures
+ in a database that do not follow the SQL Standard argument matching rules.
+ * PlanExporter, a tool to export query plan data for further analysis.
+
+Package: derby-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: Apache Derby API documentation and examples
+ Apache Derby is an open source relational database implemented entirely
+ in Java.
+ .
+ This package contains a Javadoc documenting the API and demo software
+ for Apache Derby.
Deleted: tags/derby/10.10.2.0-1/debian/copyright
===================================================================
--- trunk/derby/debian/copyright 2014-04-25 21:23:12 UTC (rev 18080)
+++ tags/derby/10.10.2.0-1/debian/copyright 2014-04-28 11:23:35 UTC (rev 18088)
@@ -1,34 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Apache Derby
-Source: http://db.apache.org/derby/
-
-Files: *
-Copyright: 2004-2012, 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
- 2012-2013, Tim Booth
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- 1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Copied: tags/derby/10.10.2.0-1/debian/copyright (from rev 18082, trunk/derby/debian/copyright)
===================================================================
--- tags/derby/10.10.2.0-1/debian/copyright (rev 0)
+++ tags/derby/10.10.2.0-1/debian/copyright 2014-04-28 11:23:35 UTC (rev 18088)
@@ -0,0 +1,34 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Derby
+Source: http://db.apache.org/derby/
+
+Files: *
+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-2014, Emmanuel Bourg
+ 2012-2013, Tim Booth
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Deleted: tags/derby/10.10.2.0-1/debian/orig-tar.sh
===================================================================
--- trunk/derby/debian/orig-tar.sh 2014-04-25 21:23:12 UTC (rev 18080)
+++ tags/derby/10.10.2.0-1/debian/orig-tar.sh 2014-04-28 11:23:35 UTC (rev 18088)
@@ -1,21 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-VERSION=$2
-TAR=../derby_$VERSION.orig.tar.gz
-DIR=db-derby-$VERSION-src
-
-tar -zxf $3
-rm $3
-GZIP=--best tar -c -z -f $TAR \
- --exclude '*.bat' \
- --exclude 'tools/java/*' \
- $DIR
-rm -rf $DIR
-rm -rf db-derby-$VERSION-doc-src
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
Copied: tags/derby/10.10.2.0-1/debian/orig-tar.sh (from rev 18081, trunk/derby/debian/orig-tar.sh)
===================================================================
--- tags/derby/10.10.2.0-1/debian/orig-tar.sh (rev 0)
+++ tags/derby/10.10.2.0-1/debian/orig-tar.sh 2014-04-28 11:23:35 UTC (rev 18088)
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+VERSION=$2
+TAR=../derby_$VERSION.orig.tar.xz
+DIR=db-derby-$VERSION-src
+
+tar -zxf $3
+rm $3
+XZ_OPT=--best tar -c -J -f $TAR \
+ --exclude '*.bat' \
+ --exclude 'tools/java/*' \
+ $DIR
+rm -rf $DIR
+rm -rf db-derby-$VERSION-doc-src
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
+fi
Deleted: tags/derby/10.10.2.0-1/debian/patches/javacc5.diff
===================================================================
--- trunk/derby/debian/patches/javacc5.diff 2014-04-25 21:23:12 UTC (rev 18080)
+++ tags/derby/10.10.2.0-1/debian/patches/javacc5.diff 2014-04-28 11:23:35 UTC (rev 18088)
@@ -1,93 +0,0 @@
-Patch from upstream - https://issues.apache.org/jira/secure/attachment/12473505/javacc5.diff
---- 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)
---- 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)
---- /dev/null
-+++ b/java/engine/org/apache/derby/impl/sql/compile/TokenBase.java
-@@ -0,0 +1,35 @@
-+/*
-+
-+Derby - Class org.apache.derby.impl.sql.compile.Token
-+
-+Licensed to the Apache Software Foundation (ASF) under one or more
-+contributor license agreements. See the NOTICE file distributed with
-+this work for additional information regarding copyright ownership.
-+The ASF licenses this file to you under the Apache License, 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.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+See the License for the specific language governing permissions and
-+limitations under the License.
-+
-+*/
-+
-+package org.apache.derby.impl.sql.compile;
-+
-+/**
-+ * Base class for the Token class generated by JavaCC.
-+ */
-+abstract class TokenBase {
-+ /**
-+ * beginOffset and endOffset are useful for siphoning substrings out of
-+ * the Statement so that we can recompile the substrings at upgrade time.
-+ * For instance, VIEW definitions and the Restrictions on Published Tables
-+ * need to be recompiled at upgrade time.
-+ */
-+ int beginOffset, endOffset;
-+}
---- 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)
---- 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.
-@@ -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>
-
Copied: tags/derby/10.10.2.0-1/debian/patches/javacc5.diff (from rev 18082, trunk/derby/debian/patches/javacc5.diff)
===================================================================
--- tags/derby/10.10.2.0-1/debian/patches/javacc5.diff (rev 0)
+++ tags/derby/10.10.2.0-1/debian/patches/javacc5.diff 2014-04-28 11:23:35 UTC (rev 18088)
@@ -0,0 +1,93 @@
+Patch from upstream - https://issues.apache.org/jira/secure/attachment/12473505/javacc5.diff
+--- 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)
+--- 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)
+--- /dev/null
++++ b/java/engine/org/apache/derby/impl/sql/compile/TokenBase.java
+@@ -0,0 +1,35 @@
++/*
++
++Derby - Class org.apache.derby.impl.sql.compile.Token
++
++Licensed to the Apache Software Foundation (ASF) under one or more
++contributor license agreements. See the NOTICE file distributed with
++this work for additional information regarding copyright ownership.
++The ASF licenses this file to you under the Apache License, 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.apache.org/licenses/LICENSE-2.0
++
++Unless required by applicable law or agreed to in writing, software
++distributed under the License is distributed on an "AS IS" BASIS,
++WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++See the License for the specific language governing permissions and
++limitations under the License.
++
++*/
++
++package org.apache.derby.impl.sql.compile;
++
++/**
++ * Base class for the Token class generated by JavaCC.
++ */
++abstract class TokenBase {
++ /**
++ * beginOffset and endOffset are useful for siphoning substrings out of
++ * the Statement so that we can recompile the substrings at upgrade time.
++ * For instance, VIEW definitions and the Restrictions on Published Tables
++ * need to be recompiled at upgrade time.
++ */
++ int beginOffset, endOffset;
++}
+--- 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)
+--- 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.
+@@ -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>
+
Deleted: tags/derby/10.10.2.0-1/debian/patches/series
===================================================================
--- trunk/derby/debian/patches/series 2014-04-25 21:23:12 UTC (rev 18080)
+++ tags/derby/10.10.2.0-1/debian/patches/series 2014-04-28 11:23:35 UTC (rev 18088)
@@ -1,2 +0,0 @@
-stop_ant_fetching
-javacc5.diff
Copied: tags/derby/10.10.2.0-1/debian/patches/series (from rev 18082, trunk/derby/debian/patches/series)
===================================================================
--- tags/derby/10.10.2.0-1/debian/patches/series (rev 0)
+++ tags/derby/10.10.2.0-1/debian/patches/series 2014-04-28 11:23:35 UTC (rev 18088)
@@ -0,0 +1 @@
+javacc5.diff
Deleted: tags/derby/10.10.2.0-1/debian/patches/stop_ant_fetching
===================================================================
--- trunk/derby/debian/patches/stop_ant_fetching 2014-04-25 21:23:12 UTC (rev 18080)
+++ tags/derby/10.10.2.0-1/debian/patches/stop_ant_fetching 2014-04-28 11:23:35 UTC (rev 18088)
@@ -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>
-
- <!-- ==================================================================== -->
Deleted: tags/derby/10.10.2.0-1/debian/rules
===================================================================
--- trunk/derby/debian/rules 2014-04-25 21:23:12 UTC (rev 18080)
+++ tags/derby/10.10.2.0-1/debian/rules 2014-04-28 11:23:35 UTC (rev 18088)
@@ -1,65 +0,0 @@
-#!/usr/bin/make -f
-
-# 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
-
-pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-version=$(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 -d' ' | sed 's/[-+].*//' )
-
-%:
- dh $@
-
-override_dh_auto_clean:
- mh_clean
- ant clobber
- # Totally remove jars and javadoc directory
- rm -rf jars javadoc tools/java/*
- # Other bits
- rm -f *.log
- cd java/demo/toursdb/ ; rm -rf *generated* ToursDB_schema.sql loadTables.sql
- rm -f java/engine/org/apache/derby/impl/sql/compile/Token.java
-
-override_dh_auto_build:
- #Put .jar files in place
- cat /usr/share/java/oro.jar > tools/java/jakarta-oro-2.0.8.jar
- cat /usr/share/java/javacc.jar > tools/java/javacc.jar
- cat /usr/share/java/junit.jar > tools/java/junit.jar
-
- ant buildsource buildjars binscripts javadoc
-
-override_dh_installdocs:
- rm -Rf javadoc/testing
- dh_installdocs
-
-override_dh_test:
- env CLASSPATH=`echo jars/insane/*.jar | tr ' ' ':'` \
- java org.apache.derby.tools.sysinfo
- ant all
-
-override_dh_compress:
- # Disable the compression of the individual files in the documentation package
- dh_compress -pderby-doc -X .java -X .xml -X .txt -X .sql
- dh_compress -Nderby-doc
-
-override_dh_auto_install:
- mh_install -plibderbyclient-java -e$(version)
-
- mh_install -plibderby-java -e$(version)
- dh_installchangelogs -plibderby-java RELEASE-NOTES.html
-
- mh_install -pderby-tools -e$(version)
- mkdir -p debian/derby-tools/usr/share/derby
- install -m 755 debian/wrappers/ij debian/derby-tools/usr/share/derby
- install -m 755 debian/wrappers/dblook debian/derby-tools/usr/share/derby
- install -m 755 debian/wrappers/sysinfo debian/derby-tools/usr/share/derby
- install -m 755 debian/wrappers/NetworkServerControl debian/derby-tools/usr/share/derby
- install -m 755 debian/wrappers/PlanExporter debian/derby-tools/usr/share/derby
- install -m 755 debian/wrappers/SignatureChecker debian/derby-tools/usr/share/derby
- dh_link -pderby-tools usr/share/derby/ij usr/bin/ij
- dh_link -pderby-tools usr/share/derby/dblook usr/bin/dblook
- dh_link -pderby-tools usr/share/derby/NetworkServerControl usr/bin/derbyctl
-
-get-orig-source:
- uscan --force-download --download-version $(version)
Copied: tags/derby/10.10.2.0-1/debian/rules (from rev 18082, trunk/derby/debian/rules)
===================================================================
--- tags/derby/10.10.2.0-1/debian/rules (rev 0)
+++ tags/derby/10.10.2.0-1/debian/rules 2014-04-28 11:23:35 UTC (rev 18088)
@@ -0,0 +1,65 @@
+#!/usr/bin/make -f
+
+# 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 -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/[-+].*//' )
+
+%:
+ dh $@
+
+override_dh_auto_clean:
+ mh_clean
+ ant clobber
+ # Totally remove jars and javadoc directory
+ rm -rf jars javadoc tools/java/*
+ # Other bits
+ rm -f *.log
+ cd java/demo/toursdb/ ; rm -rf *generated* ToursDB_schema.sql loadTables.sql
+ rm -f java/engine/org/apache/derby/impl/sql/compile/Token.java
+
+override_dh_auto_build:
+ #Put .jar files in place
+ cat /usr/share/java/oro.jar > tools/java/jakarta-oro-2.0.8.jar
+ cat /usr/share/java/javacc.jar > tools/java/javacc.jar
+ cat /usr/share/java/junit.jar > tools/java/junit.jar
+
+ ant buildsource buildjars binscripts javadoc
+
+override_dh_installdocs:
+ rm -Rf javadoc/testing
+ dh_installdocs
+
+override_dh_test:
+ env CLASSPATH=`echo jars/insane/*.jar | tr ' ' ':'` \
+ java org.apache.derby.tools.sysinfo
+ ant all
+
+override_dh_compress:
+ # Disable the compression of the individual files in the documentation package
+ dh_compress -pderby-doc -X .java -X .xml -X .txt -X .sql
+ dh_compress -Nderby-doc
+
+override_dh_auto_install:
+ mh_install -plibderbyclient-java -e$(version)
+
+ mh_install -plibderby-java -e$(version)
+ dh_installchangelogs -plibderby-java RELEASE-NOTES.html
+
+ mh_install -pderby-tools -e$(version)
+ mkdir -p debian/derby-tools/usr/share/derby
+ install -m 755 debian/wrappers/ij debian/derby-tools/usr/share/derby
+ install -m 755 debian/wrappers/dblook debian/derby-tools/usr/share/derby
+ install -m 755 debian/wrappers/sysinfo debian/derby-tools/usr/share/derby
+ install -m 755 debian/wrappers/NetworkServerControl debian/derby-tools/usr/share/derby
+ install -m 755 debian/wrappers/PlanExporter debian/derby-tools/usr/share/derby
+ install -m 755 debian/wrappers/SignatureChecker debian/derby-tools/usr/share/derby
+ dh_link -pderby-tools usr/share/derby/ij usr/bin/ij
+ dh_link -pderby-tools usr/share/derby/dblook usr/bin/dblook
+ dh_link -pderby-tools usr/share/derby/NetworkServerControl usr/bin/derbyctl
+
+get-orig-source:
+ uscan --force-download --download-version $(version)
More information about the pkg-java-commits
mailing list