This is an automated email from the git hooks/post-receive script. bengen pushed a commit to branch master in repository lucene4.10.
commit 5488109bbc31f324ca6dda6d4acc32bc1b0b74ba Author: Hilko Bengen <[email protected]> Date: Sun Jun 8 14:28:12 2014 +0200 Initial release --- debian/changelog | 5 + debian/compat | 1 + debian/control | 36 +++++ debian/copyright | 27 ++++ debian/docs | 6 + debian/install-poms.sh | 41 ++++++ debian/liblucene4-java.install | 2 + debian/patch-ivy | 16 +++ ...local-maven-repository-and-local-ivy.home.patch | 47 +++++++ ...02-Use-javax.servlet-servlet-api-directly.patch | 23 +++ .../0003-Adjust-build-dep-versions-as-needed.patch | 156 +++++++++++++++++++++ debian/patches/series | 3 + debian/rules | 27 ++++ debian/source/format | 1 + debian/source/lintian-overrides | 10 ++ debian/watch | 2 + 16 files changed, 403 insertions(+) diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..edb9e65 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +lucene4 (4.6.1-1) unstable; urgency=low + + * Initial release (Closes: #736644) + + -- Hilko Bengen <[email protected]> Sun, 08 Jun 2014 14:27:56 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..6c44ad5 --- /dev/null +++ b/debian/control @@ -0,0 +1,36 @@ +Source: lucene4 +Section: java +Priority: extra +Maintainer: Hilko Bengen <[email protected]> +Build-Depends: debhelper (>= 9~), default-jdk, maven-debian-helper, +Build-Depends-Indep: ant, ivy, + antlr3, + libasm4-java, + libcarrotsearch-hppc-java, + libcarrotsearch-randomizedtesting-java, + libcommons-codec-java, + libcommons-compress-java, + libcommons-logging-java, + libhttpclient-java, + libhttpcore-java, + libicu4j-49-java, + libjetty8-java, + libmorfologik-stemming-java (>= 1.8.3), + libnekohtml-java, + libregexp-java, + libservlet3.0-java, + libspatial4j-java, + libuima-core-java, libuima-addons-java, + libxerces2-java, +Standards-Version: 3.9.5 +Homepage: http://lucene.apache.org +#Vcs-Git: git://git.debian.org/collab-maint/lucene4.git +#Vcs-Browser: http://git.debian.org/?p=collab-maint/lucene4.git;a=summary + +Package: liblucene4-java +Architecture: all +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Full-text search engine library for Java(TM) + Lucene is a full-text search engine for the Java(TM) programming language. + Lucene is not a complete application, but rather a code library and API + that can easily be used to add search capabilities to applications. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..1db5996 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,27 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: lucene4 +Source: <http://lucene.apache.org> + +Files: * +Copyright: 200x Apache Software Foundation +License: Apache-2.0 + +Files: debian/* +Copyright: 2014 Hilko Bengen <[email protected]> +License: Apache-2.0 + +License: Apache-2.0 + Licensed 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. + . + On Debian systems, the complete text of the Apache version 2.0 license + can be found in "/usr/share/common-licenses/Apache-2.0". diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..0bae196 --- /dev/null +++ b/debian/docs @@ -0,0 +1,6 @@ +BUILD.txt +JRE_VERSION_MIGRATION.txt +MIGRATE.txt +NOTICE.txt +README.txt +SYSTEM_REQUIREMENTS.txt diff --git a/debian/install-poms.sh b/debian/install-poms.sh new file mode 100755 index 0000000..777ef66 --- /dev/null +++ b/debian/install-poms.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +set -e + +VERSION=$1 +MAJOR=$(echo $VERSION | sed 's/\..*/.x/') +LOCAL_REPO=$(pwd)/debian/tmp/usr/share/maven-repo + +rm -rf $LOCAL_REPO +/usr/share/maven-debian-helper/copy-repo.sh $(dirname $LOCAL_REPO) +# Make sure we don't pull in any previous Lucene versions +rm -rf $LOCAL_REPO/org/apache/lucene + +mkdir -p debian/tmp/usr/share/java + +find build -name 'lucene-*.jar' | +tee -a /dev/stderr | +while read file; do + basename=$(basename $file) + artifact=$(basename $file -$VERSION.jar) + + install -m644 $file debian/tmp/usr/share/java/ + + for version in $VERSION $MAJOR; do + mkdir -p debian/tmp/usr/share/maven-repo/org/apache/lucene/$artifact/$version + echo "\ +<?xml version=\"1.0\" encoding=\"UTF-8\"?> +<project xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\"; xmlns=\"http://maven.apache.org/POM/4.0.0\"; + xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.lucene</groupId> + <artifactId>$artifact</artifactId> + <version>$version</version> + <description>dummy POM</description> + <packaging>jar</packaging> +</project>\ +" > debian/tmp/usr/share/maven-repo/org/apache/lucene/$artifact/$version/$artifact-$version.pom + ln -rs debian/tmp/usr/share/java/$basename \ + debian/tmp/usr/share/maven-repo/org/apache/lucene/$artifact/$version/$artifact-$version.jar + done +done diff --git a/debian/liblucene4-java.install b/debian/liblucene4-java.install new file mode 100644 index 0000000..5ecefc9 --- /dev/null +++ b/debian/liblucene4-java.install @@ -0,0 +1,2 @@ +/usr/share/maven-repo/org/apache/lucene/lucene-*/4.* +/usr/share/java diff --git a/debian/patch-ivy b/debian/patch-ivy new file mode 100755 index 0000000..53817a9 --- /dev/null +++ b/debian/patch-ivy @@ -0,0 +1,16 @@ +#!/bin/sh + +JUNIT_VERSION=4.11 +ANT_VERSION=1.9.2 +ICU_VERSION=52.1 +MAT_VERSION=2.2.1 + +SED='s,\("junit" rev="\).*\(" transitive\),\1'$JUNIT_VERSION'\2,' +SED="$SED;"'s,\("ant" rev="\).*\(" transitive\),\1'$ANT_VERSION'\2,' +SED="$SED;"'s,\("icu4j" rev="\).*\(" transitive\),\1'$ICU_VERSION'\2,' +SED="$SED;"'s,\("maven-ant-tasks" rev="\).*\(" transitive\),\1'$MAT_VERSION'\2,' + +find -name ivy.xml | while read f; do + test -e $f.orig && mv $f.orig $f + sed -i.orig -e "$SED" $f +done diff --git a/debian/patches/0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch b/debian/patches/0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch new file mode 100644 index 0000000..6c622ed --- /dev/null +++ b/debian/patches/0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch @@ -0,0 +1,47 @@ +From: Hilko Bengen <[email protected]> +Date: Wed, 8 Jan 2014 11:54:00 +0100 +Subject: Ivy: Use local maven repository and local ivy.home + +--- + common-build.xml | 1 + + ivy-settings.xml | 8 ++------ + 2 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/common-build.xml b/common-build.xml +index b4111ac..07f69c0 100644 +--- a/common-build.xml ++++ b/common-build.xml +@@ -68,6 +68,7 @@ + <!-- we exclude ext/*.jar because we don't want example/lib/ext logging jars on the cp --> + <property name="common.classpath.excludes" value="**/*.txt,**/*.template,**/*.sha1,ext/*.jar" /> + ++ <property name="ivy.home" location="${common.dir}/debian/_ivy" /> + <property name="ivy.bootstrap.version" value="2.3.0" /> + <property name="ivy.default.configuration" value="*"/> + <property name="ivy.sync" value="true"/> +diff --git a/ivy-settings.xml b/ivy-settings.xml +index c7c3754..96157d3 100644 +--- a/ivy-settings.xml ++++ b/ivy-settings.xml +@@ -36,6 +36,7 @@ + + <!-- you might need to tweak this from china so it works --> + <ibiblio name="working-chinese-mirror" root="http://uk.maven.org/maven2"; m2compatible="true" /> ++ <ibiblio name="debian" root="file:///usr/share/maven-repo" m2compatible="true" /> + + <!-- + <filesystem name="local-maven-2" m2compatible="true" local="true"> +@@ -47,12 +48,7 @@ + --> + + <chain name="default" returnFirst="true" checkmodified="true" changingPattern=".*SNAPSHOT"> +- <resolver ref="local"/> +- <!-- <resolver ref="local-maven-2" /> --> +- <resolver ref="main"/> +- <resolver ref="sonatype-releases" /> +- <resolver ref="maven.restlet.org" /> +- <resolver ref="working-chinese-mirror" /> ++ <resolver ref="debian"/> + </chain> + </resolvers> + diff --git a/debian/patches/0002-Use-javax.servlet-servlet-api-directly.patch b/debian/patches/0002-Use-javax.servlet-servlet-api-directly.patch new file mode 100644 index 0000000..827792e --- /dev/null +++ b/debian/patches/0002-Use-javax.servlet-servlet-api-directly.patch @@ -0,0 +1,23 @@ +From: Hilko Bengen <[email protected]> +Date: Thu, 9 Jan 2014 15:53:34 +0100 +Subject: Use javax.servlet/servlet-api directly + +--- + replicator/ivy.xml | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/replicator/ivy.xml b/replicator/ivy.xml +index d0ae57c..5a5cbcf 100644 +--- a/replicator/ivy.xml ++++ b/replicator/ivy.xml +@@ -40,9 +40,7 @@ + <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="${/org.eclipse.jetty/jetty-continuation}" transitive="false" conf="jetty->default"/> + <dependency org="org.eclipse.jetty" name="jetty-http" rev="${/org.eclipse.jetty/jetty-http}" transitive="false" conf="jetty->default"/> + <dependency org="commons-logging" name="commons-logging" rev="${/commons-logging/commons-logging}" transitive="false" conf="logging->default"/> +- <dependency org="org.eclipse.jetty.orbit" name="javax.servlet" rev="${/org.eclipse.jetty.orbit/javax.servlet}" transitive="false" conf="servlet->default"> +- <artifact name="javax.servlet" type="orbit" ext="jar"/> +- </dependency> ++ <dependency org="javax.servlet" name="servlet-api" rev="3.0" transitive="false"/> + <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> + </dependencies> + diff --git a/debian/patches/0003-Adjust-build-dep-versions-as-needed.patch b/debian/patches/0003-Adjust-build-dep-versions-as-needed.patch new file mode 100644 index 0000000..5284b8f --- /dev/null +++ b/debian/patches/0003-Adjust-build-dep-versions-as-needed.patch @@ -0,0 +1,156 @@ +From: Hilko Bengen <[email protected]> +Date: Thu, 9 Jan 2014 15:53:34 +0100 +Subject: Adjust build-dep versions as needed + +--- + common-build.xml | 2 +- + ivy-versions.properties | 46 +++++++++++++++++++++++----------------------- + 2 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/common-build.xml b/common-build.xml +index 07f69c0..50f1ee7 100644 +--- a/common-build.xml ++++ b/common-build.xml +@@ -2170,7 +2170,7 @@ ${tests-output}/junit4-*.suites - per-JVM executed suites + + <!-- GROOVY scripting engine for ANT tasks --> + <target name="resolve-groovy" unless="groovy.loaded" depends="ivy-availability-check,ivy-configure"> +- <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="2.1.5" ++ <ivy:cachepath organisation="org.codehaus.groovy" module="groovy-all" revision="debian" + inline="true" conf="default" type="jar" transitive="true" pathid="groovy.classpath"/> + <taskdef name="groovy" + classname="org.codehaus.groovy.ant.Groovy" +diff --git a/ivy-versions.properties b/ivy-versions.properties +index a71f538..d646421 100644 +--- a/ivy-versions.properties ++++ b/ivy-versions.properties +@@ -4,11 +4,11 @@ + + /cglib/cglib-nodep = 2.2 + +-com.carrotsearch.randomizedtesting.version = 2.0.13 ++com.carrotsearch.randomizedtesting.version = debian + /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version} + /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version} + +-/com.carrotsearch/hppc = 0.5.2 ++/com.carrotsearch/hppc = debian + /com.cybozu.labs/langdetect = 1.1-20120112 + /com.drewnoakes/metadata-extractor = 2.6.2 + /com.google.guava/guava = 14.0.1 +@@ -16,39 +16,39 @@ com.carrotsearch.randomizedtesting.version = 2.0.13 + /com.googlecode.concurrentlinkedhashmap/concurrentlinkedhashmap-lru = 1.2 + /com.googlecode.juniversalchardet/juniversalchardet = 1.0.3 + /com.googlecode.mp4parser/isoparser = 1.0-RC-1 +-/com.ibm.icu/icu4j = 49.1 ++/com.ibm.icu/icu4j = 49 + /com.spatial4j/spatial4j = 0.3 + /com.sun.jersey/jersey-core = 1.16 + /commons-beanutils/commons-beanutils = 1.7.0 + /commons-cli/commons-cli = 1.2 +-/commons-codec/commons-codec = 1.7 ++/commons-codec/commons-codec = debian + /commons-collections/commons-collections = 3.2.1 + /commons-configuration/commons-configuration = 1.6 + /commons-digester/commons-digester = 2.0 + /commons-fileupload/commons-fileupload = 1.2.1 + /commons-io/commons-io = 2.1 + /commons-lang/commons-lang = 2.6 +-/commons-logging/commons-logging = 1.1.1 ++/commons-logging/commons-logging = debian + /de.l3s.boilerpipe/boilerpipe = 1.1.0 + /dom4j/dom4j = 1.6.1 + /edu.ucar/netcdf = 4.2-min + /hsqldb/hsqldb = 1.8.0.10 +-/jakarta-regexp/jakarta-regexp = 1.4 ++/jakarta-regexp/jakarta-regexp = debian + /javax.activation/activation = 1.1 + /javax.mail/mail = 1.4.1 +-/javax.servlet/javax.servlet-api = 3.0.1 +-/javax.servlet/servlet-api = 2.4 ++/javax.servlet/javax.servlet-api = 3.0 ++/javax.servlet/servlet-api = 2.5 + /jdom/jdom = 1.0 + /joda-time/joda-time = 2.2 +-/junit/junit = 4.10 +-/log4j/log4j = 1.2.16 ++/junit/junit = 4.x ++/log4j/log4j = 1.2.x + /mecab/mecab-ipadic = 2.7.0-20070801 + /mecab/mecab-naist-jdic = 0.6.3b-20111013 + /net.arnx/jsonic = 1.2.7 +-/net.sourceforge.nekohtml/nekohtml = 1.9.17 +-/org.antlr/antlr-runtime = 3.5 +-/org.apache.ant/ant = 1.8.2 +-/org.apache.commons/commons-compress = 1.4.1 ++/net.sourceforge.nekohtml/nekohtml = debian ++/org.antlr/antlr-runtime = 3.x ++/org.apache.ant/ant = debian ++/org.apache.commons/commons-compress = debian + /org.apache.derby/derby = 10.9.1.0 + + org.apache.hadoop.version = 2.2.0 +@@ -59,9 +59,9 @@ org.apache.hadoop.version = 2.2.0 + + # The httpcore version is often different from the httpclient and httpmime versions, + # so the httpcore version value should not share the same symbolic name with them. +-/org.apache.httpcomponents/httpclient = 4.2.6 +-/org.apache.httpcomponents/httpcore = 4.2.5 +-/org.apache.httpcomponents/httpmime = 4.2.6 ++/org.apache.httpcomponents/httpclient = debian ++/org.apache.httpcomponents/httpcore = debian ++/org.apache.httpcomponents/httpmime = debian + + org.apache.james.apache.mime4j = 0.7.2 + /org.apache.james/apache-mime4j-core = ${org.apache.james.apache.mime4j} +@@ -85,7 +85,7 @@ org.apache.tika.version = 1.4 + /org.apache.tika/tika-core = ${org.apache.tika.version} + /org.apache.tika/tika-parsers = ${org.apache.tika.version} + +-org.apache.uima.version = 2.3.1 ++org.apache.uima.version = debian + /org.apache.uima/AlchemyAPIAnnotator = ${org.apache.uima.version} + /org.apache.uima/OpenCalaisAnnotator = ${org.apache.uima.version} + /org.apache.uima/Tagger = ${org.apache.uima.version} +@@ -104,7 +104,7 @@ org.bouncycastle.version = 1.45 + /org.carrot2.attributes/attributes-binder = 1.2.0 + /org.carrot2/carrot2-mini = 3.8.0 + +-org.carrot2.morfologik.version = 1.7.1 ++org.carrot2.morfologik.version = debian + /org.carrot2/morfologik-fsa = ${org.carrot2.morfologik.version} + /org.carrot2/morfologik-polish = ${org.carrot2.morfologik.version} + /org.carrot2/morfologik-stemming = ${org.carrot2.morfologik.version} +@@ -119,7 +119,7 @@ org.codehaus.jackson.version = 1.7.4 + /org.easymock/easymock = 3.0 + /org.eclipse.jetty.orbit/javax.servlet = 3.0.0.v201112011016 + +-org.eclipse.jetty.version = 8.1.10.v20130312 ++org.eclipse.jetty.version = debian + /org.eclipse.jetty/jetty-continuation = ${org.eclipse.jetty.version} + /org.eclipse.jetty/jetty-deploy = ${org.eclipse.jetty.version} + /org.eclipse.jetty/jetty-http = ${org.eclipse.jetty.version} +@@ -144,7 +144,7 @@ org.mortbay.jetty.version = 6.1.26 + /org.noggit/noggit = 0.5 + /org.objenesis/objenesis = 1.2 + +-org.ow2.asm.version = 4.1 ++org.ow2.asm.version = 4.x + /org.ow2.asm/asm = ${org.ow2.asm.version} + /org.ow2.asm/asm-commons = ${org.ow2.asm.version} + +@@ -152,7 +152,7 @@ org.restlet.jee.version = 2.1.1 + /org.restlet.jee/org.restlet = ${org.restlet.jee.version} + /org.restlet.jee/org.restlet.ext.servlet = ${org.restlet.jee.version} + +-/org.simpleframework/simple-xml = 2.7 ++/org.simpleframework/simple-xml = debian + + org.slf4j.version = 1.6.6 + /org.slf4j/jcl-over-slf4j = ${org.slf4j.version} +@@ -162,4 +162,4 @@ org.slf4j.version = 1.6.6 + + /org.tukaani/xz = 1.0 + /rome/rome = 0.9 +-/xerces/xercesImpl = 2.9.1 ++/xerces/xercesImpl = debian diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..380503f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +0001-Ivy-Use-local-maven-repository-and-local-ivy.home.patch +0002-Use-javax.servlet-servlet-api-directly.patch +0003-Adjust-build-dep-versions-as-needed.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..bf98478 --- /dev/null +++ b/debian/rules @@ -0,0 +1,27 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +export DH_VERBOSE=1 + +export VERSION=$(shell dpkg-parsechangelog -SVersion | sed 's,-.*,,') +export CLASSPATH=/usr/share/java/ivy.jar + +%: + dh $@ --with-buildsystem=ant + +override_dh_auto_build: + dh_auto_build -- -Dversion=$(VERSION) jar + +# TODO: dependency test-framework: com.carrotsearch.randomizedtesting#junit4-ant + +override_dh_installchangelogs: + dh_installchangelogs CHANGES.txt + +override_dh_auto_install: + sh debian/install-poms.sh $(VERSION) + dh_auto_install + +override_dh_auto_clean: + dh_auto_clean + rm -rf debian/_ivy + find -path \*/lib/\*.jar | xargs -r rm -f diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 0000000..06a85a3 --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,10 @@ +lucene4 source: source-is-missing tools/prettify/lang-apollo.js +lucene4 source: source-is-missing tools/prettify/lang-css.js +lucene4 source: source-is-missing tools/prettify/lang-hs.js +lucene4 source: source-is-missing tools/prettify/lang-lua.js +lucene4 source: source-is-missing tools/prettify/lang-ml.js +lucene4 source: source-is-missing tools/prettify/lang-proto.js +lucene4 source: source-is-missing tools/prettify/lang-sql.js +lucene4 source: source-is-missing tools/prettify/lang-vb.js +lucene4 source: source-is-missing tools/prettify/lang-wiki.js +lucene4 source: source-is-missing tools/prettify/prettify.js diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..ca6c153 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://archive.apache.org/dist/lucene/java/(4\..*)/ lucene-(4\..*)-src.tgz -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene4.10.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
