Author: janpascal-guest Date: 2011-08-16 19:07:41 +0000 (Tue, 16 Aug 2011) New Revision: 14211
Added: trunk/lucene3/debian/liblucene3-java-contrib.dirs trunk/lucene3/debian/liblucene3-java-contrib.postinst trunk/lucene3/debian/liblucene3-java-contrib.prerm trunk/lucene3/debian/liblucene3-java-doc.jlibs trunk/lucene3/debian/liblucene3-java-docs.javadoc trunk/lucene3/debian/patches/disable-javadoc-for-maven Modified: trunk/lucene3/debian/changelog trunk/lucene3/debian/control trunk/lucene3/debian/patches/series trunk/lucene3/debian/rules Log: Checked in the lucene3 work-in-progress; removed myself from Uploaders Modified: trunk/lucene3/debian/changelog =================================================================== --- trunk/lucene3/debian/changelog 2011-08-16 15:59:06 UTC (rev 14210) +++ trunk/lucene3/debian/changelog 2011-08-16 19:07:41 UTC (rev 14211) @@ -13,6 +13,7 @@ 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 Modified: trunk/lucene3/debian/control =================================================================== --- trunk/lucene3/debian/control 2011-08-16 15:59:06 UTC (rev 14210) +++ trunk/lucene3/debian/control 2011-08-16 19:07:41 UTC (rev 14211) @@ -2,8 +2,8 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Jan-Pascal van Best <janpas...@vanbest.org>, Barry Hawkins <ba...@alltc.com>, - Jeff Breidenbach <j...@debian.org>, Michael Koch <konque...@gmx.de>, Rene Engelhard <r...@debian.org> +Uploaders: Barry Hawkins <ba...@alltc.com>, Jeff Breidenbach <j...@debian.org>, + Michael Koch <konque...@gmx.de>, Rene Engelhard <r...@debian.org> DM-Upload-Allowed: yes Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene3/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene3/ @@ -12,7 +12,7 @@ Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), quilt (>= 0.40), javahelper (>= 0.33~1), default-jdk (>= 1.6), - ant-optional (>= 1.8), ant-contrib, javacc, junit + ant-optional (>= 1.8), ant-contrib, javacc, junit, libmaven-ant-tasks-java Build-Depends-Indep: libjline-java (>= 0.9.5), libcommons-digester-java (>= 1.7), libregexp-java (>= 1.4), Added: trunk/lucene3/debian/liblucene3-java-contrib.dirs =================================================================== --- trunk/lucene3/debian/liblucene3-java-contrib.dirs (rev 0) +++ trunk/lucene3/debian/liblucene3-java-contrib.dirs 2011-08-16 19:07:41 UTC (rev 14211) @@ -0,0 +1 @@ +/usr/lib/liblucene3-java-contrib Added: trunk/lucene3/debian/liblucene3-java-contrib.postinst =================================================================== --- trunk/lucene3/debian/liblucene3-java-contrib.postinst (rev 0) +++ trunk/lucene3/debian/liblucene3-java-contrib.postinst 2011-08-16 19:07:41 UTC (rev 14211) @@ -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: trunk/lucene3/debian/liblucene3-java-contrib.prerm =================================================================== --- trunk/lucene3/debian/liblucene3-java-contrib.prerm (rev 0) +++ trunk/lucene3/debian/liblucene3-java-contrib.prerm 2011-08-16 19:07:41 UTC (rev 14211) @@ -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: trunk/lucene3/debian/liblucene3-java-doc.jlibs =================================================================== --- trunk/lucene3/debian/liblucene3-java-doc.jlibs (rev 0) +++ trunk/lucene3/debian/liblucene3-java-doc.jlibs 2011-08-16 19:07:41 UTC (rev 14211) @@ -0,0 +1 @@ +build/lucene-demos-3.0.2.jar Added: trunk/lucene3/debian/liblucene3-java-docs.javadoc =================================================================== --- trunk/lucene3/debian/liblucene3-java-docs.javadoc (rev 0) +++ trunk/lucene3/debian/liblucene3-java-docs.javadoc 2011-08-16 19:07:41 UTC (rev 14211) @@ -0,0 +1 @@ +build/docs/api/all Added: trunk/lucene3/debian/patches/disable-javadoc-for-maven =================================================================== --- trunk/lucene3/debian/patches/disable-javadoc-for-maven (rev 0) +++ trunk/lucene3/debian/patches/disable-javadoc-for-maven 2011-08-16 19:07:41 UTC (rev 14211) @@ -0,0 +1,37 @@ +--- a/build.xml ++++ b/build.xml +@@ -330,7 +330,7 @@ + <!-- ================================================================== --> + <!-- --> + <!-- ================================================================== --> +- <target name="package" depends="jar-core, javadocs, war-demo, build-contrib, init-dist, changes-to-html"> ++ <target name="package" depends="jar-core, war-demo, build-contrib, init-dist, changes-to-html"> + <copy file="${build.demo.template}" tofile="${build.dir}/build-demo.xml"> + <filterset begintoken="@PLACEHOLDER_" endtoken="@"> + <filter token="version" value="${version}"/> +@@ -469,15 +469,13 @@ + + <target name="dist-all" depends="dist, dist-src"/> + +- <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, jar-demo-src, javadocs"> ++ <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, jar-demo-src"> + <sequential> + <m2-deploy pom.xml="lucene-parent-pom.xml.template"/> + <m2-deploy pom.xml="lucene-core-pom.xml.template"> + <artifact-attachments> + <attach file="${build.dir}/${final.name}-src.jar" + classifier="sources"/> +- <attach file="${build.dir}/${final.name}-javadoc.jar" +- classifier="javadoc"/> + </artifact-attachments> + </m2-deploy> + +@@ -485,8 +483,6 @@ + <artifact-attachments> + <attach file="${build.dir}/${demo.name}-src.jar" + classifier="sources"/> +- <attach file="${build.dir}/${demo.name}-javadoc.jar" +- classifier="javadoc"/> + </artifact-attachments> + </m2-deploy> + Modified: trunk/lucene3/debian/patches/series =================================================================== --- trunk/lucene3/debian/patches/series 2011-08-16 15:59:06 UTC (rev 14210) +++ trunk/lucene3/debian/patches/series 2011-08-16 19:07:41 UTC (rev 14211) @@ -14,3 +14,4 @@ 81_disable-test-tag-backcompat-tests.patch 82_disable-svnversion-calls.patch 83_fix-java-IPv4-networking.patch +disable-javadoc-for-maven Modified: trunk/lucene3/debian/rules =================================================================== --- trunk/lucene3/debian/rules 2011-08-16 15:59:06 UTC (rev 14210) +++ trunk/lucene3/debian/rules 2011-08-16 19:07:41 UTC (rev 14211) @@ -14,12 +14,18 @@ export JAVA_HOME=/usr/lib/jvm/default-java JH_DEPENDS_ARGS = --verbose --jvm=headless -DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo # javadocs +DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo generate-maven-artifacts # javadocs (takes time!) +#DEB_ANT_BUILD_TARGET := maven.ant.tasks-check DEB_ANT_CHECK_TARGET := test +DEB_ANT_ARGS := -Dmaven.ant.tasks.present=true DEB_ANT_CLEAN_TARGET := clean clean-javacc # Needed for running javacc and the unit tests -DEB_JARS = ant-nodeps ant-contrib ant-junit junit +DEB_JARS := ant-nodeps ant-contrib ant-junit junit \ + maven-ant-tasks plexus-component-api maven-error-diagnostics maven-project \ + classworlds plexus-utils plexus-interpolation wagon-provider-api maven-model \ + maven-artifact maven-settings maven-artifact-manager \ + plexus-container-default-alpha plexus-classworlds # Upstream Lucene name UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*" | sed -e "s/~/-/" ) _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits