[med-svn] r13102 - in trunk/packages: . apache-derby apache-derby/trunk apache-derby/trunk/debian apache-derby/trunk/debian/apache-derby-java-lib apache-derby/trunk/debian/apache-derby-java-lib/usr apache-derby/trunk/debian/apache-derby-java-lib/usr/share apache-derby/trunk/debian/apache-derby-java-lib/usr/share/doc apache-derby/trunk/debian/patches
Timothy Booth
tbooth-guest at alioth.debian.org
Sun Feb 24 16:16:51 UTC 2013
Author: tbooth-guest
Date: 2013-02-24 16:16:50 +0000 (Sun, 24 Feb 2013)
New Revision: 13102
Added:
trunk/packages/apache-derby/
trunk/packages/apache-derby/trunk/
trunk/packages/apache-derby/trunk/debian/
trunk/packages/apache-derby/trunk/debian/apache-derby-client.install
trunk/packages/apache-derby/trunk/debian/apache-derby-client.links
trunk/packages/apache-derby/trunk/debian/apache-derby-core.links
trunk/packages/apache-derby/trunk/debian/apache-derby-java-lib/
trunk/packages/apache-derby/trunk/debian/apache-derby-java-lib/DEBIAN/
trunk/packages/apache-derby/trunk/debian/apache-derby-java-lib/usr/
trunk/packages/apache-derby/trunk/debian/apache-derby-java-lib/usr/share/
trunk/packages/apache-derby/trunk/debian/apache-derby-java-lib/usr/share/doc/
trunk/packages/apache-derby/trunk/debian/apache-derby-java-lib/usr/share/doc/apache-derby-java-lib/
trunk/packages/apache-derby/trunk/debian/changelog
trunk/packages/apache-derby/trunk/debian/compat
trunk/packages/apache-derby/trunk/debian/control
trunk/packages/apache-derby/trunk/debian/copyright
trunk/packages/apache-derby/trunk/debian/get-orig-source
trunk/packages/apache-derby/trunk/debian/patches/
trunk/packages/apache-derby/trunk/debian/patches/series
trunk/packages/apache-derby/trunk/debian/patches/stop_ant_fetching
trunk/packages/apache-derby/trunk/debian/patches/work_with_newer_javacc
trunk/packages/apache-derby/trunk/debian/rules
trunk/packages/apache-derby/trunk/debian/upstream
trunk/packages/apache-derby/trunk/debian/watch
Log:
This is a work in progress.
I need to finish it, test it, and reply to the original ITP bug saying I've done
the work.
But it does build, and here is an initial commit for safekeeping.
Added: trunk/packages/apache-derby/trunk/debian/apache-derby-client.install
===================================================================
--- trunk/packages/apache-derby/trunk/debian/apache-derby-client.install (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/apache-derby-client.install 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1 @@
+jars/insane/derbyclient-*.jar /usr/share/java
Added: trunk/packages/apache-derby/trunk/debian/apache-derby-client.links
===================================================================
--- trunk/packages/apache-derby/trunk/debian/apache-derby-client.links (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/apache-derby-client.links 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1 @@
+/usr/share/java/derbyclient-*.jar /usr/share/java/derbyclient.jar
Added: trunk/packages/apache-derby/trunk/debian/apache-derby-core.links
===================================================================
--- trunk/packages/apache-derby/trunk/debian/apache-derby-core.links (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/apache-derby-core.links 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1 @@
+/usr/share/java/derby-*.jar /usr/share/java/derby.jar
Added: trunk/packages/apache-derby/trunk/debian/changelog
===================================================================
--- trunk/packages/apache-derby/trunk/debian/changelog (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/changelog 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1,8 @@
+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
+ * (TODO - remember to clean out tarball before upload)
+
+ -- Tim Booth <tbooth at ceh.ac.uk> Sun, 24 Feb 2013 09:02:48 +0000
Added: trunk/packages/apache-derby/trunk/debian/compat
===================================================================
--- trunk/packages/apache-derby/trunk/debian/compat (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/compat 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1 @@
+9
Added: trunk/packages/apache-derby/trunk/debian/control
===================================================================
--- trunk/packages/apache-derby/trunk/debian/control (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/control 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1,98 @@
+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, junit, liboro-java
+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: 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
+Suggests: apache-derby-core, apache-derby-client, apache-derby-doc, 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-docs,
+ 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-core, apache-derby-client, apache-derby-doc, 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: 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: 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/packages/apache-derby/trunk/debian/copyright
===================================================================
--- trunk/packages/apache-derby/trunk/debian/copyright (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/copyright 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1,11 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: <pkg>
+Source: <path_to_download>
+
+Files: *
+Copyright: © 20xx-20yy <upstream>
+License: <license>
+
+Files: debian/*
+Copyright: © 2012 Andreas Tille <tille at debian.org>
+License: <license>
Added: trunk/packages/apache-derby/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/apache-derby/trunk/debian/get-orig-source (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/get-orig-source 2013-02-24 16:16:50 UTC (rev 13102)
@@ -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/packages/apache-derby/trunk/debian/get-orig-source
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/packages/apache-derby/trunk/debian/patches/series
===================================================================
--- trunk/packages/apache-derby/trunk/debian/patches/series (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/patches/series 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1 @@
+work_with_newer_javacc
Added: trunk/packages/apache-derby/trunk/debian/patches/stop_ant_fetching
===================================================================
--- trunk/packages/apache-derby/trunk/debian/patches/stop_ant_fetching (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/patches/stop_ant_fetching 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1,11 @@
+--- a/build.xml
++++ b/build.xml
+@@ -200,7 +200,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/packages/apache-derby/trunk/debian/patches/work_with_newer_javacc
===================================================================
--- trunk/packages/apache-derby/trunk/debian/patches/work_with_newer_javacc (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/patches/work_with_newer_javacc 2013-02-24 16:16:50 UTC (rev 13102)
@@ -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/packages/apache-derby/trunk/debian/rules
===================================================================
--- trunk/packages/apache-derby/trunk/debian/rules (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/rules 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1,44 @@
+#!/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' ' | cut -f1 -d- )
+
+%:
+ dh $@
+
+override_dh_auto_clean:
+ ant clobber
+ # Restore build.xml files
+ find -name 'build.xml.orig' -execdir mv '{}' build.xml ';'
+ # Totally remove jars directory
+ rm -rf jars
+ # Remove any .jars or dot files
+ find -name debian -prune -or -name '.svn' -execdir rm -rf '{}' ';' -prune
+ find -name debian -prune -or -name '.git*' -execdir rm -rf '{}' ';' -prune
+ find -name debian -prune -or -name '*.jar' -execdir rm '{}' ';'
+
+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
+ #Munge the build files.
+ sed -i.orig 's/"1.4"/"5"/g' `find -name build.xml`
+ #And build
+ ant buildsource
+ ant buildjars
+ #Rename jars with versions
+ for f in jars/*/*.jar ; do \
+ mv $$f `echo $$f | sed 's/\./-${version}./'` ; \
+ done
+
+override_dh_install:
+ dh_install -X.bat
+
+get-orig-source:
+ . debian/get-orig-source
Property changes on: trunk/packages/apache-derby/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/packages/apache-derby/trunk/debian/upstream
===================================================================
--- trunk/packages/apache-derby/trunk/debian/upstream (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/upstream 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1,12 @@
+Reference:
+ Author:
+ Title:
+ Journal:
+ Year:
+ Volume:
+ Number:
+ Pages:
+ DOI:
+ PMID:
+ URL:
+ eprint:
Added: trunk/packages/apache-derby/trunk/debian/watch
===================================================================
--- trunk/packages/apache-derby/trunk/debian/watch (rev 0)
+++ trunk/packages/apache-derby/trunk/debian/watch 2013-02-24 16:16:50 UTC (rev 13102)
@@ -0,0 +1,22 @@
+version=3
+
+# Uncomment to examine a Webpage
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/#PACKAGE#-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/#PACKAGE#-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge
+# http://sf.net/#PACKAGE#/#PACKAGE#-(\d[\d\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+
+# Uncomment to find new files on GooglePages
+# http://code.google.com/p/#PACKAGE#/downloads/list?can=1 \
+# .*/#PACKAGE#-([-.\d]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))|zip)
+
+# if tweaking of source is needed
+# \
+# debian debian/get-orig-source
More information about the debian-med-commit
mailing list