[pkg-java] r16839 - in trunk/derby: . debian debian/patches debian/source
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Jun 6 17:01:33 UTC 2013
Author: ebourg-guest
Date: 2013-06-06 17:01:32 +0000 (Thu, 06 Jun 2013)
New Revision: 16839
Added:
trunk/derby/debian/
trunk/derby/debian/README.source
trunk/derby/debian/ant.properties
trunk/derby/debian/apache-derby-client.install
trunk/derby/debian/apache-derby-common.docs
trunk/derby/debian/apache-derby-core.install
trunk/derby/debian/apache-derby-demo.docs
trunk/derby/debian/apache-derby-javadoc.docs
trunk/derby/debian/changelog
trunk/derby/debian/compat
trunk/derby/debian/control
trunk/derby/debian/copyright
trunk/derby/debian/get-orig-source
trunk/derby/debian/patches/
trunk/derby/debian/patches/javacc5.diff
trunk/derby/debian/patches/series
trunk/derby/debian/patches/stop_ant_fetching
trunk/derby/debian/patches/work_with_newer_javacc
trunk/derby/debian/rules
trunk/derby/debian/source/
trunk/derby/debian/source/format
trunk/derby/debian/upstream
trunk/derby/debian/watch
Log:
Importing package developed by Tim Booth <tbooth at ceh.ac.uk>
svn://svn.debian.org/svn/debian-med/trunk/packages/apache-derby
Added: trunk/derby/debian/README.source
===================================================================
--- trunk/derby/debian/README.source (rev 0)
+++ trunk/derby/debian/README.source 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,20 @@
+# This packaging effort has been tried before and stalled.
+
+See:
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=617425
+
+Then see:
+https://issues.apache.org/jira/browse/DERBY-5125
+
+I need to patch up JavaCC, but after that we should be OK to
+proceed.
+
+Structure of packages based on:
+
+http://packages.ubuntu.com/source/quantal/sun-javadb
+
+Documentation is in the download but needs DITA to compile it
+http://prdownloads.sourceforge.net/dita-ot/DITA-OT1.1.2.1_bin-ASL.zip?download
+and apparently it has to be this specific version and no other.
+I could package this, or I could shove it into the tarball, but neither is
+much fun.
Added: trunk/derby/debian/ant.properties
===================================================================
--- trunk/derby/debian/ant.properties (rev 0)
+++ trunk/derby/debian/ant.properties 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,4 @@
+# This file should be read by ant because home is set to the debian dir.
+sane=false
+deprecation=off
+junit=/usr/share/java/junit.jar
Added: trunk/derby/debian/apache-derby-client.install
===================================================================
--- trunk/derby/debian/apache-derby-client.install (rev 0)
+++ trunk/derby/debian/apache-derby-client.install 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1 @@
+jars/*sane/derbyclient-*.jar /usr/share/apache-derby
Added: trunk/derby/debian/apache-derby-common.docs
===================================================================
--- trunk/derby/debian/apache-derby-common.docs (rev 0)
+++ trunk/derby/debian/apache-derby-common.docs 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,6 @@
+published_api_overview.html
+releaseSummary.xml
+README
+NOTICE
+RELEASE-NOTES.html
+index.html
Added: trunk/derby/debian/apache-derby-core.install
===================================================================
--- trunk/derby/debian/apache-derby-core.install (rev 0)
+++ trunk/derby/debian/apache-derby-core.install 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,8 @@
+bin/set*CP /usr/lib/apache-derby/bin
+generated/bin/* /usr/lib/apache-derby/bin
+jars/*sane/derby-*.jar /usr/share/apache-derby
+jars/*sane/derby.war /usr/share/apache-derby
+jars/*sane/derbyLocale*.jar /usr/share/apache-derby
+jars/*sane/derbynet.jar /usr/share/apache-derby
+jars/*sane/derbyrun.jar /usr/share/apache-derby
+jars/*sane/derbytools.jar /usr/share/apache-derby
Added: trunk/derby/debian/apache-derby-demo.docs
===================================================================
--- trunk/derby/debian/apache-derby-demo.docs (rev 0)
+++ trunk/derby/debian/apache-derby-demo.docs 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1 @@
+java/demo
Added: trunk/derby/debian/apache-derby-javadoc.docs
===================================================================
--- trunk/derby/debian/apache-derby-javadoc.docs (rev 0)
+++ trunk/derby/debian/apache-derby-javadoc.docs 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1 @@
+javadoc
Added: trunk/derby/debian/changelog
===================================================================
--- trunk/derby/debian/changelog (rev 0)
+++ trunk/derby/debian/changelog 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,24 @@
+apache-derby (10.10.1.1+repack-0ubuntu2) precise; urgency=low
+
+ * New upstream
+ * The docs are back, but I had to repack the tarball to
+ keep quilt happy, and I can't build the docs without
+ external stuff anyway.
+ * Ensure +repack doesn't end up in the .jar versions
+
+ -- Tim Booth <tbooth at ceh.ac.uk> Tue, 04 Jun 2013 17:06:57 +0100
+
+apache-derby (10.9.1.0-0ubuntu2) precise; urgency=low
+
+ * Fix find invocation in cleanup
+
+ -- Tim Booth <tbooth at ceh.ac.uk> Mon, 08 Apr 2013 18:24:56 +0100
+
+apache-derby (10.9.1.0-0ubuntu1) precise; urgency=low
+
+ * Initial release (Closes: 617425)
+ * Pull from SVN by tag
+ * Patch to work with newer javacc (needs patched javacc)
+ * (TODO - remember to clean out tarball before upload)
+
+ -- Tim Booth <tbooth at ceh.ac.uk> Fri, 05 Apr 2013 17:00:14 +0100
Added: trunk/derby/debian/compat
===================================================================
--- trunk/derby/debian/compat (rev 0)
+++ trunk/derby/debian/compat 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1 @@
+9
Added: trunk/derby/debian/control
===================================================================
--- trunk/derby/debian/control (rev 0)
+++ trunk/derby/debian/control 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,99 @@
+Source: apache-derby
+Section: science
+Priority: optional
+Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+Uploaders: Tim Booth <tbooth at ceh.ac.uk>
+Build-Depends: debhelper (>= 9), default-jdk, javacc ( >= 5.0-5fix1 ) , junit, liboro-java, ant ( >= 1.7 )
+Standards-Version: 3.9.3
+Homepage: http://db.apache.org/derby/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/apache-derby/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/apache-derby/trunk/
+
+Package: apache-derby-client
+Architecture: all
+Section: libs
+Priority: optional
+Depends: ${misc:Depends}, apache-derby-common, default-jre | java6-runtime
+Description: Apache Derby client
+ Client for Apache Derby.
+ .
+ The client connects to a remote, local or embedded Apache Derby network server.
+ The server software comes with the apache-derby-core package.
+ .
+ This is a free version of the libraries provided by sun-javadb-client
+
+Package: apache-derby-common
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: apache-derby-core, apache-derby-client, apache-derby-javadoc, apache-derby-demo
+Description: Embeddable relational database for Java, common files
+ 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 contains common information about Apache Derby. The file
+ index.html introduces the product and has references to further
+ documentation, some of which is in the packages,
+ apache-derby-javadoc and apache-derby-demo.
+ .
+ This is a free version of the libraries provided by sun-javadb-common
+
+Package: apache-derby-core
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache-derby-common
+Suggests: apache-derby-client, apache-derby, apache-derby-javadoc, apache-derby-demo
+Description: Embeddable relational database for Java, core
+ 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 JDBC driver, utilities and
+ localisations.
+ .
+ This is a free version of the libraries provided by sun-javadb-core
+
+Package: apache-derby-demo
+Architecture: all
+Section: devel
+Priority: optional
+Depends: ${misc:Depends}, apache-derby-common, default-jre | java6-runtime
+Description: Apache Derby demo
+ Demo software for Apache Derby.
+ .
+ This package contains sample programs, database and templates.
+ .
+ This is a free version of the libraries provided by sun-javadb-demo
+
+#Package: apache-derby-doc
+#Architecture: all
+#Depends: ${shlibs:Depends}, ${misc:Depends}, apache-derby-common
+#Description: Embeddable relational database for Java, documentation
+# Documentation for Apache Derby.
+# .
+# This package contains user documentation in both HTML and PDF formats.
+# .
+# This is a free version of the libraries provided by sun-javadb-doc
+
+Package: apache-derby-javadoc
+Architecture: all
+Section: devel
+Priority: optional
+Depends: ${misc:Depends}, apache-derby-common
+Description: Apache Derby javadoc
+ javadoc for Apache Derby
+ .
+ This package documents the API for JDBC.
+ .
+ This is a free version of the library provided by sun-javadb-javadoc
Added: trunk/derby/debian/copyright
===================================================================
--- trunk/derby/debian/copyright (rev 0)
+++ trunk/derby/debian/copyright 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,11 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Derby
+Source: http://db.apache.org/derby/derby_downloads.html
+
+Files: *
+Copyright: © The Derby Developers
+License: Apache License
+
+Files: debian/*
+Copyright: © 2012 Tim Booth
+License: Simplified BSD
Added: trunk/derby/debian/get-orig-source
===================================================================
--- trunk/derby/debian/get-orig-source (rev 0)
+++ trunk/derby/debian/get-orig-source 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,60 @@
+#!/bin/sh
+# if you need to repack for whatever reason you can
+# use this script via uscan or directly
+#
+# FIXME: currently the code is not conform to Debian Policy
+# http://www.debian.org/doc/debian-policy/ch-source.html
+# "get-orig-source (optional)"
+# This target may be invoked in any directory, ...
+# --> currently it is assumed the script is called in the
+# source directory featuring the debian/ dir
+
+COMPRESS=bz2
+
+set -e
+test -e debian/control
+NAME=`dpkg-parsechangelog | awk '/^Source/ { print $2 }'`
+
+SVN=http://svn.apache.org/repos/asf/db/derby/code/tags
+
+if ! echo $@ | grep -q upstream-version ; then
+ VERSION=`dpkg-parsechangelog | awk '/^Version:/ { print $2 }' | sed 's/\([0-9\.]\+\)-[0-9]\+$/\1/'`
+
+ VERSION=`svn ls $SVN | tail -n1 | sed 's/\/$//'`
+else
+ VERSION=`echo $@ | sed "s?^.*--upstream-version \([0-9.]\+\) .*${NAME}.*?\1?"`
+ if echo "$VERSION" | grep -q "upstream-version" ; then
+ echo "Unable to parse version number"
+ exit
+ fi
+fi
+
+if [ -e ../${NAME}-${VERSION}.orig.tar.$COMPRESS ] ; then
+ echo "The tarball already exists."
+ false
+fi
+
+TARDIR=${NAME}-${VERSION}
+mkdir -p ../tarballs
+cd ../tarballs
+# need to clean up the tarballs dir first because upstream tarball might
+# contain a directory with unpredictable name
+# rm -rf *
+
+# Get from svn
+svn co "$SVN"/"$VERSION"
+
+UPSTREAMTARDIR=`find . -mindepth 1 -maxdepth 1 -type d`
+if [ "${UPSTREAMTARDIR}" != "./${TARDIR}" ] ; then
+ echo mv "${UPSTREAMTARDIR}" "${TARDIR}"
+ mv "${UPSTREAMTARDIR}" "${TARDIR}"
+fi
+
+# Remove useless binaries and .svn
+#find "${TARDIR}" -name '.*' -exec rm -rf '{}' ';' -prune
+#find "${TARDIR}" -name '*.jar' -exec rm '{}' ';'
+
+GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.${COMPRESS} "${TARDIR}"
+#rm -rf ${TARDIR}
+
+ln -s tarballs/"$NAME"_"$VERSION".orig.tar.${COMPRESS} ..
Property changes on: trunk/derby/debian/get-orig-source
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/derby/debian/patches/javacc5.diff
===================================================================
--- trunk/derby/debian/patches/javacc5.diff (rev 0)
+++ trunk/derby/debian/patches/javacc5.diff 2013-06-06 17:01:32 UTC (rev 16839)
@@ -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>
+
Added: trunk/derby/debian/patches/series
===================================================================
--- trunk/derby/debian/patches/series (rev 0)
+++ trunk/derby/debian/patches/series 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,2 @@
+stop_ant_fetching
+javacc5.diff
Added: trunk/derby/debian/patches/stop_ant_fetching
===================================================================
--- trunk/derby/debian/patches/stop_ant_fetching (rev 0)
+++ trunk/derby/debian/patches/stop_ant_fetching 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,11 @@
+--- 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>
+
+ <!-- ==================================================================== -->
Added: trunk/derby/debian/patches/work_with_newer_javacc
===================================================================
--- trunk/derby/debian/patches/work_with_newer_javacc (rev 0)
+++ trunk/derby/debian/patches/work_with_newer_javacc 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,11 @@
+--- a/java/engine/org/apache/derby/impl/sql/compile/Token.java
++++ b/java/engine/org/apache/derby/impl/sql/compile/Token.java
+@@ -98,7 +98,7 @@
+ * to the following switch statement. Then you can cast matchedToken
+ * variable to the appropriate type and use it in your lexical actions.
+ */
+- public static final Token newToken(int ofKind)
++ public static final Token newToken(int ofKind, String curTokenImage)
+ {
+ switch(ofKind)
+ {
Added: trunk/derby/debian/rules
===================================================================
--- trunk/derby/debian/rules (rev 0)
+++ trunk/derby/debian/rules 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,66 @@
+#!/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:
+ ant clobber
+ # Totally remove jars and javadoc directory
+ rm -rf jars javadoc
+ # Remove any .jars or dot files
+ find -name debian -prune -or -name '.svn' -prune -execdir rm -rf '{}' ';'
+ find -name debian -prune -or -name '.git*' -prune -execdir rm -rf '{}' ';'
+ find -name debian -prune -or -name '*.jar' -execdir rm '{}' ';'
+ find -name debian -prune -or -name 'derby.log' -execdir rm '{}' ';'
+ # Other bits
+ rm -f *.log
+ cd java/demo/toursdb/ ; rm -rf *generated* ToursDB_schema.sql loadTables.sql
+
+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
+ #Remove file that breaks the build
+ rm -f java/engine/org/apache/derby/impl/sql/compile/Token.java
+ #And build
+ ant buildsource
+ ant buildjars
+ ant binscripts
+ #Rename jars with versions
+ for f in jars/*/derbyclient.jar jars/*/derby.jar ; do \
+ mv $$f `echo $$f | sed 's/\./-${version}./'` ; \
+ done
+ #And docs
+ ant javadoc
+
+override_dh_install:
+ dh_install -X.bat
+ chmod a+x debian/apache-derby-core/usr/lib/apache-derby/bin/*
+
+override_dh_test:
+ env CLASSPATH=`echo jars/insane/*.jar | tr ' ' ':'` \
+ java org.apache.derby.tools.sysinfo
+ ant all
+
+#Moved symlink stuff here so it works after version change
+override_dh_link:
+ dh_link -papache-derby-client /usr/share/apache-derby/derbyclient-$(version).jar /usr/share/java/derbyclient-$(version).jar
+ dh_link -papache-derby-client /usr/share/java/derbyclient-$(version).jar /usr/share/java/derbyclient.jar
+ #.
+ dh_link -papache-derby-core /usr/share/apache-derby/derby-$(version).jar /usr/share/apache-derby/derby-$(version).jar
+ dh_link -papache-derby-core /usr/share/apache-derby/derby-$(version).jar /usr/share/java/derby-$(version).jar
+ dh_link -papache-derby-core /usr/share/java/derby-$(version).jar /usr/share/java/derby.jar
+ #.
+ dh_link --verbose
+
+get-orig-source:
+ . debian/get-orig-source
Property changes on: trunk/derby/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/derby/debian/source/format
===================================================================
--- trunk/derby/debian/source/format (rev 0)
+++ trunk/derby/debian/source/format 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/derby/debian/upstream
===================================================================
--- trunk/derby/debian/upstream (rev 0)
+++ trunk/derby/debian/upstream 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,12 @@
+Reference:
+ Author:
+ Title:
+ Journal:
+ Year:
+ Volume:
+ Number:
+ Pages:
+ DOI:
+ PMID:
+ URL:
+ eprint:
Added: trunk/derby/debian/watch
===================================================================
--- trunk/derby/debian/watch (rev 0)
+++ trunk/derby/debian/watch 2013-06-06 17:01:32 UTC (rev 16839)
@@ -0,0 +1,3 @@
+version=3
+
+http://www.mirrorservice.org/sites/ftp.apache.org//db/derby/db-derby-([0-9.]+)/db-derby-([0-9.]+)-src.tar.gz
More information about the pkg-java-commits
mailing list