[pkg-java] r9923 - in tags/solr: . 1.3.0+ds1-1 1.3.0+ds1-1/debian 1.3.0+ds1-1/debian/patches
Jan-Pascal van Best
janpascal-guest at alioth.debian.org
Mon Aug 10 11:31:51 UTC 2009
Author: janpascal-guest
Date: 2009-08-10 11:31:51 +0000 (Mon, 10 Aug 2009)
New Revision: 9923
Added:
tags/solr/1.3.0+ds1-1/
tags/solr/1.3.0+ds1-1/debian/README.Debian
tags/solr/1.3.0+ds1-1/debian/README.source
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/compat
tags/solr/1.3.0+ds1-1/debian/control
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/00list
tags/solr/1.3.0+ds1-1/debian/patches/01_remove-all-jarfiles.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/04_fix-lucene-lock-directory.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/05_use-debian-java-libraries.dpatch
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/10_contrib-dataimporthandler-use-debian-libs.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/15_fix-failed-test-with-new-jetty.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/20_remove-dependency-on-javanet-staxutils-SOLR-851.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/22_fix-compile-error-with-ambiguous-assert.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/24_fix-syntax-error-in-shell-script.dpatch
tags/solr/1.3.0+ds1-1/debian/rules
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
tags/solr/1.3.0+ds1-1/debian/tomcat.policy
tags/solr/1.3.0+ds1-1/debian/watch
Removed:
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/compat
tags/solr/1.3.0+ds1-1/debian/control
tags/solr/1.3.0+ds1-1/debian/copyright
tags/solr/1.3.0+ds1-1/debian/patches/00list
tags/solr/1.3.0+ds1-1/debian/patches/01_remove-all-jarfiles.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/02_fix-solr-version.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/03_relocate-datadir.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/04_fix-lucene-lock-directory.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/05_use-debian-java-libraries.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/06_use-debian-java-libraries-but-include-them-in-lib.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/07_fix-for-lucene-2.3.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch
tags/solr/1.3.0+ds1-1/debian/patches/15_fix-failed-test-with-new-jetty.dpatch
tags/solr/1.3.0+ds1-1/debian/rules
tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.dirs
tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.links
tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.postinst
tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.postrm
tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.xml
tags/solr/1.3.0+ds1-1/debian/tomcat.policy
tags/solr/1.3.0+ds1-1/debian/watch
Log:
Tagged solr release 1.3.0+ds1-1
Property changes on: tags/solr/1.3.0+ds1-1
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: tags/solr/1.3.0+ds1-1/debian/README.Debian
===================================================================
--- trunk/solr/debian/README.Debian 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/README.Debian 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,26 +0,0 @@
-README for solr
----------------
-
-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-tomcat5.5 installs Solr as a servlet in Tomcat 5.5. After installation,
- point your browser to http://localhost:8180/solr/admin
- to see the Solr web administration interface.
-- solr-jetty installs Solr as a servlet in Jetty. After installation,
- point your browser to http://localhost:8280/solr/admin
- to see the Solr web administration interface.
-
-Solr-tomcat5.5 and solr-jetty use the same index files. If you remove solr-tomcat5.5
-and install solr-jetty, you keep the indexes. This implies that solr-tomcat5.5 and
-solr-jetty cannot be installed at the same time.
-
-Jetty is broken as of version 5.1.14-1: you need to add the line
- $(tomcat.lib.home)/jasper-compiler-jdt.jar ! available org.eclipse.jdt.core.JDTCompilerAdapter
-near the end of your /etc/jetty/start.config
-
-Homepage: http://lucene.apache.org/solr/
-
-Replication
------------
-Solr's replication scripts are installed into /usr/share/solr/scripts
Copied: tags/solr/1.3.0+ds1-1/debian/README.Debian (from rev 9028, trunk/solr/debian/README.Debian)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/README.Debian (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/README.Debian 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,17 @@
+README for solr
+---------------
+
+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,
+ 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/
+
+Replication
+-----------
+Solr's replication scripts are installed into /usr/share/solr/scripts
Copied: tags/solr/1.3.0+ds1-1/debian/README.source (from rev 9028, trunk/solr/debian/README.source)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/README.source (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/README.source 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,14 @@
+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.
Deleted: tags/solr/1.3.0+ds1-1/debian/TODO
===================================================================
--- trunk/solr/debian/TODO 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/TODO 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,12 +0,0 @@
-TODO.Debian for solr
---------------------
-
-- 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)
-- Maybe: add solr-standalone package (using embedded Jetty like the Solr
- example). This would depend on the Jetty package, though, so maybe it's not
- such a useful idea.
-- Maybe: move the API docs to a separate package (it's 8.7 MB, and not generally
- useful to people just interested in running Solr, only to those extending it).
-
Copied: tags/solr/1.3.0+ds1-1/debian/TODO (from rev 9028, trunk/solr/debian/TODO)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/TODO (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/TODO 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,12 @@
+TODO.Debian for solr
+--------------------
+
+- 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)
+- 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
+ useful to people just interested in running Solr, only to those extending it).
+- Maybe: make seperate solrj client library package
+- Do a license check also of things that 'licensecheck -r' does not catch
Deleted: tags/solr/1.3.0+ds1-1/debian/changelog
===================================================================
--- trunk/solr/debian/changelog 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/changelog 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,71 +0,0 @@
-solr (1.3.0+ds1-1) UNRELEASED; urgency=low
-
- * 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 <janpascal at vanbest.org> Sun, 01 Feb 2009 12:32:49 +0100
-
-solr (1.2.0+ds2-1) unstable; urgency=low
-
- * New (fake) upstream version to work around a bug in dak.
-
- -- Jan-Pascal van Best <janpascal at vanbest.org> Mon, 08 Sep 2008 16:00:54 +0200
-
-solr (1.2.0+ds1-4) unstable; urgency=low
-
- * Build with OpenJDK, move to main
- * Update debian/copyright, refer to Apache 2.0 license in common-licenses
- * Bump Standards-Version to 3.8.0
- * Do not create unused directory /usr/share/tomcat5.5/conf/Catalina/localhost
- * Install Solr docs from debian/rules instead of from debian/docs; remove
- a few empty directories
- * Do not compress .js, .xslt and .xsl files under doc/
- * Update Debian README for the removal of solr-jetty; renamed to
- README.Debian
- * Added Swedish translation of debconf messages (closes: #483416).
-
- -- Jan-Pascal van Best <janpascal at vanbest.org> Wed, 20 Aug 2008 20:25:03 +0200
-
-solr (1.2.0+ds1-3) unstable; urgency=low
-
- * Updated control file for new Vcs-* and Homepage fields
- * Removed solr-jetty binary package since the jetty package
- has been removed from Lenny
- * Update to Lucene 2.3
-
- -- Jan-Pascal van Best <janpascal at vanbest.org> Tue, 22 Apr 2008 17:08:50 +0200
-
-solr (1.2.0+ds1-2) unstable; urgency=low
-
- * Run unit tests during build (closes: #441890).
- * Rename /usr/share/solr/bin directory to /usr/share/solr/scripts, since
- this directory contains only scripts.
- * Install link to config file in /etc/tomcat5.5/Catalina/localhost because
- this is the new location in recent Tomcat packaging.
- * Remove portions of the copyright file that referred to libraries that are
- not shipped with the Debian package for Solr.
- * Debconf templates and debian/control reviewed by the debian-l10n-
- english team as part of the Smith review project. (closes: #444655).
- * Add Portuguese translation of debconf messages (closes: #442306, #445351).
- * Add Tamil translation of debconf messages (closes: #445284).
- * Add Czech translation of debconf messages (closes: #445652).
- * Add Finnish translation of debconf messages (closes: #445701).
- * Add Russian translation of debconf messages (closes: #446140).
- * Add German translation of debconf messages (closes: #446284).
- * Add Galician translation of debconf messages (closes: #446607).
- * Add Vietnamese translation of debconf messages (closes: #446986).
- * Add Brazilian Portuguese translation of debconf messages (closes: #447091).
- * Add French translation of debconf messages (closes: #447223).
-
- -- Jan-Pascal van Best <janpascal at vanbest.org> Mon, 26 Nov 2007 12:02:17 +0100
-
-solr (1.2.0+ds1-1) unstable; urgency=low
-
- * Initial upload (Closes: #426763)
-
- -- Jan-Pascal van Best <janpascal at vanbest.org> Thu, 06 Sep 2007 22:50:49 +0200
Copied: tags/solr/1.3.0+ds1-1/debian/changelog (from rev 9922, trunk/solr/debian/changelog)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/changelog (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/changelog 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,122 @@
+solr (1.3.0+ds1-1) unstable; urgency=low
+
+ * New upstream release (1.3.0). Closes: #521009.
+ * Removed dependency on javanet staxutils (see upstream issue SOLR-851).
+ * Disable unit tests that need network access or otherwise break on buildds.
+ 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 <janpascal at vanbest.org> Sun, 09 Aug 2009 13:40:18 +0200
+
+solr (1.2.0+ds2-6) unstable; urgency=low
+
+ * Update dependency from tomcat5.5 to tomcat6. Closes: #526259.
+ * Bump Standards-Version to 3.8.1 (no changes needed).
+ * Remove dpkg-statoverride stuff from solr-tomcat6.postinst. It's not needed
+ and does not work.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Tue, 23 Jun 2009 15:37:07 +0200
+
+solr (1.2.0+ds2-5) unstable; urgency=low
+
+ * Use tomcat.policy symlink in original direction and have symlink
+ set by maintainer scripts to prevent problems with solr upgrades.
+ Closes: #516288.
+ * Have solr-tomcat5.5 depend on solr-common with the exact same version
+ to prevent later problems.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Fri, 27 Feb 2009 22:47:55 +0100
+
+solr (1.2.0+ds2-4) unstable; urgency=low
+
+ * Updated watch file
+ * Add ${misc:Depends} to debian/control to take into account indirect
+ dependencies from debhelper
+ * Added depenency on libxpp3-java (typo in control file, closes: #483261).
+ * Moved /etc/solr/tomcat.policy to /etc/tomcat5.5/policy.d/ and reversed
+ symlink. Closes: #515945.
+ * Remove /etc/tomcat5/policy.d from solr-tomcat5.5.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Thu, 19 Feb 2009 20:48:07 +0100
+
+solr (1.2.0+ds2-3) unstable; urgency=low
+
+ * Update Galician translations in gl.po (closes: 513148).
+ * Update to compile with Lucene 2.4.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Wed, 28 Jan 2009 13:30:55 +0100
+
+solr (1.2.0+ds2-2) unstable; urgency=low
+
+ * Fix Swedish translation of debconf messages by renaming se.po to sv.po
+ (closes: #483416).
+ * Added DM-Upload-Allowed: yes to debian/control
+ * Restricted dependency on liblucene2-java to version << 2.4.0
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Mon, 13 Oct 2008 11:54:46 +0200
+
+solr (1.2.0+ds2-1) unstable; urgency=low
+
+ * New (fake) upstream version to work around a bug in dak.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Mon, 08 Sep 2008 16:00:54 +0200
+
+solr (1.2.0+ds1-4) unstable; urgency=low
+
+ * Build with OpenJDK, move to main
+ * Update debian/copyright, refer to Apache 2.0 license in common-licenses
+ * Bump Standards-Version to 3.8.0
+ * Do not create unused directory /usr/share/tomcat5.5/conf/Catalina/localhost
+ * Install Solr docs from debian/rules instead of from debian/docs; remove
+ a few empty directories
+ * Do not compress .js, .xslt and .xsl files under doc/
+ * Update Debian README for the removal of solr-jetty; renamed to
+ README.Debian
+ * Added Swedish translation of debconf messages (closes: #483416).
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Wed, 20 Aug 2008 20:25:03 +0200
+
+solr (1.2.0+ds1-3) unstable; urgency=low
+
+ * Updated control file for new Vcs-* and Homepage fields
+ * Removed solr-jetty binary package since the jetty package
+ has been removed from Lenny
+ * Update to Lucene 2.3
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Tue, 22 Apr 2008 17:08:50 +0200
+
+solr (1.2.0+ds1-2) unstable; urgency=low
+
+ * Run unit tests during build (closes: #441890).
+ * Rename /usr/share/solr/bin directory to /usr/share/solr/scripts, since
+ this directory contains only scripts.
+ * Install link to config file in /etc/tomcat5.5/Catalina/localhost because
+ this is the new location in recent Tomcat packaging.
+ * Remove portions of the copyright file that referred to libraries that are
+ not shipped with the Debian package for Solr.
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. (closes: #444655).
+ * Add Portuguese translation of debconf messages (closes: #442306, #445351).
+ * Add Tamil translation of debconf messages (closes: #445284).
+ * Add Czech translation of debconf messages (closes: #445652).
+ * Add Finnish translation of debconf messages (closes: #445701).
+ * Add Russian translation of debconf messages (closes: #446140).
+ * Add German translation of debconf messages (closes: #446284).
+ * Add Galician translation of debconf messages (closes: #446607).
+ * Add Vietnamese translation of debconf messages (closes: #446986).
+ * Add Brazilian Portuguese translation of debconf messages (closes: #447091).
+ * Add French translation of debconf messages (closes: #447223).
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Mon, 26 Nov 2007 12:02:17 +0100
+
+solr (1.2.0+ds1-1) unstable; urgency=low
+
+ * Initial upload (Closes: #426763)
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Thu, 06 Sep 2007 22:50:49 +0200
Deleted: tags/solr/1.3.0+ds1-1/debian/compat
===================================================================
--- trunk/solr/debian/compat 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/compat 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1 +0,0 @@
-4
Copied: tags/solr/1.3.0+ds1-1/debian/compat (from rev 8718, trunk/solr/debian/compat)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/compat (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/compat 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1 @@
+5
Deleted: tags/solr/1.3.0+ds1-1/debian/control
===================================================================
--- trunk/solr/debian/control 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/control 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,66 +0,0 @@
-Source: solr
-Section: web
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>
-DM-Upload-Allowed: yes
-Homepage: http://lucene.apache.org/solr/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/solr/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/solr/
-Build-Depends: cdbs, debhelper (>= 4.1.0), dpatch (>= 2.0), po-debconf,
- openjdk-6-jdk (>= 6b11-5),
- ant (>= 1.7.0), ant-optional (>= 1.7.0),
- junit (>= 3.8.1.1), libeasymock-java (>= 2.4),
- libcommons-codec-java (>= 1.3),
- libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
- libcommons-fileupload-java (>= 1.2),
- libcommons-io-java (>= 1.3.1),
- libservlet2.4-java (>= 5.0.30),
- liblucene2-java (>= 2.4.0),
- libxpp3-java (>= 1.1.3.4.0)
-Standards-Version: 3.8.0
-
-Package: solr-common
-Architecture: all
-Depends: debconf (>= 1.5),
- openjdk-6-jre (>= 6b11-5) | java5-runtime,
- libcommons-codec-java (>= 1.3),
- libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
- libcommons-fileupload-java (>= 1.2),
- libcommons-io-java (>= 1.3.1),
- libservlet2.4-java (>= 5.0.30),
- 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
- 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 common files for Solr. Install
- solr-tomcat5.5 or solr-jetty to use Solr under Tomcat or Jetty.
-
-Package: solr-tomcat5.5
-Architecture: all
-Depends: solr-common (>= ${binary:Version}), tomcat5.5 (>= 5.5.20)
-Conflicts: solr-jetty
-Description: enterprise search server based on Lucene - Tomcat 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 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.
Copied: tags/solr/1.3.0+ds1-1/debian/control (from rev 9922, trunk/solr/debian/control)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/control (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/control 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,71 @@
+Source: solr
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>
+DM-Upload-Allowed: yes
+Homepage: http://lucene.apache.org/solr/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/solr/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/solr/
+Build-Depends: cdbs, debhelper (>= 5.0.0), dpatch (>= 2.0), po-debconf,
+ openjdk-6-jdk (>= 6b11-5),
+ ant (>= 1.7.0), ant-optional (>= 1.7.0),
+ junit4 (>= 4.6), libeasymock-java (>= 2.4),
+ libcommons-codec-java (>= 1.3),
+ libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
+ libcommons-httpclient-java (>= 3.1),
+ libcommons-fileupload-java (>= 1.2),
+ libcommons-io-java (>= 1.3.1),
+ liblucene2-java (>= 2.4.0),
+ libxpp3-java (>= 1.1.3.4.0),
+ libtomcat6-java (>= 6.0.20-5),
+ libservlet2.5-java (>= 6.0.20),
+ libjetty-java (>= 6.1.18)
+Standards-Version: 3.8.2
+
+Package: solr-common
+Architecture: all
+Depends: ${misc:Depends},
+ debconf (>= 1.5),
+ openjdk-6-jre (>= 6b11-5) | java5-runtime,
+ libcommons-codec-java (>= 1.3),
+ libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
+ libcommons-fileupload-java (>= 1.2),
+ libcommons-io-java (>= 1.3.1),
+ libservlet2.5-java (>= 6.0.20),
+ 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})
+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,
+ faceted search, caching, replication, and a web administration
+ interface. It runs in a Java servlet container such as Tomcat.
+ .
+ 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
+Architecture: all
+Depends: ${misc:Depends}, solr-common (= ${binary:Version}), tomcat6 (>= 6.0.20)
+Conflicts: solr-jetty
+Description: enterprise search server based on Lucene - Tomcat 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 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.
Deleted: tags/solr/1.3.0+ds1-1/debian/copyright
===================================================================
--- trunk/solr/debian/copyright 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/copyright 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,22 +0,0 @@
-This package was debianised by Jan-Pascal van Best <janpascal at vanbest.org> 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 superflous 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 The Apache Software Foundation
-
-Authors: Doug Cutting <cutting at apache.org>, Erik Hatcher
- <ehatcher at apacher.org>, Otis Gospodnetic <otis at apache.org> et.al.
-
-The Debian packaging is
- Copyright 2007,2008 by Jan-Pascal van Best <janpascal at vanbest.org>
-
-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'.
Copied: tags/solr/1.3.0+ds1-1/debian/copyright (from rev 9028, trunk/solr/debian/copyright)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/copyright (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/copyright 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,17 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION
+Name: solr
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+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 <janpascal at vanbest.org>
+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.legacy (from rev 9028, trunk/solr/debian/copyright.legacy)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/copyright.legacy (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/copyright.legacy 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,25 @@
+This package was debianised by Jan-Pascal van Best <janpascal at vanbest.org> 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 <cutting at apache.org>
+ Erik Hatcher <ehatcher at apacher.org>
+ Otis Gospodnetic <otis at apache.org>
+ et.al.
+
+The Debian packaging is
+ Copyright 2007,2008,2009 by Jan-Pascal van Best <janpascal at vanbest.org>
+
+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'.
Copied: tags/solr/1.3.0+ds1-1/debian/orig-tar.sh (from rev 9028, trunk/solr/debian/orig-tar.sh)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/orig-tar.sh (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/orig-tar.sh 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,34 @@
+#!/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"
Deleted: tags/solr/1.3.0+ds1-1/debian/patches/00list
===================================================================
--- trunk/solr/debian/patches/00list 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/patches/00list 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,7 +0,0 @@
-01_remove-all-jarfiles.dpatch
-#03_relocate-datadir.dpatch
-04_fix-lucene-lock-directory.dpatch
-05_use-debian-java-libraries.dpatch
-#07_fix-for-lucene-2.3.dpatch
-10_contrib-dataimporthandler-use-debian-libs.dpatch
-15_fix-failed-test-with-new-jetty.dpatch
Copied: tags/solr/1.3.0+ds1-1/debian/patches/00list (from rev 8833, trunk/solr/debian/patches/00list)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/patches/00list (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/00list 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,10 @@
+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
+10_contrib-dataimporthandler-use-debian-libs.dpatch
+15_fix-failed-test-with-new-jetty.dpatch
+16_fix-failed-SolrInfoMBeanTest.dpatch
+20_remove-dependency-on-javanet-staxutils-SOLR-851.dpatch
+22_fix-compile-error-with-ambiguous-assert.dpatch
+24_fix-syntax-error-in-shell-script.dpatch
Deleted: tags/solr/1.3.0+ds1-1/debian/patches/01_remove-all-jarfiles.dpatch
===================================================================
--- trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/patches/01_remove-all-jarfiles.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,33 +0,0 @@
-#! /bin/sh
-## 01_remove-all-jarfiles.dpatch -- Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## DP: We want to be use we do not build using jar files contained
-## DP: in the Solr distribution tarball, so we start by removing
-## DP: all jar files.
-
-OPERATION="$1"
-DIRECTORY="$2"
-
-if [ -z "$OPERATION" ]; then
- echo "Illegal arguments"
- exit 1
-fi
-
-if [ -z "$DIRECTORY" ]; then
- DIRECTORY="."
-fi
-
-case "$OPERATION" in
- -patch)
- echo "Removing jar files under $DIRECTORY..."
- find $DIRECTORY -name \*.jar -exec rm {} \;
- ;;
- -unpatch)
- echo "Unable to magic back jar files..."
- ;;
- *)
- echo "Illegal command line $1 $2"
- exit 1
- ;;
-esac
-
Copied: tags/solr/1.3.0+ds1-1/debian/patches/01_remove-all-jarfiles.dpatch (from rev 8749, trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/patches/01_remove-all-jarfiles.dpatch (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/01_remove-all-jarfiles.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,33 @@
+#! /bin/sh
+## 01_remove-all-jarfiles.dpatch -- Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## DP: We want to be use we do not build using jar files contained
+## DP: in the Solr distribution tarball, so we start by removing
+## DP: all jar files.
+
+OPERATION="$1"
+DIRECTORY="$2"
+
+if [ -z "$OPERATION" ]; then
+ echo "Illegal arguments"
+ exit 1
+fi
+
+if [ -z "$DIRECTORY" ]; then
+ DIRECTORY="."
+fi
+
+case "$OPERATION" in
+ -patch)
+ echo "Removing jar files under \"$DIRECTORY\" ..."
+ find $DIRECTORY -name \*.jar -exec rm {} \;
+ ;;
+ -unpatch)
+ echo "Unable to magic back jar files..."
+ ;;
+ *)
+ echo "Illegal command line $1 $2"
+ exit 1
+ ;;
+esac
+
Deleted: tags/solr/1.3.0+ds1-1/debian/patches/02_fix-solr-version.dpatch
===================================================================
--- trunk/solr/debian/patches/02_fix-solr-version.dpatch 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/patches/02_fix-solr-version.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix-solr-version.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The upstream source tarball contains a -dev version number in the
-## DP: build.xml file. Fix that.
-
- at DPATCH@
-diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2006-12-17 23:08:58.000000000 +0100
-+++ trunk/build.xml 2007-05-31 11:35:45.000000000 +0200
-@@ -42,7 +42,7 @@
- By default, this should be set to "X.Y.N-dev" where X.Y.N is
- "1 greater" then the last version released (on this branch).
- -->
-- <property name="version" value="1.2.1-dev" />
-+ <property name="version" value="1.2.0" />
-
- <!-- Solr Specification Version -->
- <!--
Deleted: tags/solr/1.3.0+ds1-1/debian/patches/03_relocate-datadir.dpatch
===================================================================
--- trunk/solr/debian/patches/03_relocate-datadir.dpatch 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/patches/03_relocate-datadir.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_relocate-datadir.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Move the datadir containing the lucene indexes and other stuff
-## DP: to /var/lib/solr/data
-
- at DPATCH@
-diff -urNad trunk~/example/solr/conf/solrconfig.xml trunk/example/solr/conf/solrconfig.xml
---- trunk~/example/solr/conf/solrconfig.xml 2006-12-16 22:34:35.000000000 +0100
-+++ trunk/example/solr/conf/solrconfig.xml 2007-05-31 14:45:25.000000000 +0200
-@@ -29,9 +29,8 @@
- <!-- Used to specify an alternate directory to hold all index data
- other than the default ./data under the Solr home.
- If replication is in use, this should match the replication configuration. -->
-- <!--
-- <dataDir>./solr/data</dataDir>
-- -->
-+
-+ <dataDir>/var/lib/solr/data</dataDir>
-
- <indexDefaults>
- <!-- Values here affect all index writers and act as a default unless overridden. -->
Deleted: tags/solr/1.3.0+ds1-1/debian/patches/04_fix-lucene-lock-directory.dpatch
===================================================================
--- trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/patches/04_fix-lucene-lock-directory.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix-lucene-lock-directory.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FilePermission security exceptions because the default lucene
-## DP: lock dir is the system temp dir, which under Tomcat is
-## DP: /var/lib/tomcat5.5/temp. Move it to the dataDir (/var/lib/solr/data)
-## DP: instead.
-
- at DPATCH@
-diff -urNad trunk~/src/java/org/apache/solr/core/SolrCore.java trunk/src/java/org/apache/solr/core/SolrCore.java
---- trunk~/src/java/org/apache/solr/core/SolrCore.java 2006-12-16 22:34:15.000000000 +0100
-+++ trunk/src/java/org/apache/solr/core/SolrCore.java 2007-06-01 11:45:34.000000000 +0200
-@@ -125,6 +125,7 @@
-
- void initIndex() {
- try {
-+ System.setProperty( "org.apache.lucene.lockDir", dataDir );
- File dirFile = new File(getIndexDir());
- boolean indexExists = dirFile.canRead();
-
Copied: tags/solr/1.3.0+ds1-1/debian/patches/04_fix-lucene-lock-directory.dpatch (from rev 8749, trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/patches/04_fix-lucene-lock-directory.dpatch (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/04_fix-lucene-lock-directory.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fix-lucene-lock-directory.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FilePermission security exceptions because the default lucene
+## DP: lock dir is the system temp dir, which under Tomcat is
+## DP: /var/lib/tomcat5.5/temp. Move it to the dataDir (/var/lib/solr/data)
+## DP: instead.
+
+ at DPATCH@
+diff -urNad solr~/src/java/org/apache/solr/core/SolrCore.java solr/src/java/org/apache/solr/core/SolrCore.java
+--- solr~/src/java/org/apache/solr/core/SolrCore.java 2009-07-02 09:27:02.000000000 +0200
++++ solr/src/java/org/apache/solr/core/SolrCore.java 2009-07-02 09:27:03.000000000 +0200
+@@ -275,6 +275,7 @@
+ // currently only called with SolrCore.class lock held
+ void initIndex() {
+ try {
++ System.setProperty( "org.apache.lucene.lockDir", dataDir );
+ File dirFile = new File(getIndexDir());
+ boolean indexExists = dirFile.canRead();
+ boolean firstTime = dirs.add(dirFile.getCanonicalPath());
Deleted: tags/solr/1.3.0+ds1-1/debian/patches/05_use-debian-java-libraries.dpatch
===================================================================
--- trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/patches/05_use-debian-java-libraries.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,82 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_use-debian-java-libraries.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link to libraries under /usr/share/java instead of those
-## DP: included with upstream tarball. Do not include the libraries
-## DP: into the war file.
-
- at DPATCH@
-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" />
-@@ -111,7 +111,27 @@
- <!-- The compilation classpath -->
- <path id="compile.classpath">
- <fileset dir="${lib}">
-- <include name="*.jar" />
-+ <include name="servlet-api.jar" />
-+ <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>
-@@ -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}">
-- <exclude name="servlet-api*.jar" />
-- <exclude name="easymock.jar" />
-- </lib>
- <lib dir="${dist}">
- <include name="${fullname}-core-${version}.jar" />
- <include name="${fullname}-common-${version}.jar" />
Copied: tags/solr/1.3.0+ds1-1/debian/patches/05_use-debian-java-libraries.dpatch (from rev 8711, trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/patches/05_use-debian-java-libraries.dpatch (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/05_use-debian-java-libraries.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,94 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_use-debian-java-libraries.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Link to libraries under /usr/share/java instead of those
+## DP: included with upstream tarball. Do not include the libraries
+## DP: into the war file.
+
+ at DPATCH@
+diff -urNad solr~/build.xml solr/build.xml
+--- solr~/build.xml 2008-09-12 17:01:54.000000000 +0200
++++ solr/build.xml 2009-07-01 15:26:50.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" />
+@@ -111,7 +111,23 @@
+ <!-- The compilation classpath -->
+ <path id="compile.classpath">
+ <fileset dir="${lib}">
+- <include name="*.jar" />
++ <include name="servlet-api-2.5.jar" />
++ <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="jetty.jar" />
++ <include name="jetty-util.jar" />
+ </fileset>
+ <pathelement location="${dest}/common"/>
+ </path>
+@@ -304,9 +320,8 @@
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="${lib}">
+- <include name="commons-io-*.jar" />
+- <include name="*stax-*.jar" />
+- <include name="wstx-*.jar" />
++ <include name="commons-io.jar" />
++ <include name="commons-httpclient.jar" />
+ </fileset>
+ <pathelement location="${dest}/common"/>
+ </path>
+@@ -318,8 +333,14 @@
+ <pathelement location="${dest}/core"/>
+
+ <!-- jetty -->
+- <fileset dir="example/lib">
+- <include name="**/*.jar" />
++ <fileset dir="/usr/share/java">
++ <include name="jetty.jar" />
++ <include name="jetty-util.jar" />
++ <include name="jsp-api-2.1.jar" />
++ <include name="el-api-2.1.jar" />
++ <include name="jasper.jar" />
++ <include name="jasper-el.jar" />
++ <include name="tomcat-juli.jar" />
+ </fileset>
+ </path>
+
+@@ -520,10 +541,6 @@
+ webxml="${src}/webapp/web/WEB-INF/web.xml"
+ filesetmanifest="skip"
+ manifest="${dest}/META-INF/MANIFEST.MF">
+- <lib dir="${lib}">
+- <exclude name="servlet-api*.jar" />
+- <exclude name="easymock.jar" />
+- </lib>
+ <lib dir="${dist}">
+ <include name="${fullname}-core-${version}.jar" />
+ <include name="${fullname}-common-${version}.jar" />
+@@ -598,7 +615,6 @@
+ <fileset dir="${lib}">
+ <include name="commons-codec-*.jar"/>
+ <include name="commons-io-*.jar"/>
+- <include name="*stax-*.jar" />
+ <include name="wstx-*.jar" />
+ </fileset>
+ <fileset dir="${solrj-dir}/lib">
Deleted: tags/solr/1.3.0+ds1-1/debian/patches/06_use-debian-java-libraries-but-include-them-in-lib.dpatch
===================================================================
--- trunk/solr/debian/patches/06_use-debian-java-libraries-but-include-them-in-lib.dpatch 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/patches/06_use-debian-java-libraries-but-include-them-in-lib.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_use-debian-java-libraries.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link to libraries under /usr/share/java instead of those
-## DP: included with upstream tarball. Do not include the libraries
-## DP: into the war file.
-
- at DPATCH@
-diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2007-06-01 16:05:00.000000000 +0200
-+++ trunk/build.xml 2007-06-01 16:05:55.000000000 +0200
-@@ -59,7 +59,7 @@
- <property name="incubation-suffix" value="-incubating" />
-
- <!-- 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" />
-@@ -154,7 +154,11 @@
- <!-- The compilation classpath -->
- <path id="compile.classpath">
- <fileset dir="${lib}">
-- <include name="*.jar" />
-+ <include name="servlet-api.jar" />
-+ <include name="lucene-core.jar" />
-+ <include name="lucene-highlighter.jar" />
-+ <include name="lucene-snowball.jar" />
-+ <include name="xpp3.jar" />
- </fileset>
- </path>
-
-@@ -360,9 +364,12 @@
- webxml="${src}/webapp/WEB-INF/web.xml"
- filesetmanifest="skip"
- manifest="${dest}/META-INF/MANIFEST.MF">
- <lib dir="${lib}">
-- <exclude name="servlet-api*.jar" />
-+ <include name="lucene-core.jar" />
-+ <include name="lucene-highlighter.jar" />
-+ <include name="lucene-snowball.jar" />
-+ <include name="xpp3.jar" />
- </lib>
- <lib dir="${dist}">
- <include name="${fullnamever}.jar" />
- </lib>
Deleted: tags/solr/1.3.0+ds1-1/debian/patches/07_fix-for-lucene-2.3.dpatch
===================================================================
--- trunk/solr/debian/patches/07_fix-for-lucene-2.3.dpatch 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/patches/07_fix-for-lucene-2.3.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_fix-for-lucene-2.3.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix for update to Lucene 2.3 (upstream SVN rev. 614789).
-
- at DPATCH@
-diff -urNad solr~/src/java/org/apache/solr/analysis/StopFilterFactory.java solr/src/java/org/apache/solr/analysis/StopFilterFactory.java
---- solr~/src/java/org/apache/solr/analysis/StopFilterFactory.java 2008-04-22 16:47:42.000000000 +0200
-+++ solr/src/java/org/apache/solr/analysis/StopFilterFactory.java 2008-04-22 16:49:19.000000000 +0200
-@@ -44,10 +44,12 @@
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-+ } else {
-+ stopWords = StopFilter.makeStopSet(StopAnalyzer.ENGLISH_STOP_WORDS, ignoreCase);
- }
- }
-
-- private Set stopWords = StopFilter.makeStopSet(StopAnalyzer.ENGLISH_STOP_WORDS);
-+ private Set stopWords;
- private boolean ignoreCase;
-
- public TokenStream create(TokenStream input) {
Copied: tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-break-on-buildd.dpatch (from rev 8833, trunk/solr/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 (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/08_disable-tests-that-break-on-buildd.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,68 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_disable-tests-that-need-network-access.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## 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
+
+ at 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();
Deleted: tags/solr/1.3.0+ds1-1/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch
===================================================================
--- trunk/solr/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_contrib-dataimporthandler-use-debian-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at 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">
Copied: tags/solr/1.3.0+ds1-1/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch (from rev 8703, trunk/solr/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/10_contrib-dataimporthandler-use-debian-libs.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,42 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_contrib-dataimporthandler-use-debian-libs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad solr~/contrib/dataimporthandler/build.xml solr/contrib/dataimporthandler/build.xml
+--- solr~/contrib/dataimporthandler/build.xml 2009-07-01 13:11:12.000000000 +0200
++++ solr/contrib/dataimporthandler/build.xml 2009-07-01 13:13:47.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,14 +31,20 @@
+ <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">
+ <path refid="common.classpath" />
+- <pathelement path="target/classes" />
++ <pathelement path="target/classes" />
+ <pathelement path="target/test-classes" />
+- <pathelement path="${java.class.path}"/>
++ <pathelement path="${java.class.path}"/>
++ <fileset dir="${lib}">
++ <include name="lucene-highlighter.jar"/>
++ </fileset>
+ </path>
+
+ <target name="clean">
Deleted: tags/solr/1.3.0+ds1-1/debian/patches/15_fix-failed-test-with-new-jetty.dpatch
===================================================================
--- trunk/solr/debian/patches/15_fix-failed-test-with-new-jetty.dpatch 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/patches/15_fix-failed-test-with-new-jetty.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 15_fix-failed-test-with-new-jetty.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at 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);
Copied: tags/solr/1.3.0+ds1-1/debian/patches/15_fix-failed-test-with-new-jetty.dpatch (from rev 8703, trunk/solr/debian/patches/15_fix-failed-test-with-new-jetty.dpatch)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/patches/15_fix-failed-test-with-new-jetty.dpatch (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/15_fix-failed-test-with-new-jetty.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_fix-failed-test-with-new-jetty.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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 2009-06-30 16:54:31.000000000 +0200
++++ solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java 2009-07-01 08:43:39.000000000 +0200
+@@ -62,18 +62,21 @@
+ 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());
++ assertTrue("We got no no-cache in the Cache-Control header", head.getValue().contains("no-cache"));
++ assertTrue("We got no no-store in the Cache-Control header", head.getValue().contains("no-store"));
+
+ head = m.getResponseHeader("Pragma");
+ assertNotNull("We got no Pragma header", head);
+ assertEquals("no-cache", head.getValue());
+-
++/* Test disabled, this is an issue with the Jetty version in Debian
+ head = m.getResponseHeader("Expires");
+ assertNotNull("We got no Expires header", head);
+ Date d = DateUtil.parseDate(head.getValue());
+ assertTrue("We got no Expires header far in the past", System
+ .currentTimeMillis()
+ - d.getTime() > 100000);
++*/
+ }
+
+ protected void doLastModified(String method) throws Exception {
Copied: tags/solr/1.3.0+ds1-1/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch (from rev 8749, trunk/solr/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/16_fix-failed-SolrInfoMBeanTest.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16_fix-failed-SolrInfoMBeanTest.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: See upstream issue SOLR-1253
+
+ at DPATCH@
+diff -urNad solr~/src/test/org/apache/solr/SolrInfoMBeanTest.java solr/src/test/org/apache/solr/SolrInfoMBeanTest.java
+--- solr~/src/test/org/apache/solr/SolrInfoMBeanTest.java 2009-07-02 09:28:07.000000000 +0200
++++ solr/src/test/org/apache/solr/SolrInfoMBeanTest.java 2009-07-02 09:28:09.000000000 +0200
+@@ -81,7 +81,7 @@
+ String path = pckgname.replace('.', '/');
+ Enumeration<URL> resources = cld.getResources(path);
+ while (resources.hasMoreElements()) {
+- directories.add(new File(URLDecoder.decode(resources.nextElement().getPath(), "UTF-8")));
++ directories.add(new File(resources.nextElement().getPath()));
+ }
+
+ ArrayList<Class> classes = new ArrayList<Class>();
Copied: tags/solr/1.3.0+ds1-1/debian/patches/20_remove-dependency-on-javanet-staxutils-SOLR-851.dpatch (from rev 8703, trunk/solr/debian/patches/20_remove-dependency-on-javanet-staxutils-SOLR-851.dpatch)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/patches/20_remove-dependency-on-javanet-staxutils-SOLR-851.dpatch (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/20_remove-dependency-on-javanet-staxutils-SOLR-851.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,100 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_remove-dependency-on-javanet-staxutils-SOLR-851.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove dependency on javanet staxutils.
+## DP: See upstream issue SOLR-851
+
+ at DPATCH@
+diff -urNad solr~/src/java/org/apache/solr/handler/AnalysisRequestHandler.java solr/src/java/org/apache/solr/handler/AnalysisRequestHandler.java
+--- solr~/src/java/org/apache/solr/handler/AnalysisRequestHandler.java 2008-08-29 02:48:19.000000000 +0200
++++ solr/src/java/org/apache/solr/handler/AnalysisRequestHandler.java 2009-07-01 10:23:59.000000000 +0200
+@@ -16,7 +16,7 @@
+ * limitations under the License.
+ */
+
+-import javanet.staxutils.BaseXMLInputFactory;
++//import javanet.staxutils.BaseXMLInputFactory;
+ import org.apache.commons.io.IOUtils;
+ import org.apache.lucene.analysis.Analyzer;
+ import org.apache.lucene.analysis.Token;
+@@ -59,7 +59,8 @@
+ public void init(NamedList args) {
+ super.init(args);
+
+- inputFactory = BaseXMLInputFactory.newInstance();
++ // inputFactory = BaseXMLInputFactory.newInstance();
++ inputFactory = XMLInputFactory.newInstance();
+ try {
+ // The java 1.6 bundled stax parser (sjsxp) does not currently have a thread-safe
+ // XMLInputFactory, as that implementation tries to cache and reuse the
+diff -urNad solr~/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
+--- solr~/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java 2008-08-29 02:48:19.000000000 +0200
++++ solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java 2009-07-01 10:23:59.000000000 +0200
+@@ -24,7 +24,7 @@
+ import java.util.HashMap;
+ import java.util.logging.Logger;
+
+-import javanet.staxutils.BaseXMLInputFactory;
++//import javanet.staxutils.BaseXMLInputFactory;
+
+ import javax.xml.stream.FactoryConfigurationError;
+ import javax.xml.stream.XMLInputFactory;
+@@ -83,7 +83,7 @@
+ {
+ super.init(args);
+
+- inputFactory = BaseXMLInputFactory.newInstance();
++ inputFactory = XMLInputFactory.newInstance();
+ try {
+ // The java 1.6 bundled stax parser (sjsxp) does not currently have a thread-safe
+ // XMLInputFactory, as that implementation tries to cache and reuse the
+diff -urNad solr~/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java
+--- solr~/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java 2008-08-27 15:04:20.000000000 +0200
++++ solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTest.java 2009-07-01 10:23:59.000000000 +0200
+@@ -16,7 +16,7 @@
+ * limitations under the License.
+ */
+
+-import javanet.staxutils.BaseXMLInputFactory;
++//import javanet.staxutils.BaseXMLInputFactory;
+ import org.apache.lucene.analysis.Token;
+ import org.apache.solr.common.util.NamedList;
+ import org.apache.solr.util.AbstractSolrTestCase;
+@@ -27,7 +27,7 @@
+ import java.util.List;
+
+ public class AnalysisRequestHandlerTest extends AbstractSolrTestCase {
+- private XMLInputFactory inputFactory = BaseXMLInputFactory.newInstance();
++ private XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+
+ @Override
+ public String getSchemaFile() {
+@@ -102,4 +102,4 @@
+ assertTrue(value + " is not equal to " + gold[j], value.equals(gold[j]) == true);
+ }
+ }
+-}
+\ No newline at end of file
++}
+diff -urNad solr~/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java solr/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java
+--- solr~/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java 2008-08-27 15:04:20.000000000 +0200
++++ solr/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java 2009-07-01 10:23:59.000000000 +0200
+@@ -4,7 +4,7 @@
+ import java.io.StringReader;
+ import java.util.Collection;
+
+-import javanet.staxutils.BaseXMLInputFactory;
++// import javanet.staxutils.BaseXMLInputFactory;
+
+ import javax.xml.stream.XMLInputFactory;
+ import javax.xml.stream.XMLStreamReader;
+@@ -15,7 +15,7 @@
+
+ public class XmlUpdateRequestHandlerTest extends AbstractSolrTestCase
+ {
+- private XMLInputFactory inputFactory = BaseXMLInputFactory.newInstance();
++ private XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+ protected XmlUpdateRequestHandler handler;
+
+ @Override public String getSchemaFile() { return "schema.xml"; }
Copied: tags/solr/1.3.0+ds1-1/debian/patches/22_fix-compile-error-with-ambiguous-assert.dpatch (from rev 8711, trunk/solr/debian/patches/22_fix-compile-error-with-ambiguous-assert.dpatch)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/patches/22_fix-compile-error-with-ambiguous-assert.dpatch (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/22_fix-compile-error-with-ambiguous-assert.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22_fix-compile-error-with-ambiguous-assert.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad solr~/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java
+--- solr~/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java 2008-08-27 15:03:44.000000000 +0200
++++ solr/contrib/dataimporthandler/src/test/java/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java 2009-07-01 12:01:33.000000000 +0200
+@@ -122,7 +122,7 @@
+ break;
+ count++;
+ }
+- Assert.assertEquals(2, local.get());
++ Assert.assertEquals(2, (long)local.get());
+ Assert.assertEquals(4, count);
+ }
+
Copied: tags/solr/1.3.0+ds1-1/debian/patches/24_fix-syntax-error-in-shell-script.dpatch (from rev 8748, trunk/solr/debian/patches/24_fix-syntax-error-in-shell-script.dpatch)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/patches/24_fix-syntax-error-in-shell-script.dpatch (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/patches/24_fix-syntax-error-in-shell-script.dpatch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 24_fix-syntax-error-in-shell-script.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad solr~/example/solr/bin/abo solr/example/solr/bin/abo
+--- solr~/example/solr/bin/abo 2008-08-29 15:36:35.000000000 +0200
++++ solr/example/solr/bin/abo 2009-07-02 08:50:58.000000000 +0200
+@@ -175,7 +175,7 @@
+
+ # make a backup using hard links into temporary location
+ # then move it into place atomically
+-if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD"]]
++if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+ then
+ orig_dir=$(pwd)
+ mkdir ${data_dir}/${temp}
+diff -urNad solr~/src/scripts/abo solr/src/scripts/abo
+--- solr~/src/scripts/abo 2008-08-27 15:05:07.000000000 +0200
++++ solr/src/scripts/abo 2009-07-02 08:50:48.000000000 +0200
+@@ -175,7 +175,7 @@
+
+ # make a backup using hard links into temporary location
+ # then move it into place atomically
+-if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD"]]
++if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+ then
+ orig_dir=$(pwd)
+ mkdir ${data_dir}/${temp}
Deleted: tags/solr/1.3.0+ds1-1/debian/rules
===================================================================
--- trunk/solr/debian/rules 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/rules 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,109 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-#
-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
-
-# UPSTREAM_VERSION is what Apache Solr thinks its version is
-# DEB_UPSTREAM_VERSION is the Debian source package version (with the +dsN)
-UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*")
-UPSTREAM_BASENAME = apache-solr-$(UPSTREAM_VERSION)
-WARFILE = $(UPSTREAM_BASENAME).war
-CHANGESFILE = ../solr_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
-
-COMMON_INSTDIR=$(CURDIR)/debian/solr-common
-TOMCAT_INSTDIR=$(CURDIR)/debian/solr-tomcat5.5
-JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty
-SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr
-
-# Build with OpenJDK
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk
-JAR = $(JAVA_HOME)/bin/jar
-
-# Set ant parameters
-DEB_ANT_BUILD_TARGET = compile javadoc dist-war
-DEB_ANT_CHECK_TARGET = test
-DEB_JARS = ant-junit junit4
-
-DEB_INSTALL_CHANGELOGS_solr-common := CHANGES.txt
-
-DEB_COMPRESS_EXCLUDE = .xsl .js .xslt
-
-cleanbuilddir:: build.xml
-build.xml:
- debian/rules restore-from-source
-
-clean::
- rm -rf example/solr/data/index
- rm -f debian/solr-keyring.gpg
-
-install/solr-common::
- # First unpack the .war file, we need most of it.
- cd $(SHAREDIR) ; $(JAR) xf $(CURDIR)/dist/$(WARFILE)
- mv $(SHAREDIR)/WEB-INF/web.xml $(COMMON_INSTDIR)/etc/solr/
-
- # Install replication scripts
- install src/scripts/* $(SHAREDIR)/scripts
-
- # Install Solr configuration files
- # FIXME: this is example configuration, including example schema
- # Should be changed to some minimal config, with pointers
- # to documentation
- cp -r $(CURDIR)/example/solr/conf/* $(COMMON_INSTDIR)/etc/solr/conf/
-
- # This information is already in debian/copyright
- rm -f $(COMMON_INSTDIR)/usr/share/solr/META-INF/LICENSE.txt
-
- cp KEYS.txt NOTICE.txt README.txt $(COMMON_INSTDIR)/usr/share/doc/solr-common/
- cp -a docs $(COMMON_INSTDIR)/usr/share/doc/solr-common/
- cp -a build/docs/api $(COMMON_INSTDIR)/usr/share/doc/solr-common/docs/
-
- # Remove empty directories
- rmdir --ignore-fail-on-non-empty $(COMMON_INSTDIR)/usr/share/doc/solr-common/docs/skin/css
- 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-tomcat5.5::
- # Configure tomcat (also see solr-tomcat5.5.links)
- 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/
-
-remove-source:
- 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 contrib client
- rm -rf apache-solr*
-
-restore-from-source: remove-source ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz
- tar xzf ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz
- mv $(UPSTREAM_BASENAME)/* .
- rmdir $(UPSTREAM_BASENAME)
-
-get-orig-source: ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-
-../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz:
- 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-tomcat5.5_$(DEB_VERSION)_all.deb ; \
- dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \
- ) | less
- #dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \
-
-upload:
- dupload -t mentors $(CHANGESFILE)
Copied: tags/solr/1.3.0+ds1-1/debian/rules (from rev 9028, trunk/solr/debian/rules)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/rules (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/rules 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,105 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+#
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# UPSTREAM_VERSION is what Apache Solr thinks its version is
+# DEB_UPSTREAM_VERSION is the Debian source package version (with the +dsN)
+UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*")
+UPSTREAM_BASENAME = apache-solr-$(UPSTREAM_VERSION)
+WARFILE = $(UPSTREAM_BASENAME).war
+CHANGESFILE = ../solr_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
+
+COMMON_INSTDIR=$(CURDIR)/debian/solr-common
+TOMCAT_INSTDIR=$(CURDIR)/debian/solr-tomcat
+JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty
+SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr
+
+# Build with OpenJDK
+JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+JAR = $(JAVA_HOME)/bin/jar
+
+# Set ant parameters
+DEB_ANT_BUILD_TARGET = compile javadoc dist-war
+DEB_ANT_CHECK_TARGET = test
+DEB_JARS = ant-junit junit4
+
+DEB_INSTALL_CHANGELOGS_solr-common := CHANGES.txt
+
+DEB_COMPRESS_EXCLUDE = .xsl .js .xslt
+
+cleanbuilddir:: build.xml
+build.xml:
+ debian/rules restore-from-source
+
+clean::
+ rm -f debian/solr-keyring.gpg
+ rm -rf src/test/test-files/solr/data
+ rm -rf example/solr/data
+ rm -rf example/multicore/core0/data
+ rm -rf example/multicore/core1/data
+
+install/solr-common::
+ # First unpack the .war file, we need most of it.
+ cd $(SHAREDIR) ; $(JAR) xf $(CURDIR)/dist/$(WARFILE)
+ mv $(SHAREDIR)/WEB-INF/web.xml $(COMMON_INSTDIR)/etc/solr/
+
+ # Install replication scripts
+ install src/scripts/* $(SHAREDIR)/scripts
+
+ # Install Solr configuration files
+ # FIXME: this is example configuration, including example schema
+ # Should be changed to some minimal config, with pointers
+ # to documentation
+ cp -r $(CURDIR)/example/solr/conf/* $(COMMON_INSTDIR)/etc/solr/conf/
+
+ # This information is already in debian/copyright
+ rm -f $(COMMON_INSTDIR)/usr/share/solr/META-INF/LICENSE.txt
+
+ cp KEYS.txt NOTICE.txt README.txt $(COMMON_INSTDIR)/usr/share/doc/solr-common/
+ cp -a docs $(COMMON_INSTDIR)/usr/share/doc/solr-common/
+ cp -a build/docs/api $(COMMON_INSTDIR)/usr/share/doc/solr-common/docs/
+
+ # Remove empty directories
+ rmdir --ignore-fail-on-non-empty $(COMMON_INSTDIR)/usr/share/doc/solr-common/docs/skin/css
+ 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 --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/
+
+remove-source:
+ 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 contrib client
+ rm -rf apache-solr*
+
+restore-from-source: remove-source ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+ tar xzf ../solr_$(DEB_UPSTREAM_VERSION).orig.tar.gz --strip 1
+
+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)
+
+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 ; \
+ ) | less
Copied: tags/solr/1.3.0+ds1-1/debian/solr-tomcat.dirs (from rev 9028, trunk/solr/debian/solr-tomcat.dirs)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/solr-tomcat.dirs (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat.dirs 2009-08-10 11:31:51 UTC (rev 9923)
@@ -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-tomcat.links (from rev 9028, trunk/solr/debian/solr-tomcat.links)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/solr-tomcat.links (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat.links 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1 @@
+/etc/solr/solr-tomcat.xml /etc/tomcat6/Catalina/localhost/solr.xml
Copied: tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postinst (from rev 9028, trunk/solr/debian/solr-tomcat.postinst)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postinst (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postinst 2009-08-10 11:31:51 UTC (rev 9923)
@@ -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-tomcat.postrm (from rev 9028, trunk/solr/debian/solr-tomcat.postrm)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postrm (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat.postrm 2009-08-10 11:31:51 UTC (rev 9923)
@@ -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-tomcat.xml (from rev 9028, trunk/solr/debian/solr-tomcat.xml)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/solr-tomcat.xml (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat.xml 2009-08-10 11:31:51 UTC (rev 9923)
@@ -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>
Deleted: tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.dirs
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.dirs 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.dirs 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,4 +0,0 @@
-/etc/solr
-/etc/tomcat5/policy.d
-/var/lib/solr
-/var/lib/solr/data
Deleted: tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.links
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.links 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.links 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,2 +0,0 @@
-/etc/solr/solr-tomcat5.5.xml /etc/tomcat5.5/Catalina/localhost/solr.xml
-/etc/solr/tomcat.policy /etc/tomcat5.5/policy.d/05solr.policy
Deleted: tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.postinst
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.postinst 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.postinst 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-set -e
-# Not needed
-# . /usr/share/debconf/confmodule
-
-# If proper permissions for the stuff under /var/lib/solr haven't
-# been set, set them now
-
-case "$1" in
- configure)
-
- if ! dpkg-statoverride --quiet --list /var/lib/solr > /dev/null; then
- dpkg-statoverride --quiet --update --add tomcat55 root 0750 /var/lib/solr
- fi
-
- if ! dpkg-statoverride --quiet --list /var/lib/solr/data > /dev/null ; then
- dpkg-statoverride --quiet --update --add tomcat55 root 0750 /var/lib/solr/data
- fi
-
- if [ -d /var/lib/solr/data/index ]; then
- chown -R tomcat55:root /var/lib/solr/data
- fi
-
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
-
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-
-esac
-
-invoke-rc.d --quiet tomcat5.5 restart || {
- RESULT=$?
- # Ignore if tomcat5.5 init script does not exist (yet)
- if [ $RESULT != 100 ]; then
- exit $RESULT
- fi
-}
-
-#DEBHELPER#
Deleted: tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.postrm
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.postrm 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.postrm 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- remove)
-
- # If permissions for the stuff under /var/lib/solr haven't
- # been removed, remove them now
- if [ -x /usr/sbin/dpkg-statoverride ]; then
- if dpkg-statoverride --quiet --list /var/lib/solr > /dev/null ; then
- dpkg-statoverride --quiet --remove /var/lib/solr
- fi
-
- if dpkg-statoverride --quiet --list /var/lib/solr/data > /dev/null ; then
- dpkg-statoverride --quiet --remove /var/lib/solr/data
- fi
- fi
-
- # 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 tomcat5.5 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-tomcat5.5.xml
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.xml 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/solr-tomcat5.5.xml 2009-08-10 11:31:51 UTC (rev 9923)
@@ -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 5 -->
- <Resources className="org.apache.naming.resources.FileDirContext" allowLinking="true" />
-
- <Environment name="solr/home" type="java.lang.String" value="/usr/share/solr" override="true" />
-</Context>
Deleted: tags/solr/1.3.0+ds1-1/debian/tomcat.policy
===================================================================
--- trunk/solr/debian/tomcat.policy 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/tomcat.policy 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,18 +0,0 @@
-grant codeBase "file:/usr/share/solr/-" {
- permission java.lang.RuntimePermission "modifyThread";
- permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.http";
- permission java.util.PropertyPermission "java.io.tmpdir", "read";
- permission java.util.PropertyPermission "user.dir", "read";
- permission java.util.PropertyPermission "solr.*", "read";
- permission java.util.PropertyPermission "org.apache.lucene.lockDir", "read,write";
- permission java.util.PropertyPermission "org.apache.lucene.store.FSDirectoryLockFactoryClass", "read";
- permission java.io.FilePermission "/usr/share/java/-", "read";
- permission java.io.FilePermission "/var/log/tomcat5.5/-", "read,write";
- permission java.io.FilePermission "/var/lib/tomcat5.5/webapps/solr/-", "read";
- permission java.io.FilePermission "/var/lib/tomcat5.5/temp/-", "read,write";
- permission java.io.FilePermission "/etc/solr/-", "read";
- permission java.io.FilePermission "/usr/share/solr/-", "read";
- permission java.io.FilePermission "/usr/share/solr", "read";
- permission java.io.FilePermission "/var/lib/solr", "read,write,delete";
- permission java.io.FilePermission "/var/lib/solr/-", "read,write,delete";
-};
Copied: tags/solr/1.3.0+ds1-1/debian/tomcat.policy (from rev 8718, trunk/solr/debian/tomcat.policy)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/tomcat.policy (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/tomcat.policy 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,21 @@
+grant codeBase "file:/usr/share/solr/-" {
+ permission java.lang.RuntimePermission "modifyThread";
+ permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.http";
+ permission java.util.PropertyPermission "java.io.tmpdir", "read";
+ permission java.util.PropertyPermission "user.dir", "read";
+ permission java.util.PropertyPermission "solr.*", "read";
+ permission java.util.PropertyPermission "org.apache.lucene.lockDir", "read,write";
+ permission java.util.PropertyPermission "org.apache.lucene.store.FSDirectoryLockFactoryClass", "read";
+ permission java.io.FilePermission "/usr/share/java/-", "read";
+ permission java.io.FilePermission "/var/log/tomcat6/-", "read,write";
+ permission java.io.FilePermission "/var/lib/tomcat6/webapps/solr/-", "read";
+ permission java.io.FilePermission "/var/lib/tomcat6/temp/-", "read,write";
+ permission java.io.FilePermission "/etc/solr/-", "read";
+ permission java.io.FilePermission "/usr/share/solr/-", "read";
+ permission java.io.FilePermission "/usr/share/solr", "read";
+ permission java.io.FilePermission "/var/lib/solr", "read,write,delete";
+ permission java.io.FilePermission "/var/lib/solr/-", "read,write,delete";
+ permission javax.management.MBeanServerPermission "findMBeanServer";
+ permission javax.management.MBeanPermission "org.apache.solr.core.*", "*";
+ permission javax.management.MBeanTrustPermission "register";
+};
Deleted: tags/solr/1.3.0+ds1-1/debian/watch
===================================================================
--- trunk/solr/debian/watch 2009-04-04 11:21:42 UTC (rev 8180)
+++ tags/solr/1.3.0+ds1-1/debian/watch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -1,4 +0,0 @@
-version=3
-
-opts=dversionmangle=s/\+ds\d+$// \
- http://www.apache.org/dist/lucene/solr/(?:[0-9\.]*)/apache-solr-(.*).tgz
Copied: tags/solr/1.3.0+ds1-1/debian/watch (from rev 9028, trunk/solr/debian/watch)
===================================================================
--- tags/solr/1.3.0+ds1-1/debian/watch (rev 0)
+++ tags/solr/1.3.0+ds1-1/debian/watch 2009-08-10 11:31:51 UTC (rev 9923)
@@ -0,0 +1,5 @@
+version=3
+
+opts=dversionmangle=s/\+ds\d+$// \
+ http://archive.apache.org/dist/lucene/solr/(?:[\d\.]+)/apache-solr-(.*).tgz \
+ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list