[pkg-java] r3990 - in trunk/solr: . debian debian/patches debian/po

janpascal-guest at alioth.debian.org janpascal-guest at alioth.debian.org
Mon Aug 6 07:25:59 UTC 2007


Author: janpascal-guest
Date: 2007-08-06 07:25:59 +0000 (Mon, 06 Aug 2007)
New Revision: 3990

Added:
   trunk/solr/debian/
   trunk/solr/debian/README
   trunk/solr/debian/TODO
   trunk/solr/debian/ant.properties
   trunk/solr/debian/changelog
   trunk/solr/debian/compat
   trunk/solr/debian/control
   trunk/solr/debian/copyright
   trunk/solr/debian/get-orig-source
   trunk/solr/debian/jetty-web.xml
   trunk/solr/debian/patches/
   trunk/solr/debian/patches/00list
   trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch
   trunk/solr/debian/patches/02_fix-solr-version.dpatch
   trunk/solr/debian/patches/03_relocate-datadir.dpatch
   trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch
   trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch
   trunk/solr/debian/patches/06_use-debian-java-libraries-but-include-them-in-lib.dpatch
   trunk/solr/debian/po/
   trunk/solr/debian/po/POTFILES.in
   trunk/solr/debian/po/templates.pot
   trunk/solr/debian/rules
   trunk/solr/debian/solr-common.config
   trunk/solr/debian/solr-common.dirs
   trunk/solr/debian/solr-common.docs
   trunk/solr/debian/solr-common.links
   trunk/solr/debian/solr-common.postinst
   trunk/solr/debian/solr-common.postrm
   trunk/solr/debian/solr-common.templates
   trunk/solr/debian/solr-jetty.dirs
   trunk/solr/debian/solr-jetty.links
   trunk/solr/debian/solr-jetty.postinst
   trunk/solr/debian/solr-jetty.postrm
   trunk/solr/debian/solr-tomcat5.5.dirs
   trunk/solr/debian/solr-tomcat5.5.links
   trunk/solr/debian/solr-tomcat5.5.postinst
   trunk/solr/debian/solr-tomcat5.5.postrm
   trunk/solr/debian/solr-tomcat5.5.xml
   trunk/solr/debian/tomcat.policy
   trunk/solr/debian/uscan-upstream-version.xslt
   trunk/solr/debian/uscan-url.xslt
   trunk/solr/debian/watch
Log:
initial packaging for Solr

Added: trunk/solr/debian/README
===================================================================
--- trunk/solr/debian/README	                        (rev 0)
+++ trunk/solr/debian/README	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,26 @@
+README for solr
+---------------
+
+Solr is an enterprise search server based on the Lucene Java library.
+This Debian package install Solr into the Tomcat 5.5 Java servlet 
+container. After installation, point your browser to
+  http://localhost:8180/solr/admin
+to see the Solr web administration interface.
+
+Homepage: http://lucene.apache.org/solr/
+
+The following design choices have been made in packaging Solr:
+- there is a solr-common package, which contains most of the code and general
+  configuration, and solr-tomcat5.5 and solr-jetty packages, which provides
+  configuration for Solr in Tomcat 5.5 and Jetty, respectively.
+- 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: you need to add the line
+  $(java.lib.home)/commons-el.jar
+near the end of your /etc/jetty/start.config
+
+Replication
+-----------
+Solr's replication scripts are installed into /usr/share/solr/scripts

Added: trunk/solr/debian/TODO
===================================================================
--- trunk/solr/debian/TODO	                        (rev 0)
+++ trunk/solr/debian/TODO	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,8 @@
+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)
+

Added: trunk/solr/debian/ant.properties
===================================================================
--- trunk/solr/debian/ant.properties	                        (rev 0)
+++ trunk/solr/debian/ant.properties	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,9 @@
+# Ant properties file for Debian solr source package
+
+# javac settings used by Solr compilation
+javac.debug=on
+javac.nowarn=off
+javac.verbose=yes
+build.compiler=javac1.5
+compile.debug=on
+compile.optimize=on

Added: trunk/solr/debian/changelog
===================================================================
--- trunk/solr/debian/changelog	                        (rev 0)
+++ trunk/solr/debian/changelog	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,79 @@
+solr (1.2.0-1~pre3) unstable; urgency=low
+
+  * Include source tarball of upstream release in upload
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 20 Jun 2007 13:09:16 +0200
+
+solr (1.2.0-1~pre2) unstable; urgency=low
+
+  * Based on upstream release 1.2.0
+  * Removed all third-party jars
+  * Depends on the libcommons-csv-java package, which can be found in the same
+    inoffficial Debian repository as the solr package.
+  * Depends on liblucene2-java-2.2, which is in preparation. You can find the
+    package in the same inofficial Debian repository as the solr package.
+  * Needs the libcommons-fileupload-java package version 1.2, which isn't
+    packaged yet (Debian has 1.0). Place commons-fileupload.jar in
+    /usr/share/java for this package to work.
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 19 Jun 2007 19:56:13 +0200
+
+solr (1.2.0-1~pre1) experimental; urgency=low
+
+  * New upstream release 1.2.0
+  * This release contains all third-party library upstream includes
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Thu, 07 Jun 2007 11:28:06 +0200
+
+solr (1.1.0-0vanbest7) UNRELEASED; urgency=low
+
+  * Removed Pre-Depends on tomcat5.5
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Wed, 06 Jun 2007 14:29:20 +0200
+
+solr (1.1.0-0vanbest6) unstable; urgency=low
+
+  * Moved solr config files to /etc/solr/conf (with appropriate symlinks)
+  * Installed replication scripts to /usr/share/solr/bin
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 05 Jun 2007 22:19:19 +0200
+
+solr (1.1.0-0vanbest5) unstable; urgency=low
+
+  * solr-jetty now functional
+  * you can switch between solr-jetty and solr-tomcat5.5 while keeping your
+    indexes.
+  * Renamed solr-tomcat55 package to solr-tomcat5.5
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 04 Jun 2007 20:24:30 +0200
+
+solr (1.1.0-0vanbest4) unstable; urgency=low
+
+  * Pre-Depend on tomcat5.5 to allow installation in one go (hopefully)
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 04 Jun 2007 20:08:16 +0200
+
+solr (1.1.0-0vanbest3) unstable; urgency=low
+
+  * Split solr into solr-common, solr-tomcat55 (and later: solr-jetty,
+    solr-standalone)
+  * Also removed library jar files from WEB-INF/lib
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Mon, 04 Jun 2007 17:41:30 +0200
+
+solr (1.1.0-0vanbest2) unstable; urgency=low
+
+  * Removed included library .jar files, use Debian packaged version instead.
+  * Those jar files are still copied to to WEB-INF/lib (don't know how to fix
+    that yet)
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Sat, 02 Jun 2007 10:44:14 +0200
+
+solr (1.1.0-0vanbest1) UNRELEASED; urgency=low
+
+  * Mostly working first private release
+  * Still includes library .jar files included in upstream tarball
+  * Still compiles with .jar files included in upstream tarball
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 01 Jun 2007 15:08:14 +0200
+

Added: trunk/solr/debian/compat
===================================================================
--- trunk/solr/debian/compat	                        (rev 0)
+++ trunk/solr/debian/compat	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1 @@
+4

Added: trunk/solr/debian/control
===================================================================
--- trunk/solr/debian/control	                        (rev 0)
+++ trunk/solr/debian/control	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,71 @@
+Source: solr
+Section: contrib/text
+Priority: optional
+Maintainer:Jan-Pascal van Best <janpascal at vanbest.org>
+XS-Vcs-Browser: http://www.vanbest.org/websvn/solr
+XS-Vcs-svn: http://svn.vanbest.org/svn/solr
+Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0), po-debconf,
+ sun-java5-jre, sun-java5-jdk, ant, ant-optional, junit,
+ libcommons-codec-java,
+ libcommons-csv-java,
+ libcommons-fileupload-java (>= 1.2),
+ libcommons-io-java,
+ libservlet2.4-java,
+ liblucene2-java (>= 2.2),
+ libxpp3-java
+Standards-Version: 3.7.2
+
+
+Package: solr-common
+Architecture: all
+Depends: ${misc:Depends}, 
+ sun-java5-jre | sun-java6-jre,
+ libcommons-codec-java,
+ libcommons-csv-java,
+ libcommons-fileupload-java (>= 1.2),
+ libcommons-io-java,
+ libservlet2.4-java,
+ liblucene2-java (>= 2.2),
+ libxpp3-java
+Recommends: solr-tomcat5.5 (>= ${Source-Version}) | solr-jetty (>= ${Source-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.
+ .
+ Common files for Solr. Install solr-tomcat5.5 or solr-jetty to use Solr under
+ Tomcat or Jetty.
+ .
+  Homepage: http://lucene.apache.org/solr/
+
+Package: solr-tomcat5.5
+Architecture: all
+Depends: ${misc:Depends},
+ solr-common (>= ${Source-Version}), tomcat5.5
+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 contains the Tomcat integration files for Solr. 
+ .
+  Homepage: http://lucene.apache.org/solr/
+
+Package: solr-jetty
+Architecture: all
+Depends: ${misc:Depends}, 
+ jetty (>= 5.1), solr-common (>= ${Source-Version})
+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 contains the Jetty integration files for Solr. 
+ .
+  Homepage: http://lucene.apache.org/solr/
+

Added: trunk/solr/debian/copyright
===================================================================
--- trunk/solr/debian/copyright	                        (rev 0)
+++ trunk/solr/debian/copyright	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,619 @@
+This package was debianized by Jan-Pascal van Best <janpascal at vanbest.org> on
+Wed, 30 May 2007 22:32:26 +0200.
+
+It was downloaded from
+http://www.apache.org/dist/lucene/solr/1.1/apache-solr-1.1.0-incubating.tgz
+
+Copyright Holders: Doug Cutting <cutting at apache.org>, Erik Hatcher
+<ehatcher at apacher.org>, Otis Gospodnetic <otis at apache.org> et.al.
+
+License:
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+==========================================================================
+The following license applies only to the xpp3 jar included with Solr
+--------------------------------------------------------------------------
+Indiana University Extreme! Lab Software License
+
+Version 1.1.1
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met:
+
+1. Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in 
+   the documentation and/or other materials provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if any, 
+   must include the following acknowledgment:
+
+  "This product includes software developed by the Indiana University 
+  Extreme! Lab (http://www.extreme.indiana.edu/)."
+
+Alternately, this acknowledgment may appear in the software itself, 
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" 
+must not be used to endorse or promote products derived from this 
+software without prior written permission. For written permission, 
+please contact http://www.extreme.indiana.edu/.
+
+5. Products derived from this software may not use "Indiana Univeristy" 
+name nor may "Indiana Univeristy" appear in their name, without prior 
+written permission of the Indiana University.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+==========================================================================
+Portions of Jetty 6 are bundled in the Solr example server.
+Jetty 6 includes a binary javax.servlet package licensed under the
+Common Development and Distribution License.
+--------------------------------------------------------------------------
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+1. Definitions.
+
+1.1. Contributor means each individual or entity that creates or contributes to
+the creation of Modifications.
+
+1.2. Contributor Version means the combination of the Original Software, prior
+Modifications used by a Contributor (if any), and the Modifications made by
+that particular Contributor.
+
+1.3. Covered Software means (a) the Original Software, or (b) Modifications, or
+(c) the combination of files containing Original Software with files containing
+Modifications, in each case including portions thereof.
+
+1.4. Executable means the Covered Software in any form other than Source Code.
+
+1.5. Initial Developer means the individual or entity that first makes Original
+Software available under this License.
+
+1.6. Larger Work means a work which combines Covered Software or portions
+thereof with code not governed by the terms of this License.
+
+1.7. License means this document.
+
+1.8. Licensable means having the right to grant, to the maximum extent
+possible, whether at the time of the initial grant or subsequently acquired,
+any and all of the rights conveyed herein.
+
+1.9. Modifications means the Source Code and Executable form of any of the
+following:
+
+A. Any file that results from an addition to, deletion from or modification of
+the contents of a file containing Original Software or previous Modifications;
+
+B. Any new file that contains any part of the Original Software or previous
+Modification; or
+
+C. Any new file that is contributed or otherwise made available under the terms
+of this License.
+
+1.10. Original Software means the Source Code and Executable form of computer
+software code that is originally released under this License.
+
+1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired,
+including without limitation, method, process, and apparatus claims, in any
+patent Licensable by grantor.
+
+1.12. Source Code means (a) the common form of computer software code in which
+modifications are made and (b) associated documentation included in or with
+such code.
+
+1.13. You (or Your) means an individual or a legal entity exercising rights
+under, and complying with all of the terms of, this License. For legal
+entities, You includes any entity which controls, is controlled by, or is under
+common control with You. For purposes of this definition, control means (a)áthe
+power, direct or indirect, to cause the direction or management of such entity,
+whether by contract or otherwise, or (b)áownership of more than fifty percent
+(50%) of the outstanding shares or beneficial ownership of such entity.
+
+2. License Grants.
+
+2.1. The Initial Developer Grant.  Conditioned upon Your compliance with
+Section 3.1 below and subject to third party intellectual property claims, the
+Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive
+license: (a) under intellectual property rights (other than patent or
+trademark) Licensable by Initial Developer, to use, reproduce, modify, display,
+perform, sublicense and distribute the Original Software (or portions thereof),
+with or without Modifications, and/or as part of a Larger Work; and (b) under
+Patent Claims infringed by the making, using or selling of Original Software,
+to make, have made, use, practice, sell, and offer for sale, and/or otherwise
+dispose of the Original Software (or portions thereof).  (c) The licenses
+granted in Sectionsá2.1(a) and (b) are effective on the date Initial Developer
+first distributes or otherwise makes the Original Software available to a third
+party under the terms of this License.  (d) Notwithstanding Sectioná2.1(b)
+above, no patent license is granted: (1)áfor code that You delete from the
+Original Software, or (2)áfor infringements caused by: (i)áthe modification of
+the Original Software, or (ii)áthe combination of the Original Software with
+other software or devices.
+
+2.2. Contributor Grant.  Conditioned upon Your compliance with Section 3.1
+below and subject to third party intellectual property claims, each Contributor
+hereby grants You a world-wide, royalty-free, non-exclusive license: (a) under
+intellectual property rights (other than patent or trademark) Licensable by
+Contributor to use, reproduce, modify, display, perform, sublicense and
+distribute the Modifications created by such Contributor (or portions thereof),
+either on an unmodified basis, with other Modifications, as Covered Software
+and/or as part of a Larger Work; and (b) under Patent Claims infringed by the
+making, using, or selling of Modifications made by that Contributor either
+alone and/or in combination with its Contributor Version (or portions of such
+combination), to make, use, sell, offer for sale, have made, and/or otherwise
+dispose of: (1)áModifications made by that Contributor (or portions thereof);
+and (2)áthe combination of Modifications made by that Contributor with its
+Contributor Version (or portions of such combination).  (c) The licenses
+granted in Sectionsá2.2(a) and 2.2(b) are effective on the date Contributor
+first distributes or otherwise makes the Modifications available to a third
+party.  (d) Notwithstanding Sectioná2.2(b) above, no patent license is granted:
+(1)áfor any code that Contributor has deleted from the Contributor Version;
+(2)áfor infringements caused by: (i)áthird party modifications of Contributor
+Version, or (ii)áthe combination of Modifications made by that Contributor with
+other software (except as part of the Contributor Version) or other devices; or
+(3)áunder Patent Claims infringed by Covered Software in the absence of
+Modifications made by that Contributor.
+
+3. Distribution Obligations.
+
+3.1. Availability of Source Code.
+
+Any Covered Software that You distribute or otherwise make available in
+Executable form must also be made available in Source Code form and that Source
+Code form must be distributed only under the terms of this License. You must
+include a copy of this License with every copy of the Source Code form of the
+Covered Software You distribute or otherwise make available. You must inform
+recipients of any such Covered Software in Executable form as to how they can
+obtain such Covered Software in Source Code form in a reasonable manner on or
+through a medium customarily used for software exchange.
+
+3.2. Modifications.
+
+The Modifications that You create or to which You contribute are governed by
+the terms of this License. You represent that You believe Your Modifications
+are Your original creation(s) and/or You have sufficient rights to grant the
+rights conveyed by this License.
+
+3.3. Required Notices.  You must include a notice in each of Your Modifications
+that identifies You as the Contributor of the Modification. You may not remove
+or alter any copyright, patent or trademark notices contained within the
+Covered Software, or any notices of licensing or any descriptive text giving
+attribution to any Contributor or the Initial Developer.
+
+3.4. Application of Additional Terms.  You may not offer or impose any terms on
+any Covered Software in Source Code form that alters or restricts the
+applicable version of this License or the recipients rights hereunder. You may
+choose to offer, and to charge a fee for, warranty, support, indemnity or
+liability obligations to one or more recipients of Covered Software. However,
+you may do so only on Your own behalf, and not on behalf of the Initial
+Developer or any Contributor. You must make it absolutely clear that any such
+warranty, support, indemnity or liability obligation is offered by You alone,
+and You hereby agree to indemnify the Initial Developer and every Contributor
+for any liability incurred by the Initial Developer or such Contributor as a
+result of warranty, support, indemnity or liability terms You offer.
+
+3.5. Distribution of Executable Versions.  You may distribute the Executable
+form of the Covered Software under the terms of this License or under the terms
+of a license of Your choice, which may contain terms different from this
+License, provided that You are in compliance with the terms of this License and
+that the license for the Executable form does not attempt to limit or alter the
+recipients rights in the Source Code form from the rights set forth in this
+License. If You distribute the Covered Software in Executable form under a
+different license, You must make it absolutely clear that any terms which
+differ from this License are offered by You alone, not by the Initial Developer
+or Contributor. You hereby agree to indemnify the Initial Developer and every
+Contributor for any liability incurred by the Initial Developer or such
+Contributor as a result of any such terms You offer.
+
+3.6. Larger Works.  You may create a Larger Work by combining Covered Software
+with other code not governed by the terms of this License and distribute the
+Larger Work as a single product. In such a case, You must make sure the
+requirements of this License are fulfilled for the Covered Software.
+
+4. Versions of the License.
+
+4.1. New Versions.  Sun Microsystems, Inc. is the initial license steward and
+may publish revised and/or new versions of this License from time to time. Each
+version will be given a distinguishing version number. Except as provided in
+Section 4.3, no one other than the license steward has the right to modify this
+License.
+
+4.2. Effect of New Versions.
+
+You may always continue to use, distribute or otherwise make the Covered
+Software available under the terms of the version of the License under which
+You originally received the Covered Software. If the Initial Developer includes
+a notice in the Original Software prohibiting it from being distributed or
+otherwise made available under any subsequent version of the License, You must
+distribute and make the Covered Software available under the terms of the
+version of the License under which You originally received the Covered
+Software. Otherwise, You may also choose to use, distribute or otherwise make
+the Covered Software available under the terms of any subsequent version of the
+License published by the license steward.  4.3. Modified Versions.
+
+When You are an Initial Developer and You want to create a new license for Your
+Original Software, You may create and use a modified version of this License if
+You: (a)árename the license and remove any references to the name of the
+license steward (except to note that the license differs from this License);
+and (b)áotherwise make it clear that the license contains terms which differ
+from this License.
+
+5. DISCLAIMER OF WARRANTY.
+
+COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
+LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS,
+MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK
+AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD
+ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL
+DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING,
+REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART
+OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT
+UNDER THIS DISCLAIMER.
+
+6. TERMINATION.
+
+6.1. This License and the rights granted hereunder will terminate automatically
+if You fail to comply with terms herein and fail to cure such breach within 30
+days of becoming aware of the breach. Provisions which, by their nature, must
+remain in effect beyond the termination of this License shall survive.
+
+6.2. If You assert a patent infringement claim (excluding declaratory judgment
+actions) against Initial Developer or a Contributor (the Initial Developer or
+Contributor against whom You assert such claim is referred to as Participant)
+alleging that the Participant Software (meaning the Contributor Version where
+the Participant is a Contributor or the Original Software where the Participant
+is the Initial Developer) directly or indirectly infringes any patent, then any
+and all rights granted directly or indirectly to You by such Participant, the
+Initial Developer (if the Initial Developer is not the Participant) and all
+Contributors under Sectionsá2.1 and/or 2.2 of this License shall, upon 60 days
+notice from Participant terminate prospectively and automatically at the
+expiration of such 60 day notice period, unless if within such 60 day period
+You withdraw Your claim with respect to the Participant Software against such
+Participant either unilaterally or pursuant to a written agreement with
+Participant.
+
+6.3. In the event of termination under Sectionsá6.1 or 6.2 above, all end user
+licenses that have been validly granted by You or any distributor hereunder
+prior to termination (excluding licenses granted to You by any distributor)
+shall survive termination.
+
+7. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING
+NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY
+OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF
+ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL,
+INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
+FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN
+IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS
+LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
+LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND
+LIMITATION MAY NOT APPLY TO YOU.
+
+8. U.S. GOVERNMENT END USERS.
+
+The Covered Software is a commercial item, as that term is defined in
+48áC.F.R.á2.101 (Oct. 1995), consisting of commercial computer software (as
+that term is defined at 48 C.F.R. á252.227-7014(a)(1)) and commercial computer
+software documentation as such terms are used in 48áC.F.R.á12.212 (Sept. 1995).
+Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
+(June 1995), all U.S. Government End Users acquire Covered Software with only
+those rights set forth herein. This U.S. Government Rights clause is in lieu
+of, and supersedes, any other FAR, DFAR, or other clause or provision that
+addresses Government rights in computer software under this License.
+
+9. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject matter
+hereof. If any provision of this License is held to be unenforceable, such
+provision shall be reformed only to the extent necessary to make it
+enforceable. This License shall be governed by the law of the jurisdiction
+specified in a notice contained within the Original Software (except to the
+extent applicable law, if any, provides otherwise), excluding such
+jurisdictions conflict-of-law provisions. Any litigation relating to this
+License shall be subject to the jurisdiction of the courts located in the
+jurisdiction and venue specified in a notice contained within the Original
+Software, with the losing party responsible for costs, including, without
+limitation, court costs and reasonable attorneys fees and expenses. The
+application of the United Nations Convention on Contracts for the International
+Sale of Goods is expressly excluded. Any law or regulation which provides that
+the language of a contract shall be construed against the drafter shall not
+apply to this License. You agree that You alone are responsible for compliance
+with the United States export administration regulations (and the export
+control laws and regulation of any other countries) when You use, distribute or
+otherwise make available any Covered Software.
+
+10. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is responsible
+for claims and damages arising, directly or indirectly, out of its utilization
+of rights under this License and You agree to work with Initial Developer and
+Contributors to distribute such responsibility on an equitable basis. Nothing
+herein is intended or shall be deemed to constitute any admission of liability.
+
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE
+(CDDL) The GlassFish code released under the CDDL shall be governed by the laws
+of the State of California (excluding conflict-of-law provisions). Any
+litigation relating to this License shall be subject to the jurisdiction of the
+Federal Courts of the Northern District of California and the state courts of
+the State of California, with venue lying in Santa Clara County, California. 
+
+
+==========================================================================
+The following license applies to parts of the lucene-snowball jar
+that are generated from the snowball sources at http://snowball.tartarus.org/
+--------------------------------------------------------------------------
+The BSD License
+
+Copyright (c) 2001, Dr Martin Porter, Copyright (c) 2002, Richard Boulton
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    * Neither the name of the <ORGANIZATION> nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+==========================================================================
+The following license applies to easymock.jar
+--------------------------------------------------------------------------
+EasyMock 2 License (MIT License)
+Copyright (c) 2001-2007 OFFIS, Tammo Freese.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to do 
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE. 
+

Added: trunk/solr/debian/get-orig-source
===================================================================
--- trunk/solr/debian/get-orig-source	                        (rev 0)
+++ trunk/solr/debian/get-orig-source	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+DEHS=`( uscan --no-download --dehs ; echo "</dehs>" )`
+
+URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
+VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
+
+SOURCEFILE=../solr_$VERSION.orig.tar.gz
+SIGFILE=../solr_$VERSION.orig.tar.gz.asc
+
+KEYURL="http://www.apache.org/dist/lucene/solr/KEYS.txt"
+KEYFILE="debian/KEYS.txt"
+KEYRING="debian/solr-keyring.gpg"
+
+# Download source tarball and signature file
+#wget --limit-rate=20k "$URL" -O $SOURCEFILE
+wget "$URL" -O $SOURCEFILE
+wget "$URL.asc" -O $SIGFILE
+
+# If necessary, recreate keyring used for signing
+# Only do this if the keyring is not yet downloaded
+if [ ! -r $KEYFILE ]; then
+    wget "$KEYURL" -O "$KEYFILE"
+fi
+
+if [ ! -r $KEYRING ]; then
+    touch $KEYRING
+    gpg --no-default-keyring --primary-keyring $KEYRING --import $KEYFILE
+fi
+
+# Check signature
+gpgv --quiet --keyring $KEYRING $SIGFILE $SOURCEFILE
+
+echo "Check whether the archive has been signed by Yorick Seeley, key ID 0AFCEE7C"


Property changes on: trunk/solr/debian/get-orig-source
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/solr/debian/jetty-web.xml
===================================================================
--- trunk/solr/debian/jetty-web.xml	                        (rev 0)
+++ trunk/solr/debian/jetty-web.xml	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,13 @@
+<?xml version="1.0"  encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN"
+"http://jetty.mortbay.org/configure.dtd">
+
+<!-- Set the solr.solr.home system property -->
+<Configure class="org.mortbay.jetty.servlet.WebApplicationContext">
+  <Call name="setProperty" class="java.lang.System">
+    <Arg type="String">solr.solr.home</Arg>
+    <Arg type="String">/usr/share/solr</Arg>
+  </Call>
+</Configure>
+
+

Added: trunk/solr/debian/patches/00list
===================================================================
--- trunk/solr/debian/patches/00list	                        (rev 0)
+++ trunk/solr/debian/patches/00list	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,5 @@
+01_remove-all-jarfiles.dpatch
+02_fix-solr-version.dpatch
+03_relocate-datadir.dpatch
+04_fix-lucene-lock-directory.dpatch
+05_use-debian-java-libraries.dpatch

Added: trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch
===================================================================
--- trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch	                        (rev 0)
+++ trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch	2007-08-06 07:25:59 UTC (rev 3990)
@@ -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
+


Property changes on: trunk/solr/debian/patches/01_remove-all-jarfiles.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/solr/debian/patches/02_fix-solr-version.dpatch
===================================================================
--- trunk/solr/debian/patches/02_fix-solr-version.dpatch	                        (rev 0)
+++ trunk/solr/debian/patches/02_fix-solr-version.dpatch	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,20 @@
+#! /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 -->
+   <!--


Property changes on: trunk/solr/debian/patches/02_fix-solr-version.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/solr/debian/patches/03_relocate-datadir.dpatch
===================================================================
--- trunk/solr/debian/patches/03_relocate-datadir.dpatch	                        (rev 0)
+++ trunk/solr/debian/patches/03_relocate-datadir.dpatch	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,23 @@
+#! /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. -->


Property changes on: trunk/solr/debian/patches/03_relocate-datadir.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch
===================================================================
--- trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch	                        (rev 0)
+++ trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch	2007-08-06 07:25:59 UTC (rev 3990)
@@ -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 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();
+ 


Property changes on: trunk/solr/debian/patches/04_fix-lucene-lock-directory.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch
===================================================================
--- trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch	                        (rev 0)
+++ trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,51 @@
+#! /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-19 10:44:26.000000000 +0200
++++ trunk/build.xml	2007-06-19 10:44:48.000000000 +0200
+@@ -55,7 +55,7 @@
+   <property name="specversion" value="1.2.${dateversion}" />
+ 
+   <!-- 3rd party libraries for compilation -->
+-  <property name="lib" value="lib" />
++  <property name="lib" value="/usr/share/java" />
+ 
+   <!-- solr source files -->
+   <property name="src" value="src" />
+@@ -162,7 +162,17 @@
+   <!-- 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-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-io.jar" />
++      <include name="xpp3.jar" />
+     </fileset>
+   </path>
+ 
+@@ -388,10 +398,6 @@
+          webxml="${src}/webapp/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="${fullnamever}.jar" />
+        </lib>


Property changes on: trunk/solr/debian/patches/05_use-debian-java-libraries.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/solr/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	                        (rev 0)
+++ trunk/solr/debian/patches/06_use-debian-java-libraries-but-include-them-in-lib.dpatch	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,48 @@
+#! /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>


Property changes on: trunk/solr/debian/patches/06_use-debian-java-libraries-but-include-them-in-lib.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/solr/debian/po/POTFILES.in
===================================================================
--- trunk/solr/debian/po/POTFILES.in	                        (rev 0)
+++ trunk/solr/debian/po/POTFILES.in	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,2 @@
+[type: gettext/rfc822deb] solr-common.templates
+

Added: trunk/solr/debian/po/templates.pot
===================================================================
--- trunk/solr/debian/po/templates.pot	                        (rev 0)
+++ trunk/solr/debian/po/templates.pot	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,31 @@
+# Debian package for Solr.
+# Copyright (C) 2007 Jan-Pascal van Best
+# This file is distributed under the GNU General Public License, version 2.
+# Jan-Pascal van Best <janpascal at vanbest.org>, 2007
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: janpascal at vanbest.org\n"
+"POT-Creation-Date: 2007-06-05 10:21+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../solr-common.templates:1001
+msgid "Remove index files?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../solr-common.templates:1001
+msgid ""
+"The script is about to remove the data directory /var/lib/solr. If you think "
+"you need Solr's index files later, the data should be kept."
+msgstr ""

Added: trunk/solr/debian/rules
===================================================================
--- trunk/solr/debian/rules	                        (rev 0)
+++ trunk/solr/debian/rules	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,196 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+DEBIAN_VERSION := $(shell dpkg-parsechangelog | grep "^Version:" | cut -c 10-)
+DEBIAN_ARCH := $(shell dpkg-architecture  | grep ^DEB_BUILD_ARCH= | cut -c 16-)
+
+# Upstream Solr version
+UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | grep -o "^[[:digit:]\.]*")
+UPSTREAM_BASENAME = apache-solr-$(UPSTREAM_VERSION)
+
+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
+
+WARFILE = $(UPSTREAM_BASENAME).war
+
+# Explicitly build with sun-java5-jdk
+export JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun
+export JAVA = $(JAVA_HOME)/bin/java
+export JAVAC = $(JAVA_HOME)/bin/javac
+export JAR = $(JAVA_HOME)/bin/jar
+
+# Class path: Ant requires a JAXP-compatible XML parser
+# You need to set CLASSPATH here (even if your build.xml assembles its own
+# class path) to ensure the same build results in all cases
+JAVA_LIB=/usr/share/java
+ANT_HOME=/usr/share/ant
+ANT_CLASSPATH=$(JAVA_LIB)/junit.jar
+
+# Set path to Ant properties file
+ANT_PROPS=$(CURDIR)/debian/ant.properties
+
+# Universal Ant invocation for reliable builds;
+# place '-verbose' before -propertyfile to
+# obtain detailed build output.
+ANT=ant -propertyfile $(ANT_PROPS)
+
+# Include dpatch stuff per the documentation
+include /usr/share/dpatch/dpatch.make
+
+patch-stamp: patch
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+	dh_testdir
+	# Add here commands to configure the package.
+
+	touch configure-stamp
+
+#Architecture 
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp 
+
+	# Add here commands to compile the arch part of the package.
+	#$(MAKE) 
+	touch build-arch-stamp
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp 
+
+	dh_testdir
+
+	$(ANT) compile
+	# $(ANT) test
+	$(ANT) dist-war
+
+	touch build-indep-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP#
+
+	# Add here commands to clean up after the build process.
+	# -$(MAKE) clean
+	$(ANT) clean
+
+	rm -rf example/solr/data/index
+	rm -f debian/solr-keyring.gpg
+	debconf-updatepo
+
+	dh_clean 
+
+install: install-indep install-arch
+install-indep:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i 
+	dh_installdirs
+
+	# Install the libraries into the solr package
+	
+	# 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)/bin
+	
+	# 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/
+
+	# 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
+
+	# Configure Jetty
+	install --mode 0644 debian/jetty-web.xml $(JETTY_INSTDIR)/usr/share/solr/WEB-INF/
+
+	# This information is already somewhere else
+	rm -f $(COMMON_INSTDIR)/usr/share/solr/META-INF/LICENSE.txt
+	
+	#dh_install
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -s 
+	dh_installdirs -s
+
+	# Add here commands to install the arch part of the package into 
+	# debian/<package>
+
+	dh_install -s
+
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGES.txt
+	dh_installdocs
+	dh_installexamples
+	dh_installdebconf	
+#	dh_installlogrotate	
+#	dh_installinit
+#	dh_installcron
+	dh_installman
+	dh_link
+	dh_compress 
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+binary: binary-indep
+
+binary-arch:
+	# empty
+
+remove-source:
+	rm -f build.xml
+	rm -f *.txt
+	rm -f *stamp
+	rm -rf debian/patched
+	rm -rf build dist docs example lib src
+	rm -rf apache-solr*
+
+restore-from-source: remove-source
+	tar xzf ../solr_$(UPSTREAM_VERSION).orig.tar.gz
+	mv $(UPSTREAM_BASENAME)/* .
+	rmdir $(UPSTREAM_BASENAME)
+
+get-orig-source:
+	debian/get-orig-source
+
+upload:
+	cd .. ; dupload -t vanbest solr_$(DEBIAN_VERSION)_$(DEBIAN_ARCH).changes 
+	#cd .. ; dupload -t mentors solr_$(DEBIAN_VERSION)_$(DEBIAN_ARCH).changes
+
+.PHONY: patched build clean binary-indep binary-arch binary install install-indep install-arch configure


Property changes on: trunk/solr/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/solr/debian/solr-common.config
===================================================================
--- trunk/solr/debian/solr-common.config	                        (rev 0)
+++ trunk/solr/debian/solr-common.config	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+#DEBHELPER#
+

Added: trunk/solr/debian/solr-common.dirs
===================================================================
--- trunk/solr/debian/solr-common.dirs	                        (rev 0)
+++ trunk/solr/debian/solr-common.dirs	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,8 @@
+/etc/solr 
+/etc/solr/conf
+/usr/share/solr
+/usr/share/solr/bin
+/var/lib/solr
+/var/lib/solr/data
+/usr/share/doc/solr/examples 
+

Added: trunk/solr/debian/solr-common.docs
===================================================================
--- trunk/solr/debian/solr-common.docs	                        (rev 0)
+++ trunk/solr/debian/solr-common.docs	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,5 @@
+CHANGES.txt
+KEYS.txt
+NOTICE.txt
+README.txt
+docs/

Added: trunk/solr/debian/solr-common.links
===================================================================
--- trunk/solr/debian/solr-common.links	                        (rev 0)
+++ trunk/solr/debian/solr-common.links	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,13 @@
+/etc/solr/web.xml /usr/share/solr/WEB-INF/web.xml
+/etc/solr/conf /usr/share/solr/conf
+/usr/share/java/lucene-core.jar /usr/share/solr/WEB-INF/lib/lucene-core.jar
+/usr/share/java/lucene-analyzers.jar /usr/share/solr/WEB-INF/lib/lucene-analyzers.jar
+/usr/share/java/lucene-highlighter.jar /usr/share/solr/WEB-INF/lib/lucene-highlighter.jar
+/usr/share/java/lucene-snowball.jar /usr/share/solr/WEB-INF/lib/lucene-snowball.jar
+/usr/share/java/lucene-spellchecker.jar /usr/share/solr/WEB-INF/lib/lucene-spellchecker.jar
+/usr/share/java/commons-codec.jar /usr/share/solr/WEB-INF/lib/commons-codec.jar
+/usr/share/java/commons-csv.jar /usr/share/solr/WEB-INF/lib/commons-csv.jar
+/usr/share/java/commons-fileupload.jar /usr/share/solr/WEB-INF/lib/commons-fileupload.jar
+/usr/share/java/commons-io.jar /usr/share/solr/WEB-INF/lib/commons-io.jar
+/usr/share/java/xpp3.jar /usr/share/solr/WEB-INF/lib/xpp3.jar
+

Added: trunk/solr/debian/solr-common.postinst
===================================================================
--- trunk/solr/debian/solr-common.postinst	                        (rev 0)
+++ trunk/solr/debian/solr-common.postinst	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e
+. /usr/share/debconf/confmodule
+
+#DEBHELPER#

Added: trunk/solr/debian/solr-common.postrm
===================================================================
--- trunk/solr/debian/solr-common.postrm	                        (rev 0)
+++ trunk/solr/debian/solr-common.postrm	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+if [ "$1" == "purge"  ]; then
+    if [ -e /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+	db_input high solr/purgeindexfiles || true
+	db_go || true
+	db_get solr/purgeindexfiles || true
+	if [ "$RET" == "true" ]; then
+	    rm -rf /var/lib/solr
+	fi
+    else
+	rm -rf /var/lib/solr
+    fi
+fi
+
+#DEBHELPER#

Added: trunk/solr/debian/solr-common.templates
===================================================================
--- trunk/solr/debian/solr-common.templates	                        (rev 0)
+++ trunk/solr/debian/solr-common.templates	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,8 @@
+Template: solr/purgeindexfiles
+Type: boolean
+Default: false
+_Description: Remove index files?
+ The script is about to remove the data directory /var/lib/solr.
+ If you think you need Solr's index files later, the data
+ should be kept.
+

Added: trunk/solr/debian/solr-jetty.dirs
===================================================================
--- trunk/solr/debian/solr-jetty.dirs	                        (rev 0)
+++ trunk/solr/debian/solr-jetty.dirs	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,3 @@
+/usr/share/jetty/webapps
+/usr/share/solr/WEB-INF
+

Added: trunk/solr/debian/solr-jetty.links
===================================================================
--- trunk/solr/debian/solr-jetty.links	                        (rev 0)
+++ trunk/solr/debian/solr-jetty.links	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1 @@
+/usr/share/solr /usr/share/jetty/webapps/solr

Added: trunk/solr/debian/solr-jetty.postinst
===================================================================
--- trunk/solr/debian/solr-jetty.postinst	                        (rev 0)
+++ trunk/solr/debian/solr-jetty.postinst	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+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 jetty root 0750 /var/lib/solr 
+	fi
+
+	if ! dpkg-statoverride --quiet --list /var/lib/solr/data > /dev/null ; then
+	    dpkg-statoverride --quiet --update --add jetty root 0750 /var/lib/solr/data 
+	fi
+
+	if [ -d /var/lib/solr/data/index ]; then
+	    chown -R jetty:root /var/lib/solr/data
+	fi
+
+	invoke-rc.d --quiet jetty restart || {
+	    RESULT=$?
+	    # Ignore if jetty init script does not exist (yet)
+	    if [ $RESULT != 100 ]; then
+		exit $RESULT
+	    fi
+	}
+
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+
+esac
+
+#DEBHELPER#

Added: trunk/solr/debian/solr-jetty.postrm
===================================================================
--- trunk/solr/debian/solr-jetty.postrm	                        (rev 0)
+++ trunk/solr/debian/solr-jetty.postrm	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+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 Jetty if it is due to be removed, too?
+	if [ -x /usr/sbin/invoke-rc.d ]; then
+	    invoke-rc.d jetty 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#

Added: trunk/solr/debian/solr-tomcat5.5.dirs
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.dirs	                        (rev 0)
+++ trunk/solr/debian/solr-tomcat5.5.dirs	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,6 @@
+/etc/solr
+/etc/tomcat5/policy.d 
+/usr/share/tomcat5.5/conf/Catalina/localhost
+/var/lib/solr
+/var/lib/solr/data
+

Added: trunk/solr/debian/solr-tomcat5.5.links
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.links	                        (rev 0)
+++ trunk/solr/debian/solr-tomcat5.5.links	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,2 @@
+/etc/solr/solr-tomcat5.5.xml /usr/share/tomcat5.5/conf/Catalina/localhost/solr.xml
+/etc/solr/tomcat.policy /etc/tomcat5.5/policy.d/05solr.policy

Added: trunk/solr/debian/solr-tomcat5.5.postinst
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.postinst	                        (rev 0)
+++ trunk/solr/debian/solr-tomcat5.5.postinst	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+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#

Added: trunk/solr/debian/solr-tomcat5.5.postrm
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.postrm	                        (rev 0)
+++ trunk/solr/debian/solr-tomcat5.5.postrm	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+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#

Added: trunk/solr/debian/solr-tomcat5.5.xml
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.xml	                        (rev 0)
+++ trunk/solr/debian/solr-tomcat5.5.xml	2007-08-06 07:25:59 UTC (rev 3990)
@@ -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 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>

Added: trunk/solr/debian/tomcat.policy
===================================================================
--- trunk/solr/debian/tomcat.policy	                        (rev 0)
+++ trunk/solr/debian/tomcat.policy	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,18 @@
+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";
+};

Added: trunk/solr/debian/uscan-upstream-version.xslt
===================================================================
--- trunk/solr/debian/uscan-upstream-version.xslt	                        (rev 0)
+++ trunk/solr/debian/uscan-upstream-version.xslt	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="text"/>
+
+<xsl:template match="dehs">
+  <xsl:value-of select="upstream-version"/>
+</xsl:template>
+
+</xsl:stylesheet>
+

Added: trunk/solr/debian/uscan-url.xslt
===================================================================
--- trunk/solr/debian/uscan-url.xslt	                        (rev 0)
+++ trunk/solr/debian/uscan-url.xslt	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="text"/>
+
+<xsl:template match="dehs">
+  <xsl:value-of select="upstream-url"/>
+</xsl:template>
+
+</xsl:stylesheet>
+

Added: trunk/solr/debian/watch
===================================================================
--- trunk/solr/debian/watch	                        (rev 0)
+++ trunk/solr/debian/watch	2007-08-06 07:25:59 UTC (rev 3990)
@@ -0,0 +1,4 @@
+version=3
+
+http://www.apache.org/dist/lucene/solr/([0-9]*\.[0-9]*)/apache-solr-(.*).tgz
+




More information about the pkg-java-commits mailing list