Author: janpascal-guest Date: 2009-09-02 08:34:21 +0000 (Wed, 02 Sep 2009) New Revision: 10222
Added: tags/solr/1.3.0+ds1-1/debian/copyright tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-need-network-access.dpatch tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.dirs tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.links tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.postinst tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.postrm tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.xml Removed: tags/solr/1.3.0+ds1-1/debian/README.source tags/solr/1.3.0+ds1-1/debian/copyright tags/solr/1.3.0+ds1-1/debian/copyright.legacy tags/solr/1.3.0+ds1-1/debian/orig-tar.sh tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-break-on-buildd.dpatch tags/solr/1.3.0+ds1-1/debian/solr-tomcat.dirs tags/solr/1.3.0+ds1-1/debian/solr-tomcat.links tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postinst tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postrm tags/solr/1.3.0+ds1-1/debian/solr-tomcat.xml Modified: tags/solr/1.3.0+ds1-1/debian/README.Debian tags/solr/1.3.0+ds1-1/debian/TODO tags/solr/1.3.0+ds1-1/debian/changelog tags/solr/1.3.0+ds1-1/debian/control tags/solr/1.3.0+ds1-1/debian/patches/00list tags/solr/1.3.0+ds1-1/debian/rules tags/solr/1.3.0+ds1-1/debian/watch Log: Tagged wrong version of solr-1.3.0+ds1-1 initially, corrected now Modified: tags/solr/1.3.0+ds1-1/debian/README.Debian =================================================================== --- tags/solr/1.3.0+ds1-1/debian/README.Debian 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/README.Debian 2009-09-02 08:34:21 UTC (rev 10222) @@ -4,11 +4,9 @@ Solr is an enterprise search server based on the Lucene Java library. The Debian packaging of Solr consists of three binary packages: - solr-common contains the Solr software itself and general configuration. -- solr-tomcat installs Solr as a servlet in Tomcat 6. After installation, +- solr-tomcat6 installs Solr as a servlet in Tomcat 6. After installation, point your browser to http://localhost:8080/solr/admin to see the Solr web administration interface. -- solr-jetty installs Solr as a servlet in the Jetty application server. - The Solr admin interface is at http://localhost:8080/solr/admin/ Homepage: http://lucene.apache.org/solr/ Deleted: tags/solr/1.3.0+ds1-1/debian/README.source =================================================================== --- tags/solr/1.3.0+ds1-1/debian/README.source 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/README.source 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,14 +0,0 @@ -The Debian source for the solr package is created by -removing superfluous library .jars and generated .jars, -.war and Javadoc from the upstream source archive. - -Run - debian/rules get-orig-source -to download the source tarball from Apache and repack -it into the Debian source. - -A note about the build system: most of the contents of the -Debian package is created by first building the .war file -using the upstream (ant) build system. The .war file -is then unpacked, and its components are installed into -the proper locations. Modified: tags/solr/1.3.0+ds1-1/debian/TODO =================================================================== --- tags/solr/1.3.0+ds1-1/debian/TODO 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/TODO 2009-09-02 08:34:21 UTC (rev 10222) @@ -4,6 +4,7 @@ - Use minimal default configuration instead of everything from the example - Do something with the example (package it, or supply the example files under /usr/share/doc/solr) +- Reinstate solr-jetty package now that Jetty 6 has been packaged - Maybe: add solr-standalone package (using embedded Jetty like the Solr example). - Maybe: move the API docs to a separate package (it's 8.7 MB, and not generally Modified: tags/solr/1.3.0+ds1-1/debian/changelog =================================================================== --- tags/solr/1.3.0+ds1-1/debian/changelog 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/changelog 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,18 +1,16 @@ solr (1.3.0+ds1-1) unstable; urgency=low * New upstream release (1.3.0). Closes: #521009. + * 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. * Removed dependency on javanet staxutils (see upstream issue SOLR-851). - * Disable unit tests that need network access or otherwise break on buildds. - Closes: #534031. + * Disable unit tests that need network access. Closes: #534031. * Change Section: to java. * Fix Tomcat policy for Solr 1.3.0. * Bump Standards-Version to 3.8.2 (no changes needed). - * Rename solr-tomcat6 package to solr-tomcat. - * Re-enable solr-jetty package now that Jetty6 is in sid. - * Update watch file to automatically repackage source - * Convert debian/copyright to machine-readable version - -- Jan-Pascal van Best <[email protected]> Sun, 09 Aug 2009 13:40:18 +0200 + -- Jan-Pascal van Best <[email protected]> Wed, 01 Jul 2009 22:47:44 +0200 solr (1.2.0+ds2-6) unstable; urgency=low Modified: tags/solr/1.3.0+ds1-1/debian/control =================================================================== --- tags/solr/1.3.0+ds1-1/debian/control 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/control 2009-09-02 08:34:21 UTC (rev 10222) @@ -18,7 +18,7 @@ libcommons-io-java (>= 1.3.1), liblucene2-java (>= 2.4.0), libxpp3-java (>= 1.1.3.4.0), - libtomcat6-java (>= 6.0.20-5), + libtomcat6-java (>= 6.0.20), libservlet2.5-java (>= 6.0.20), libjetty-java (>= 6.1.18) Standards-Version: 3.8.2 @@ -36,7 +36,7 @@ liblucene2-java (>= 2.4.0), libxpp3-java (>= 1.1.3.4.0), libtomcat6-java (>= 6.0.20) -Recommends: solr-tomcat (>= ${binary:Version}) | solr-jetty (>= ${binary:Version}) +Recommends: solr-tomcat5.5 (>= ${binary:Version}) | solr-jetty (>= ${binary:Version}) Description: enterprise search server based on Lucene - common files Solr is an open source enterprise search server based on the Lucene Java search library, with XML/HTTP and JSON APIs, hit highlighting, @@ -46,7 +46,7 @@ This package provides the common files for Solr. Install solr-tomcat5.5 or solr-jetty to use Solr under Tomcat or Jetty. -Package: solr-tomcat +Package: solr-tomcat6 Architecture: all Depends: ${misc:Depends}, solr-common (= ${binary:Version}), tomcat6 (>= 6.0.20) Conflicts: solr-jetty @@ -58,14 +58,14 @@ . This package provides the Tomcat integration files for Solr. -Package: solr-jetty -Architecture: all -Depends: ${misc:Depends}, solr-common (= ${binary:Version}), jetty (>= 6.1.18) -Conflicts: solr-tomcat -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: ${misc:Depends), solr-common (= ${binary:Version}), jetty (>= 5.1.14-1) +#Conflicts: solr-tomcat6 +#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. Deleted: tags/solr/1.3.0+ds1-1/debian/copyright =================================================================== --- tags/solr/1.3.0+ds1-1/debian/copyright 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/copyright 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,17 +0,0 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION -Name: solr -Maintainer: Debian Java Maintainers <[email protected]> -Source: http://lucene.apache.org/solr/ - -Files: * -Copyright: 2007,2008,2009 The Apache Software Foundation -License: Apache-2 - -Files: debian/* -Copyright: 2007,2008,2009 Jan-Pascal van Best <[email protected]> -License: Apache-2 - -License: Apache-2 - On Debian systems, the complete text of the Apache - License, version 2.0, can be found in the - `/usr/share/common-licenses/Apache-2.0' file. Copied: tags/solr/1.3.0+ds1-1/debian/copyright (from rev 9923, tags/solr/1.3.0+ds1-1/debian/copyright.legacy) =================================================================== --- tags/solr/1.3.0+ds1-1/debian/copyright (rev 0) +++ tags/solr/1.3.0+ds1-1/debian/copyright 2009-09-02 08:34:21 UTC (rev 10222) @@ -0,0 +1,25 @@ +This package was debianised by Jan-Pascal van Best <[email protected]> on +Mon, 06 Aug 2007 11:07:34 +0200 + +It was downloaded from + http://www.apache.org/dist/lucene/solr/1.2/apache-solr-1.2.tgz +and then superfluous library .jars and generated .jars, .war and Javadoc +was removed to generate the .orig.tar.gz file. Run + debian/rules get-orig-source +to download the source tarball from Apache and repack it into the Debian source. + +Apache Solr is + Copyright 2007,2008,2009 The Apache Software Foundation + +Authors: + Doug Cutting <[email protected]> + Erik Hatcher <[email protected]> + Otis Gospodnetic <[email protected]> + et.al. + +The Debian packaging is + Copyright 2007,2008,2009 by Jan-Pascal van Best <[email protected]> + +Both the original software and the Debian packaging are licensed under the +Apache License, version 2.0. On Debian systems, the complete text of the Apache +License, version 2.0, can be found in `/usr/share/common-licenses/Apache-2.0'. Deleted: tags/solr/1.3.0+ds1-1/debian/copyright.legacy =================================================================== --- tags/solr/1.3.0+ds1-1/debian/copyright.legacy 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/copyright.legacy 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,25 +0,0 @@ -This package was debianised by Jan-Pascal van Best <[email protected]> on -Mon, 06 Aug 2007 11:07:34 +0200 - -It was downloaded from - http://www.apache.org/dist/lucene/solr/1.2/apache-solr-1.2.tgz -and then superfluous library .jars and generated .jars, .war and Javadoc -was removed to generate the .orig.tar.gz file. Run - debian/rules get-orig-source -to download the source tarball from Apache and repack it into the Debian source. - -Apache Solr is - Copyright 2007,2008,2009 The Apache Software Foundation - -Authors: - Doug Cutting <[email protected]> - Erik Hatcher <[email protected]> - Otis Gospodnetic <[email protected]> - et.al. - -The Debian packaging is - Copyright 2007,2008,2009 by Jan-Pascal van Best <[email protected]> - -Both the original software and the Debian packaging are licensed under the -Apache License, version 2.0. On Debian systems, the complete text of the Apache -License, version 2.0, can be found in `/usr/share/common-licenses/Apache-2.0'. Deleted: tags/solr/1.3.0+ds1-1/debian/orig-tar.sh =================================================================== --- tags/solr/1.3.0+ds1-1/debian/orig-tar.sh 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/orig-tar.sh 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,34 +0,0 @@ -#!/bin/sh -e - -UPSTREAM_VERSION=${UPSTREAM_VERSION:-"$2"} -DEBIAN_SOURCE_VERSION=${DEBIAN_SOURCE_VERSION:-"$2+ds1"} - -DESTDIR=$PWD/.. -UPSTREAM_SOURCE="$DESTDIR/apache-solr-$UPSTREAM_VERSION.tgz" -UPSTREAM_URL="http://archive.apache.org/dist/lucene/solr/$UPSTREAM_VERSION/apache-solr-$UPSTREAM_VERSION.tgz"; -DEBIAN_SOURCE="$DESTDIR/solr_$DEBIAN_SOURCE_VERSION.orig.tar.gz" - -# Test if the upstream tarball needs to be downloaded -if [ ! -r $UPSTREAM_SOURCE ]; then - wget -O "$UPSTREAM_SOURCE" "$UPSTREAM_URL" -fi - -# Repackage upstream source file without the third party jars -TEMPDIR="solr-$DEBIAN_SOURCE_VERSION" -mkdir "$TEMPDIR" -echo "Unpacking into tempdir $TEMPDIR..." -tar xzf $UPSTREAM_SOURCE -C $TEMPDIR --strip 1 - -echo "Removing third party jars, wars, and generated API docs..." -find $TEMPDIR -name \*.jar -exec rm {} \; -find $TEMPDIR -name \*.war -exec rm {} \; -rm -rf $TEMPDIR/dist -rm -rf $TEMPDIR/docs/api - -echo "Packing new orig source tarball $DEBIAN_SOURCE..." -# uscan may have already put the symlink there -rm -f $DEBIAN_SOURCE -GZIP=--best tar czf $DEBIAN_SOURCE $TEMPDIR - -echo "Removing tempdir $TEMPDIR..." -rm -rf "$TEMPDIR" Modified: tags/solr/1.3.0+ds1-1/debian/patches/00list =================================================================== --- tags/solr/1.3.0+ds1-1/debian/patches/00list 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/patches/00list 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,7 +1,7 @@ 01_remove-all-jarfiles.dpatch 04_fix-lucene-lock-directory.dpatch 05_use-debian-java-libraries.dpatch -08_disable-tests-that-break-on-buildd.dpatch +08_disable-tests-that-need-network-access.dpatch 10_contrib-dataimporthandler-use-debian-libs.dpatch 15_fix-failed-test-with-new-jetty.dpatch 16_fix-failed-SolrInfoMBeanTest.dpatch Deleted: tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-break-on-buildd.dpatch =================================================================== --- tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-break-on-buildd.dpatch 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-break-on-buildd.dpatch 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,68 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 08_disable-tests-that-need-network-access.dpatch by Jan-Pascal van Best <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Disable tests that need network access, because they fail for (some of) -## DP: the autobuilders - -...@dpatch@ -diff -urNad solr~/src/test/org/apache/solr/common/util/ContentStreamTest.java solr/src/test/org/apache/solr/common/util/ContentStreamTest.java ---- solr~/src/test/org/apache/solr/common/util/ContentStreamTest.java 2009-07-03 09:38:05.000000000 +0200 -+++ solr/src/test/org/apache/solr/common/util/ContentStreamTest.java 2009-07-03 09:38:06.000000000 +0200 -@@ -55,7 +55,7 @@ - assertTrue( IOUtils.contentEquals( new FileReader( file ), stream.getReader() ) ); - } - -- -+/* Disabled for Debian build because this test needs network access - public void testURLStream() throws IOException - { - String content = null; -@@ -87,4 +87,5 @@ - stream = new ContentStreamBase.URLStream( url ); - assertTrue( IOUtils.contentEquals( new StringReader( content ), stream.getReader() ) ); - } -+*/ - } -diff -urNad solr~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java ---- solr~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java 2009-07-03 09:38:05.000000000 +0200 -+++ solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java 2009-07-03 09:38:06.000000000 +0200 -@@ -95,7 +95,7 @@ - } - } - -- -+/* Disabled for Debian builds because this test needs network access - public void testStreamURL() throws Exception - { - boolean ok = false; -@@ -121,7 +121,7 @@ - assertEquals( 1, streams.size() ); - assertEquals( txt, IOUtils.toString( streams.get(0).getStream() ) ); - } -- -+*/ - public void testUrlParamParsing() - { - String[][] teststr = new String[][] { -diff -urNad solr~/src/test/org/apache/solr/update/AutoCommitTest.java solr/src/test/org/apache/solr/update/AutoCommitTest.java ---- solr~/src/test/org/apache/solr/update/AutoCommitTest.java 2008-08-27 15:04:04.000000000 +0200 -+++ solr/src/test/org/apache/solr/update/AutoCommitTest.java 2009-07-03 09:39:14.000000000 +0200 -@@ -83,6 +83,8 @@ - - /* This test is causing too many failures on one of the build slaves. - Temporarily disabled. -Mike Klaas */ -+/* Commented out for Debian builds. Apparently some of the buildd's try to -+ * perform this test anyway (and break) - public void XXXtestMaxDocs() throws Exception { - - CommitListener trigger = new CommitListener(); -@@ -128,7 +130,7 @@ - assertEquals( 1, tracker.getCommitCount()); - - } -- -+*/ - public void testMaxTime() throws Exception { - CommitListener trigger = new CommitListener(); - SolrCore core = h.getCore(); Copied: tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-need-network-access.dpatch (from rev 9923, tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-break-on-buildd.dpatch) =================================================================== --- tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-need-network-access.dpatch (rev 0) +++ tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-need-network-access.dpatch 2009-09-02 08:34:21 UTC (rev 10222) @@ -0,0 +1,47 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_disable-tests-that-need-network-access.dpatch by Jan-Pascal van Best <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Disable tests that need network access, because they fail for (some of) +## DP: the autobuilders + +...@dpatch@ +diff -urNad solr~/src/test/org/apache/solr/common/util/ContentStreamTest.java solr/src/test/org/apache/solr/common/util/ContentStreamTest.java +--- solr~/src/test/org/apache/solr/common/util/ContentStreamTest.java 2009-07-02 09:27:43.000000000 +0200 ++++ solr/src/test/org/apache/solr/common/util/ContentStreamTest.java 2009-07-02 09:27:44.000000000 +0200 +@@ -55,7 +55,7 @@ + assertTrue( IOUtils.contentEquals( new FileReader( file ), stream.getReader() ) ); + } + +- ++/* Disabled for Debian build because this test needs network access + public void testURLStream() throws IOException + { + String content = null; +@@ -87,4 +87,5 @@ + stream = new ContentStreamBase.URLStream( url ); + assertTrue( IOUtils.contentEquals( new StringReader( content ), stream.getReader() ) ); + } ++*/ + } +diff -urNad solr~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java +--- solr~/src/test/org/apache/solr/servlet/SolrRequestParserTest.java 2009-07-02 09:27:43.000000000 +0200 ++++ solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java 2009-07-02 09:27:44.000000000 +0200 +@@ -95,7 +95,7 @@ + } + } + +- ++/* Disabled for Debian builds because this test needs network access + public void testStreamURL() throws Exception + { + boolean ok = false; +@@ -121,7 +121,7 @@ + assertEquals( 1, streams.size() ); + assertEquals( txt, IOUtils.toString( streams.get(0).getStream() ) ); + } +- ++*/ + public void testUrlParamParsing() + { + String[][] teststr = new String[][] { Modified: tags/solr/1.3.0+ds1-1/debian/rules =================================================================== --- tags/solr/1.3.0+ds1-1/debian/rules 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/rules 2009-09-02 08:34:21 UTC (rev 10222) @@ -16,7 +16,7 @@ CHANGESFILE = ../solr_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes COMMON_INSTDIR=$(CURDIR)/debian/solr-common -TOMCAT_INSTDIR=$(CURDIR)/debian/solr-tomcat +TOMCAT_INSTDIR=$(CURDIR)/debian/solr-tomcat6 JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr @@ -70,14 +70,14 @@ rmdir --ignore-fail-on-non-empty $(COMMON_INSTDIR)/usr/share/doc/solr-common/docs/skin/scripts rmdir --ignore-fail-on-non-empty $(COMMON_INSTDIR)/usr/share/doc/solr-common/docs/skin/translations -install/solr-tomcat:: - # Configure tomcat (also see solr-tomcat.links) - install --mode 0644 debian/solr-tomcat.xml $(TOMCAT_INSTDIR)/etc/solr/ +install/solr-tomcat6:: + # Configure tomcat (also see solr-tomcat6.links) + install --mode 0644 debian/solr-tomcat6.xml $(TOMCAT_INSTDIR)/etc/solr/ install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/solr/ -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 common-build.xml @@ -93,13 +93,13 @@ get-orig-source: ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz: - debian/orig-tar.sh --upstream-version $(UPSTREAM_VERSION) + debian/get-orig-source check: lintian -i $(CHANGESFILE) linda -i $(CHANGESFILE) zgrep "^---" ../solr_$(DEB_VERSION).diff.gz | grep -v debian ; [ $$? != 0 ] ( dpkg --contents ../solr-common_$(DEB_VERSION)_all.deb ; \ - dpkg --contents ../solr-tomcat_$(DEB_VERSION)_all.deb ; \ - dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \ + dpkg --contents ../solr-tomcat6_$(DEB_VERSION)_all.deb ; \ ) | less + #dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \ Deleted: tags/solr/1.3.0+ds1-1/debian/solr-tomcat.dirs =================================================================== --- tags/solr/1.3.0+ds1-1/debian/solr-tomcat.dirs 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat.dirs 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,4 +0,0 @@ -/etc/solr -/etc/tomcat6/policy.d -/var/lib/solr -/var/lib/solr/data Deleted: tags/solr/1.3.0+ds1-1/debian/solr-tomcat.links =================================================================== --- tags/solr/1.3.0+ds1-1/debian/solr-tomcat.links 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat.links 2009-09-02 08:34:21 UTC (rev 10222) @@ -1 +0,0 @@ -/etc/solr/solr-tomcat.xml /etc/tomcat6/Catalina/localhost/solr.xml Deleted: tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postinst =================================================================== --- tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postinst 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postinst 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,41 +0,0 @@ -#!/bin/sh - -set -e - -# If proper permissions for the stuff under /var/lib/solr haven't -# been set, set them now - -case "$1" in - configure) - - # fixup for upgrade from solr-tomcat55, wich makes this tomcat55:root 750 - chown root:root /var/lib/solr - chmod 755 /var/lib/solr - - chown -R tomcat6:tomcat6 /var/lib/solr/data - chmod -R 770 /var/lib/solr/data - - ln -sf /etc/solr/tomcat.policy /etc/tomcat6/policy.d/05solr.policy - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -invoke-rc.d --quiet tomcat6 restart || { - RESULT=$? - # Ignore if tomcat6 init script does not exist (yet) - if [ $RESULT != 100 ]; then - exit $RESULT - fi -} - -#DEBHELPER# Deleted: tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postrm =================================================================== --- tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postrm 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postrm 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,30 +0,0 @@ -#!/bin/sh - -set -e - -case "$1" in - remove) - - rm -f /etc/tomcat6/policy.d/05solr.policy - - # Is there a way not to restart tomcat if it is due to be removed, too? - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d tomcat6 restart || true - fi - - ;; - - upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear) - - # do nothing - - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; - -esac - -#DEBHELPER# Deleted: tags/solr/1.3.0+ds1-1/debian/solr-tomcat.xml =================================================================== --- tags/solr/1.3.0+ds1-1/debian/solr-tomcat.xml 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat.xml 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,11 +0,0 @@ -<!-- - Context configuration file for the Solr Web App ---> - -<Context path="/solr" docBase="/usr/share/solr" - debug="0" privileged="true" allowLinking="true" crossContext="true"> - <!-- make symlinks work in Tomcat --> - <Resources className="org.apache.naming.resources.FileDirContext" allowLinking="true" /> - - <Environment name="solr/home" type="java.lang.String" value="/usr/share/solr" override="true" /> -</Context> Copied: tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.dirs (from rev 9923, tags/solr/1.3.0+ds1-1/debian/solr-tomcat.dirs) =================================================================== --- tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.dirs (rev 0) +++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.dirs 2009-09-02 08:34:21 UTC (rev 10222) @@ -0,0 +1,4 @@ +/etc/solr +/etc/tomcat6/policy.d +/var/lib/solr +/var/lib/solr/data Copied: tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.links (from rev 9923, tags/solr/1.3.0+ds1-1/debian/solr-tomcat.links) =================================================================== --- tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.links (rev 0) +++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.links 2009-09-02 08:34:21 UTC (rev 10222) @@ -0,0 +1 @@ +/etc/solr/solr-tomcat6.xml /etc/tomcat6/Catalina/localhost/solr.xml Copied: tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.postinst (from rev 9923, tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postinst) =================================================================== --- tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.postinst (rev 0) +++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.postinst 2009-09-02 08:34:21 UTC (rev 10222) @@ -0,0 +1,41 @@ +#!/bin/sh + +set -e + +# If proper permissions for the stuff under /var/lib/solr haven't +# been set, set them now + +case "$1" in + configure) + + # fixup for upgrade from solr-tomcat55, wich makes this tomcat55:root 750 + chown root:root /var/lib/solr + chmod 755 /var/lib/solr + + chown -R tomcat6:tomcat6 /var/lib/solr/data + chmod -R 770 /var/lib/solr/data + + ln -sf /etc/solr/tomcat.policy /etc/tomcat6/policy.d/05solr.policy + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +invoke-rc.d --quiet tomcat6 restart || { + RESULT=$? + # Ignore if tomcat6 init script does not exist (yet) + if [ $RESULT != 100 ]; then + exit $RESULT + fi +} + +#DEBHELPER# Copied: tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.postrm (from rev 9923, tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postrm) =================================================================== --- tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.postrm (rev 0) +++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.postrm 2009-09-02 08:34:21 UTC (rev 10222) @@ -0,0 +1,30 @@ +#!/bin/sh + +set -e + +case "$1" in + remove) + + rm -f /etc/tomcat6/policy.d/05solr.policy + + # Is there a way not to restart tomcat if it is due to be removed, too? + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d tomcat6 restart || true + fi + + ;; + + upgrade|purge|failed-upgrade|abort-install|abort-upgrade|disappear) + + # do nothing + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; + +esac + +#DEBHELPER# Copied: tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.xml (from rev 9923, tags/solr/1.3.0+ds1-1/debian/solr-tomcat.xml) =================================================================== --- tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.xml (rev 0) +++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat6.xml 2009-09-02 08:34:21 UTC (rev 10222) @@ -0,0 +1,11 @@ +<!-- + Context configuration file for the Solr Web App +--> + +<Context path="/solr" docBase="/usr/share/solr" + debug="0" privileged="true" allowLinking="true" crossContext="true"> + <!-- make symlinks work in Tomcat --> + <Resources className="org.apache.naming.resources.FileDirContext" allowLinking="true" /> + + <Environment name="solr/home" type="java.lang.String" value="/usr/share/solr" override="true" /> +</Context> Modified: tags/solr/1.3.0+ds1-1/debian/watch =================================================================== --- tags/solr/1.3.0+ds1-1/debian/watch 2009-09-02 05:11:26 UTC (rev 10221) +++ tags/solr/1.3.0+ds1-1/debian/watch 2009-09-02 08:34:21 UTC (rev 10222) @@ -1,5 +1,4 @@ version=3 opts=dversionmangle=s/\+ds\d+$// \ - http://archive.apache.org/dist/lucene/solr/(?:[\d\.]+)/apache-solr-(.*).tgz \ - debian debian/orig-tar.sh + http://archive.apache.org/dist/lucene/solr/(?:[\d\.]+)/apache-solr-(.*).tgz _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
