Author: janpascal-guest Date: 2011-08-16 19:11:45 +0000 (Tue, 16 Aug 2011) New Revision: 14212
Added: branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.dirs branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.postinst branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.prerm branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-doc.jlibs branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-docs.javadoc Modified: branches/lucene3/upgrade-from-3.0-to-3.2/debian/changelog branches/lucene3/upgrade-from-3.0-to-3.2/debian/patches/05_add-osgi-metadata-in-manifests.patch Log: Removed myself from uploaders; checked in work-in-progress Modified: branches/lucene3/upgrade-from-3.0-to-3.2/debian/changelog =================================================================== --- branches/lucene3/upgrade-from-3.0-to-3.2/debian/changelog 2011-08-16 19:07:41 UTC (rev 14211) +++ branches/lucene3/upgrade-from-3.0-to-3.2/debian/changelog 2011-08-16 19:11:45 UTC (rev 14212) @@ -1,4 +1,4 @@ -lucene3 (3.0.2+ds1-1) UNRELEASED; urgency=low +lucene3 (3.2.0+ds1-1) UNRELEASED; urgency=low * New upstream release. Lucene3 is not backwards compatible with lucene2; source using lucene will need to be recompiled and possibly patched. @@ -13,8 +13,9 @@ liblucene2-java) * Bump standards version to 3.9.1 (no changes needed) * Move to quilt patch system and debian source format 3.0 (quilt) + * Remove Jan-Pascal from Uploaders - -- Jan-Pascal van Best <janpas...@vanbest.org> Tue, 14 Jun 2011 22:20:41 +0200 + -- Jan-Pascal van Best <janpas...@vanbest.org> Tue, 28 Jun 2011 17:30:02 +0200 lucene2 (2.9.3+ds1-1) unstable; urgency=low Added: branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.dirs =================================================================== --- branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.dirs (rev 0) +++ branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.dirs 2011-08-16 19:11:45 UTC (rev 14212) @@ -0,0 +1 @@ +/usr/lib/liblucene3-java-contrib Added: branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.postinst =================================================================== --- branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.postinst (rev 0) +++ branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.postinst 2011-08-16 19:11:45 UTC (rev 14212) @@ -0,0 +1,48 @@ +#! /bin/sh +# postinst script for liblucene3-java-contrib +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + update-alternatives \ + --install /usr/bin/lucli \ + lucli \ + /usr/lib/liblucene3-java-contrib/lucli \ + 30 \ + --slave /usr/share/man/man1/lucli.1.gz \ + lucli.1.gz \ + /usr/lib/liblucene3-java-contrib/lucli.1.gz + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + # dummy + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + Added: branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.prerm =================================================================== --- branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.prerm (rev 0) +++ branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-contrib.prerm 2011-08-16 19:11:45 UTC (rev 14212) @@ -0,0 +1,27 @@ +#!/bin/sh -e +# +# prerm maintainer script for the Debian liblucene3-java-contrib package. +# +# summary of how this script can be called: +# * <old-prerm> remove +# * <old-prerm> upgrade <new-version> +# * <new-prerm> failed-upgrade <old-version> +# * <conflictor's-prerm> remove in-favour <package> <new-version> +# * <deconfigured's-prerm> deconfigure in-favour <package-being-installed> <version> +# removing <conflicting-package> <version> +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + remove|upgrade) + update-alternatives --remove lucli /usr/lib/liblucene3-java-contrib/lucli + ;; + *) + ;; +esac + +#DEBHELPER# + +exit 0 + Added: branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-doc.jlibs =================================================================== --- branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-doc.jlibs (rev 0) +++ branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-doc.jlibs 2011-08-16 19:11:45 UTC (rev 14212) @@ -0,0 +1 @@ +build/lucene-demos-3.0.2.jar Added: branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-docs.javadoc =================================================================== --- branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-docs.javadoc (rev 0) +++ branches/lucene3/upgrade-from-3.0-to-3.2/debian/liblucene3-java-docs.javadoc 2011-08-16 19:11:45 UTC (rev 14212) @@ -0,0 +1 @@ +build/docs/api/all Modified: branches/lucene3/upgrade-from-3.0-to-3.2/debian/patches/05_add-osgi-metadata-in-manifests.patch =================================================================== --- branches/lucene3/upgrade-from-3.0-to-3.2/debian/patches/05_add-osgi-metadata-in-manifests.patch 2011-08-16 19:07:41 UTC (rev 14211) +++ branches/lucene3/upgrade-from-3.0-to-3.2/debian/patches/05_add-osgi-metadata-in-manifests.patch 2011-08-16 19:11:45 UTC (rev 14212) @@ -1,8 +1,8 @@ Author: Jan-Pascal van Best <janpas...@vanbest.org> Description: No description. ---- convert-tot-quilt.orig/build.xml -+++ convert-tot-quilt/build.xml -@@ -21,6 +21,16 @@ +--- a/build.xml ++++ b/build.xml +@@ -22,6 +22,16 @@ <property name="junit.includes" value="**/Test*.java"/> @@ -18,9 +18,9 @@ + <import file="common-build.xml"/> - <property name="build.demo.template" value="src/demo/demo-build.template"/> ---- convert-tot-quilt.orig/common-build.xml -+++ convert-tot-quilt/common-build.xml + <!-- Build classpath --> +--- a/common-build.xml ++++ b/common-build.xml @@ -23,6 +23,8 @@ for standalone use. </description> @@ -28,12 +28,12 @@ + <taskdef resource="net/sf/antcontrib/antlib.xml"/> + <dirname file="${ant.file.common}" property="common.dir"/> - - <!-- Give user a chance to override without editing this file -@@ -291,6 +293,15 @@ - </macrodef> + <property name="dev-tools.dir" value="${common.dir}/../dev-tools"/> + <property name="prettify.dir" value="${common.dir}/src/tools/prettify"/> +@@ -365,6 +367,16 @@ + </sequential> + </macrodef> - + <macrodef name="update-manifest-requirebundle" + description="Updates the Require-Bundle attribute of a manifest file"> + <sequential> @@ -43,10 +43,11 @@ + </manifest> + </sequential> + </macrodef> - ++ <macrodef name="build-manifest" description="Builds a manifest file"> <attribute name="title" default="Lucene Search Engine: ${ant.project.name}" /> -@@ -311,6 +322,24 @@ + <sequential> +@@ -384,6 +396,24 @@ value="${javac.source}"/> <attribute name="X-Compile-Target-JDK" value="${javac.target}"/> @@ -71,10 +72,10 @@ </manifest> </sequential> </macrodef> -@@ -328,6 +357,12 @@ +@@ -403,6 +433,12 @@ </exec> - <build-manifest/> + <build-manifest title="@{title}"/> + <if> + <isset property="OSGi.requirebundle"/> + <then> @@ -84,9 +85,9 @@ <jar destfile="@{destfile}" ---- convert-tot-quilt.orig/contrib/analyzers/common/build.xml -+++ convert-tot-quilt/contrib/analyzers/common/build.xml -@@ -27,8 +27,18 @@ +--- a/contrib/analyzers/common/build.xml ++++ b/contrib/analyzers/common/build.xml +@@ -27,6 +27,16 @@ <property name="dist.dir" location="../../../dist/contrib/analyzers/common" /> <property name="maven.dist.dir" location="../../../dist/maven" /> @@ -101,31 +102,28 @@ + </pathconvert> + <import file="../../contrib-build.xml"/> -- -+ - <path id="test.classpath"> - <path refid="classpath"/> - <pathelement location="../../../build/classes/test/"/> ---- convert-tot-quilt.orig/contrib/analyzers/smartcn/build.xml -+++ convert-tot-quilt/contrib/analyzers/smartcn/build.xml + + <target name="compile-core" depends="jflex-notice, common.compile-core"/> +--- a/contrib/analyzers/smartcn/build.xml ++++ b/contrib/analyzers/smartcn/build.xml @@ -27,6 +27,15 @@ - <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" /> - <property name="maven.dist.dir" location="../../../dist/maven" /> - -+ <pathconvert property="OSGi.exportpackage" pathsep=","> -+ <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/> -+ <mapper> -+ <chainedmapper> -+ <packagemapper from="${basedir}/src/java/*" to="*"/> -+ </chainedmapper> -+ </mapper> -+ </pathconvert> -+ - <import file="../../contrib-build.xml"/> - - <path id="test.classpath"> ---- convert-tot-quilt.orig/contrib/contrib-build.xml -+++ convert-tot-quilt/contrib/contrib-build.xml + <property name="dist.dir" location="../../../dist/contrib/analyzers/smartcn" /> + <property name="maven.dist.dir" location="../../../dist/maven" /> + ++ <pathconvert property="OSGi.exportpackage" pathsep=","> ++ <dirset dir="src/java" excludes="org org/apache org/apache/lucene org/apache/lucene/analysis"/> ++ <mapper> ++ <chainedmapper> ++ <packagemapper from="${basedir}/src/java/*" to="*"/> ++ </chainedmapper> ++ </mapper> ++ </pathconvert> ++ + <import file="../../contrib-build.xml"/> + + </project> +--- a/contrib/contrib-build.xml ++++ b/contrib/contrib-build.xml @@ -24,7 +24,21 @@ <property name="build.dir" location="../../build/contrib/${ant.project.name}"/> <property name="dist.dir" location="../../dist/contrib/${ant.project.name}"/> @@ -148,4 +146,4 @@ + <import file="../common-build.xml"/> - <property name="lucene.jar" location="${common.dir}/build/lucene-core-${version}.jar"/> + <available property="contrib.has.tests" type="dir" file="src/test" /> _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits