Author: tbooth-guest Date: 2013-06-06 14:28:34 +0000 (Thu, 06 Jun 2013) New Revision: 13853
Modified: trunk/packages/apache-derby/trunk/debian/README.source trunk/packages/apache-derby/trunk/debian/changelog trunk/packages/apache-derby/trunk/debian/control trunk/packages/apache-derby/trunk/debian/copyright trunk/packages/apache-derby/trunk/debian/patches/stop_ant_fetching trunk/packages/apache-derby/trunk/debian/rules Log: Updates forr derby 10.10.1.1 Modified: trunk/packages/apache-derby/trunk/debian/README.source =================================================================== --- trunk/packages/apache-derby/trunk/debian/README.source 2013-06-06 10:51:48 UTC (rev 13852) +++ trunk/packages/apache-derby/trunk/debian/README.source 2013-06-06 14:28:34 UTC (rev 13853) @@ -6,9 +6,15 @@ Then see: https://issues.apache.org/jira/browse/DERBY-5125 -It looks like I need to patch up JavaCC, but after that we should be OK to +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. Modified: trunk/packages/apache-derby/trunk/debian/changelog =================================================================== --- trunk/packages/apache-derby/trunk/debian/changelog 2013-06-06 10:51:48 UTC (rev 13852) +++ trunk/packages/apache-derby/trunk/debian/changelog 2013-06-06 14:28:34 UTC (rev 13853) @@ -1,3 +1,13 @@ +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 <[email protected]> Tue, 04 Jun 2013 17:06:57 +0100 + apache-derby (10.9.1.0-0ubuntu2) precise; urgency=low * Fix find invocation in cleanup Modified: trunk/packages/apache-derby/trunk/debian/control =================================================================== --- trunk/packages/apache-derby/trunk/debian/control 2013-06-06 10:51:48 UTC (rev 13852) +++ trunk/packages/apache-derby/trunk/debian/control 2013-06-06 14:28:34 UTC (rev 13853) @@ -76,16 +76,15 @@ . This is a free version of the libraries provided by sun-javadb-demo -# Docs no longer in upstream tarball -# 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-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 Modified: trunk/packages/apache-derby/trunk/debian/copyright =================================================================== --- trunk/packages/apache-derby/trunk/debian/copyright 2013-06-06 10:51:48 UTC (rev 13852) +++ trunk/packages/apache-derby/trunk/debian/copyright 2013-06-06 14:28:34 UTC (rev 13853) @@ -1,11 +1,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: <pkg> -Source: <path_to_download> +Upstream-Name: Apache Derby +Source: http://db.apache.org/derby/derby_downloads.html Files: * -Copyright: © 20xx-20yy <upstream> -License: <license> +Copyright: © The Derby Developers +License: Apache License Files: debian/* -Copyright: © 2012 Andreas Tille <[email protected]> -License: <license> +Copyright: © 2012 Tim Booth +License: Simplified BSD Modified: trunk/packages/apache-derby/trunk/debian/patches/stop_ant_fetching =================================================================== --- trunk/packages/apache-derby/trunk/debian/patches/stop_ant_fetching 2013-06-06 10:51:48 UTC (rev 13852) +++ trunk/packages/apache-derby/trunk/debian/patches/stop_ant_fetching 2013-06-06 14:28:34 UTC (rev 13853) @@ -1,6 +1,6 @@ --- a/build.xml +++ b/build.xml -@@ -200,7 +200,7 @@ +@@ -215,7 +215,7 @@ </target> <target name="install_junit" depends="junit_check" unless="junit.exists" description="installs junit.jar into derby"> Modified: trunk/packages/apache-derby/trunk/debian/rules =================================================================== --- trunk/packages/apache-derby/trunk/debian/rules 2013-06-06 10:51:48 UTC (rev 13852) +++ trunk/packages/apache-derby/trunk/debian/rules 2013-06-06 14:28:34 UTC (rev 13853) @@ -6,7 +6,7 @@ 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- ) +version=$(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 -d' ' | sed 's/[-+].*//' ) %: dh $@ @@ -44,6 +44,7 @@ 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 ' ' ':'` \ _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
