Author: janpascal-guest Date: 2009-03-24 15:58:24 +0000 (Tue, 24 Mar 2009) New Revision: 8110
Added: trunk/solr/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch trunk/solr/debian/patches/15_fix-failed-test-with-new-jetty.dpatch trunk/solr/debian/po/sv.po Removed: trunk/solr/debian/po/se.po Modified: trunk/solr/debian/changelog trunk/solr/debian/control trunk/solr/debian/patches/00list trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch trunk/solr/debian/po/gl.po trunk/solr/debian/rules trunk/solr/debian/watch Log: Working on Solr 1.3 fixes Modified: trunk/solr/debian/changelog =================================================================== --- trunk/solr/debian/changelog 2009-03-23 21:03:50 UTC (rev 8109) +++ trunk/solr/debian/changelog 2009-03-24 15:58:24 UTC (rev 8110) @@ -1,10 +1,14 @@ -solr (1.2.0+ds2-2) UNRELEASED; urgency=low +solr (1.3.0+ds1-1) UNRELEASED; urgency=low - * Reinstated solr-jetty since Jetty is back in Lenny. Added workaround - of bug #452586 in Jetty to debian/README.Debian. - * Added DM-Upload-Allowed: yes to debian/control + * New upstream release (1.3.0). + * Fixed debian/watch for new upstream directory name schema. + * Added workaround of bug #452586 in Jetty to debian/README.Debian. Note + that solr-jetty is still disabled because Jetty has been removed from + Lenny. + * Added DM-Upload-Allowed: yes to debian/control. + * Updated Galician translation - -- Jan-Pascal van Best <[email protected]> Tue, 23 Sep 2008 13:45:07 +0200 + -- Jan-Pascal van Best <[email protected]> Sun, 01 Feb 2009 12:32:49 +0100 solr (1.2.0+ds2-1) unstable; urgency=low Modified: trunk/solr/debian/control =================================================================== --- trunk/solr/debian/control 2009-03-23 21:03:50 UTC (rev 8109) +++ trunk/solr/debian/control 2009-03-24 15:58:24 UTC (rev 8110) @@ -16,7 +16,7 @@ libcommons-fileupload-java (>= 1.2), libcommons-io-java (>= 1.3.1), libservlet2.4-java (>= 5.0.30), - liblucene2-java (>= 2.3.2), + liblucene2-java (>= 2.4.0), libxpp3-java (>= 1.1.3.4.0) Standards-Version: 3.8.0 @@ -29,7 +29,7 @@ libcommons-fileupload-java (>= 1.2), libcommons-io-java (>= 1.3.1), libservlet2.4-java (>= 5.0.30), - liblucene2-java (>= 2.3), + liblucene2-java (>= 2.4.0), libxpp3-java (>= 1.1.3.4.0) Recommends: solr-tomcat5.5 (>= ${binary:Version}) | solr-jetty (>= ${binary:Version}) Description: enterprise search server based on Lucene - common files @@ -53,14 +53,14 @@ . This package provides the Tomcat integration files for Solr. -Package: solr-jetty -Architecture: all -Depends: solr-common (>= ${binary:Version}), jetty (>= 5.1.14-1) -Conflicts: solr-tomcat5.5 -Description: enterprise search server based on Lucene - Jetty integration - Solr is an open source enterprise search server based on the Lucene - Java search library, with XML/HTTP and JSON APIs, hit highlighting, - faceted search, caching, replication, and a web administration - interface. It runs in a Java servlet container such as Tomcat. - . - This package provides the Jetty integration files for Solr. +#Package: solr-jetty +#Architecture: all +#Depends: solr-common (>= ${binary:Version}), jetty (>= 5.1.14-1) +#Conflicts: solr-tomcat5.5 +#Description: enterprise search server based on Lucene - Jetty integration +# Solr is an open source enterprise search server based on the Lucene +# Java search library, with XML/HTTP and JSON APIs, hit highlighting, +# faceted search, caching, replication, and a web administration +# interface. It runs in a Java servlet container such as Tomcat. +# . +# This package provides the Jetty integration files for Solr. Modified: trunk/solr/debian/patches/00list =================================================================== --- trunk/solr/debian/patches/00list 2009-03-23 21:03:50 UTC (rev 8109) +++ trunk/solr/debian/patches/00list 2009-03-24 15:58:24 UTC (rev 8110) @@ -1,6 +1,7 @@ 01_remove-all-jarfiles.dpatch -02_fix-solr-version.dpatch -03_relocate-datadir.dpatch +#03_relocate-datadir.dpatch 04_fix-lucene-lock-directory.dpatch 05_use-debian-java-libraries.dpatch -07_fix-for-lucene-2.3.dpatch +#07_fix-for-lucene-2.3.dpatch +10_contrib-dataimporthandler-use-debian-libs.dpatch +15_fix-failed-test-with-new-jetty.dpatch Modified: trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch =================================================================== --- trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch 2009-03-23 21:03:50 UTC (rev 8109) +++ trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch 2009-03-24 15:58:24 UTC (rev 8110) @@ -7,19 +7,19 @@ ## DP: into the war file. @DPATCH@ -diff -urNad trunk~/build.xml trunk/build.xml ---- trunk~/build.xml 2007-06-19 10:44:26.000000000 +0200 -+++ trunk/build.xml 2007-06-19 10:44:48.000000000 +0200 -@@ -55,7 +55,7 @@ - <property name="specversion" value="1.2.${dateversion}" /> - +diff -urNad solr~/build.xml solr/build.xml +--- solr~/build.xml 2008-09-24 23:09:28.000000000 +0200 ++++ solr/build.xml 2008-09-24 23:11:26.000000000 +0200 +@@ -22,7 +22,7 @@ + <import file="common-build.xml"/> + <!-- 3rd party libraries for compilation --> - <property name="lib" value="lib" /> + <property name="lib" value="/usr/share/java" /> <!-- solr source files --> <property name="src" value="src" /> -@@ -162,7 +162,18 @@ +@@ -111,7 +111,27 @@ <!-- The compilation classpath --> <path id="compile.classpath"> <fileset dir="${lib}"> @@ -28,19 +28,49 @@ + <include name="lucene-core.jar" /> + <include name="lucene-analyzers.jar" /> + <include name="lucene-highlighter.jar" /> ++ <include name="lucene-queries.jar" /> + <include name="lucene-snowball.jar" /> + <include name="lucene-spellchecker.jar" /> + <include name="commons-codec.jar" /> + <include name="commons-csv.jar" /> + <include name="commons-fileupload.jar" /> ++ <include name="commons-httpclient.jar" /> + <include name="commons-io.jar" /> ++ <include name="commons-logging.jar" /> + <include name="xpp3.jar" /> + <include name="easymock.jar" /> ++ <include name="jetty6.jar" /> ++ <include name="jetty6-servlet2.5.jar" /> ++ <include name="jetty6-util.jar" /> ++ </fileset> ++ <fileset dir="/usr/local/share/java"> ++ <include name="stax-utils.jar" /> </fileset> + <pathelement location="${dest}/common"/> </path> - -@@ -388,10 +398,6 @@ - webxml="${src}/webapp/WEB-INF/web.xml" +@@ -305,6 +323,7 @@ + </fileset> + <fileset dir="${lib}"> + <include name="commons-io-*.jar" /> ++ <include name="commons-httpclient.jar" /> + <include name="*stax-*.jar" /> + <include name="wstx-*.jar" /> + </fileset> +@@ -318,8 +337,10 @@ + <pathelement location="${dest}/core"/> + + <!-- jetty --> +- <fileset dir="example/lib"> +- <include name="**/*.jar" /> ++ <fileset dir="/usr/share/java"> ++ <include name="/jetty6.jar" /> ++ <include name="/jetty6-servlet2.5.jar" /> ++ <include name="/jetty6-util.jar" /> + </fileset> + </path> + +@@ -520,10 +540,6 @@ + webxml="${src}/webapp/web/WEB-INF/web.xml" filesetmanifest="skip" manifest="${dest}/META-INF/MANIFEST.MF"> - <lib dir="${lib}"> @@ -48,5 +78,5 @@ - <exclude name="easymock.jar" /> - </lib> <lib dir="${dist}"> - <include name="${fullnamever}.jar" /> - </lib> + <include name="${fullname}-core-${version}.jar" /> + <include name="${fullname}-common-${version}.jar" /> Added: trunk/solr/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch =================================================================== --- trunk/solr/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch (rev 0) +++ trunk/solr/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch 2009-03-24 15:58:24 UTC (rev 8110) @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_contrib-dataimporthandler-use-debian-libs.dpatch by Jan-Pascal van Best <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad solr~/contrib/dataimporthandler/build.xml solr/contrib/dataimporthandler/build.xml +--- solr~/contrib/dataimporthandler/build.xml 2008-10-21 16:54:57.000000000 +0200 ++++ solr/contrib/dataimporthandler/build.xml 2008-10-21 16:55:07.000000000 +0200 +@@ -20,6 +20,7 @@ + <project name="solr-dataimporthandler" default="build"> + + <property name="solr-path" value="../.." /> ++ <property name="lib" value="/usr/share/java"/> + + <import file="../../common-build.xml"/> + +@@ -30,7 +31,10 @@ + <path id="common.classpath"> + <pathelement location="${solr-path}/build/common" /> + <pathelement location="${solr-path}/build/core" /> +- <fileset dir="${solr-path}/lib" includes="*.jar"></fileset> ++ <fileset dir="${lib}"> ++ <include name="lucene-core.jar"/> ++ <include name="junit4.jar"/> ++ </fileset> + </path> + + <path id="test.classpath"> Property changes on: trunk/solr/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch ___________________________________________________________________ Name: svn:executable + * Added: trunk/solr/debian/patches/15_fix-failed-test-with-new-jetty.dpatch =================================================================== --- trunk/solr/debian/patches/15_fix-failed-test-with-new-jetty.dpatch (rev 0) +++ trunk/solr/debian/patches/15_fix-failed-test-with-new-jetty.dpatch 2009-03-24 15:58:24 UTC (rev 8110) @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_fix-failed-test-with-new-jetty.dpatch by Jan-Pascal van Best <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +...@dpatch@ +diff -urNad solr~/src/test/org/apache/solr/servlet/CacheHeaderTest.java solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java +--- solr~/src/test/org/apache/solr/servlet/CacheHeaderTest.java 2008-08-27 15:04:10.000000000 +0200 ++++ solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java 2009-03-20 17:07:46.000000000 +0100 +@@ -62,7 +62,7 @@ + protected void checkVetoHeaders(HttpMethodBase m) throws Exception { + Header head = m.getResponseHeader("Cache-Control"); + assertNotNull("We got no Cache-Control header", head); +- assertEquals("no-cache, no-store", head.getValue()); ++ assertEquals("must-revalidate, no-cache, no-store", head.getValue()); + + head = m.getResponseHeader("Pragma"); + assertNotNull("We got no Pragma header", head); Property changes on: trunk/solr/debian/patches/15_fix-failed-test-with-new-jetty.dpatch ___________________________________________________________________ Name: svn:executable + * Modified: trunk/solr/debian/po/gl.po =================================================================== --- trunk/solr/debian/po/gl.po 2009-03-23 21:03:50 UTC (rev 8109) +++ trunk/solr/debian/po/gl.po 2009-03-24 15:58:24 UTC (rev 8110) @@ -1,24 +1,28 @@ +# translation of solr_1.2.0+ds1-3_gl.po to galician # Galician translation of solr's debconf templates # This file is distributed under the same license as the solr package. +# # Jacobo Tarrio <[email protected]>, 2007. -# +# mvillarino <[email protected]>, 2009. msgid "" msgstr "" -"Project-Id-Version: solr\n" +"Project-Id-Version: solr_1.2.0+ds1-3_gl\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2007-10-04 07:18+0200\n" -"PO-Revision-Date: 2007-10-14 12:29+0100\n" -"Last-Translator: Jacobo Tarrio <[email protected]>\n" -"Language-Team: Galician <[email protected]>\n" +"PO-Revision-Date: 2009-01-26 22:12+0100\n" +"Last-Translator: Marce Villarino <[email protected]>\n" +"Language-Team: galician <[email protected]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #. Type: boolean #. Description #: ../solr-common.templates:2001 msgid "Remove Solr index files?" -msgstr "¿Eliminar os ficheiros de índice de Solr?" +msgstr "Desexa eliminar os ficheiros de índice de Solr?" #. Type: boolean #. Description @@ -27,7 +31,7 @@ "The Solr data directory (/var/lib/solr), and the index files it contains, " "may be removed while purging the package." msgstr "" -"Pódese eliminar o directorio de datos de Solr (/var/lib/solr), xunto cos " +"Póndese eliminar o directorio de datos de Solr (/var/lib/solr), xunto cos " "ficheiros de índices que contén, ao purgar o paquete." #. Type: boolean Deleted: trunk/solr/debian/po/se.po =================================================================== --- trunk/solr/debian/po/se.po 2009-03-23 21:03:50 UTC (rev 8109) +++ trunk/solr/debian/po/se.po 2009-03-24 15:58:24 UTC (rev 8110) @@ -1,41 +0,0 @@ -# translation of solr_1.2.0+ds1-3_templates.po to swedish -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Martin Bagge <[email protected]>, 2008. -msgid "" -msgstr "" -"Project-Id-Version: solr_1.2.0+ds1-3_templates\n" -"Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2007-10-04 07:18+0200\n" -"PO-Revision-Date: 2008-05-28 20:16+0200\n" -"Last-Translator: Martin Bagge <[email protected]>\n" -"Language-Team: swedish <[email protected]>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#. Type: boolean -#. Description -#: ../solr-common.templates:2001 -msgid "Remove Solr index files?" -msgstr "Ta bort index filer för Solr?" - -#. Type: boolean -#. Description -#: ../solr-common.templates:2001 -msgid "" -"The Solr data directory (/var/lib/solr), and the index files it contains, " -"may be removed while purging the package." -msgstr "Data-katalogen (/var/lib/solr), samt index-filerna som finns däri, kan raderas när paketet rensas ut." - -#. Type: boolean -#. Description -#: ../solr-common.templates:2001 -msgid "" -"You should not choose this option if you intend to re-use Solr's index files " -"later." -msgstr "Du ska inte välja det här alternativet om du har tänkt använda Solrs index-filer vid ett senare tillfälle." - - Copied: trunk/solr/debian/po/sv.po (from rev 6916, trunk/solr/debian/po/se.po) =================================================================== --- trunk/solr/debian/po/sv.po (rev 0) +++ trunk/solr/debian/po/sv.po 2009-03-24 15:58:24 UTC (rev 8110) @@ -0,0 +1,41 @@ +# translation of solr_1.2.0+ds1-3_templates.po to swedish +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Martin Bagge <[email protected]>, 2008. +msgid "" +msgstr "" +"Project-Id-Version: solr_1.2.0+ds1-3_templates\n" +"Report-Msgid-Bugs-To: [email protected]\n" +"POT-Creation-Date: 2007-10-04 07:18+0200\n" +"PO-Revision-Date: 2008-05-28 20:16+0200\n" +"Last-Translator: Martin Bagge <[email protected]>\n" +"Language-Team: swedish <[email protected]>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. Type: boolean +#. Description +#: ../solr-common.templates:2001 +msgid "Remove Solr index files?" +msgstr "Ta bort index filer för Solr?" + +#. Type: boolean +#. Description +#: ../solr-common.templates:2001 +msgid "" +"The Solr data directory (/var/lib/solr), and the index files it contains, " +"may be removed while purging the package." +msgstr "Data-katalogen (/var/lib/solr), samt index-filerna som finns däri, kan raderas när paketet rensas ut." + +#. Type: boolean +#. Description +#: ../solr-common.templates:2001 +msgid "" +"You should not choose this option if you intend to re-use Solr's index files " +"later." +msgstr "Du ska inte välja det här alternativet om du har tänkt använda Solrs index-filer vid ett senare tillfälle." + + Property changes on: trunk/solr/debian/po/sv.po ___________________________________________________________________ Name: svn:mergeinfo + Modified: trunk/solr/debian/rules =================================================================== --- trunk/solr/debian/rules 2009-03-23 21:03:50 UTC (rev 8109) +++ trunk/solr/debian/rules 2009-03-24 15:58:24 UTC (rev 8110) @@ -4,6 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/dpatch.mk include /usr/share/cdbs/1/class/ant.mk +#include /usr/share/cdbs/1/class/maven.mk # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 @@ -27,7 +28,7 @@ # Set ant parameters DEB_ANT_BUILD_TARGET = compile javadoc dist-war DEB_ANT_CHECK_TARGET = test -DEB_JARS = ant-junit junit +DEB_JARS = ant-junit junit4 DEB_INSTALL_CHANGELOGS_solr-common := CHANGES.txt @@ -72,16 +73,16 @@ install --mode 0644 debian/solr-tomcat5.5.xml $(TOMCAT_INSTDIR)/etc/solr/ install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/solr/tomcat.policy -install/solr-jetty:: - # Configure Jetty - install --mode 0644 debian/jetty-web.xml $(JETTY_INSTDIR)/usr/share/solr/WEB-INF/ +#install/solr-jetty:: +# # Configure Jetty +# install --mode 0644 debian/jetty-web.xml $(JETTY_INSTDIR)/usr/share/solr/WEB-INF/ remove-source: - rm -f build.xml + rm -f build.xml common-build.xml rm -f *.txt rm -f *stamp rm -rf debian/patched - rm -rf build dist docs example lib src + rm -rf build dist docs example lib src contrib client rm -rf apache-solr* restore-from-source: remove-source ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz Modified: trunk/solr/debian/watch =================================================================== --- trunk/solr/debian/watch 2009-03-23 21:03:50 UTC (rev 8109) +++ trunk/solr/debian/watch 2009-03-24 15:58:24 UTC (rev 8110) @@ -1,4 +1,4 @@ version=3 opts=dversionmangle=s/\+ds\d+$// \ - http://www.apache.org/dist/lucene/solr/(?:[0-9]*\.[0-9]*)/apache-solr-(.*).tgz + http://www.apache.org/dist/lucene/solr/(?:[0-9\.]*)/apache-solr-(.*).tgz _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
