[pkg-java] r8573 - in tags/solr: . 1.2.0+ds2-6 1.2.0+ds2-6/debian 1.2.0+ds2-6/debian/patches 1.2.0+ds2-6/debian/po
Jan-Pascal van Best
janpascal-guest at alioth.debian.org
Tue Jun 23 13:49:10 UTC 2009
Author: janpascal-guest
Date: 2009-06-23 13:49:09 +0000 (Tue, 23 Jun 2009)
New Revision: 8573
Added:
tags/solr/1.2.0+ds2-6/
tags/solr/1.2.0+ds2-6/debian/
tags/solr/1.2.0+ds2-6/debian/README.Debian
tags/solr/1.2.0+ds2-6/debian/changelog
tags/solr/1.2.0+ds2-6/debian/compat
tags/solr/1.2.0+ds2-6/debian/control
tags/solr/1.2.0+ds2-6/debian/patches/00list
tags/solr/1.2.0+ds2-6/debian/patches/07_fix-for-lucene-2.4.dpatch
tags/solr/1.2.0+ds2-6/debian/po/gl.po
tags/solr/1.2.0+ds2-6/debian/po/sv.po
tags/solr/1.2.0+ds2-6/debian/rules
tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.dirs
tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.links
tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.postinst
tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.postrm
tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.xml
tags/solr/1.2.0+ds2-6/debian/tomcat.policy
tags/solr/1.2.0+ds2-6/debian/watch
Removed:
tags/solr/1.2.0+ds2-6/debian/README.Debian
tags/solr/1.2.0+ds2-6/debian/changelog
tags/solr/1.2.0+ds2-6/debian/compat
tags/solr/1.2.0+ds2-6/debian/control
tags/solr/1.2.0+ds2-6/debian/patches/00list
tags/solr/1.2.0+ds2-6/debian/patches/07_fix-for-lucene-2.3.dpatch
tags/solr/1.2.0+ds2-6/debian/po/gl.po
tags/solr/1.2.0+ds2-6/debian/po/se.po
tags/solr/1.2.0+ds2-6/debian/rules
tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.dirs
tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.links
tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.postinst
tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.postrm
tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.xml
tags/solr/1.2.0+ds2-6/debian/tomcat.policy
tags/solr/1.2.0+ds2-6/debian/watch
Log:
Tagged solr-1.2.0+ds2-6
Property changes on: tags/solr/1.2.0+ds2-6
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: tags/solr/1.2.0+ds2-6/debian/README.Debian
===================================================================
--- branches/solr/1.2.0+ds2/debian/README.Debian 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/README.Debian 2009-06-23 13:49:09 UTC (rev 8573)
@@ -1,15 +0,0 @@
-README for solr
----------------
-
-Solr is an enterprise search server based on the Lucene Java library. The
-Debian packaging of Solr consists of two 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.
-
-Homepage: http://lucene.apache.org/solr/
-
-Replication
------------
-Solr's replication scripts are installed into /usr/share/solr/scripts
Copied: tags/solr/1.2.0+ds2-6/debian/README.Debian (from rev 8567, branches/solr/1.2.0+ds2/debian/README.Debian)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/README.Debian (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/README.Debian 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,15 @@
+README for solr
+---------------
+
+Solr is an enterprise search server based on the Lucene Java library. The
+Debian packaging of Solr consists of two binary packages:
+- solr-common contains the Solr software itself and general configuration.
+- solr-tomcat6 installs Solr as a servlet in Tomcat 6. After installation,
+ point your browser to http://localhost:8080/solr/admin
+ to see the Solr web administration interface.
+
+Homepage: http://lucene.apache.org/solr/
+
+Replication
+-----------
+Solr's replication scripts are installed into /usr/share/solr/scripts
Deleted: tags/solr/1.2.0+ds2-6/debian/changelog
===================================================================
--- branches/solr/1.2.0+ds2/debian/changelog 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/changelog 2009-06-23 13:49:09 UTC (rev 8573)
@@ -1,59 +0,0 @@
-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> Sat, 23 Aug 2008 21:22:53 +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.2.0+ds2-6/debian/changelog (from rev 8567, branches/solr/1.2.0+ds2/debian/changelog)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/changelog (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/changelog 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,106 @@
+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> Sat, 23 Aug 2008 21:22:53 +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.2.0+ds2-6/debian/compat
===================================================================
--- branches/solr/1.2.0+ds2/debian/compat 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/compat 2009-06-23 13:49:09 UTC (rev 8573)
@@ -1 +0,0 @@
-4
Copied: tags/solr/1.2.0+ds2-6/debian/compat (from rev 8567, branches/solr/1.2.0+ds2/debian/compat)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/compat (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/compat 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1 @@
+5
Deleted: tags/solr/1.2.0+ds2-6/debian/control
===================================================================
--- branches/solr/1.2.0+ds2/debian/control 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/control 2009-06-23 13:49:09 UTC (rev 8573)
@@ -1,65 +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>
-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.3.2),
- 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.3),
- 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)
-#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.2.0+ds2-6/debian/control (from rev 8568, branches/solr/1.2.0+ds2/debian/control)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/control (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/control 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,69 @@
+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.1
+
+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.4-java (>= 5.0.30),
+ liblucene2-java (>= 2.4),
+ libxpp3-java (>= 1.1.3.4.0)
+Recommends: solr-tomcat6 (>= ${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-tomcat6 or solr-jetty to use Solr under Tomcat or Jetty.
+
+Package: solr-tomcat6
+Architecture: all
+Depends: ${misc:Depends},
+ solr-common (= ${binary:Version}), tomcat6 (>= 6.0.18)
+Conflicts: solr-jetty, solr-tomcat5.5
+Replaces: solr-tomcat5.5
+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)
+#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.
Deleted: tags/solr/1.2.0+ds2-6/debian/patches/00list
===================================================================
--- branches/solr/1.2.0+ds2/debian/patches/00list 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/patches/00list 2009-06-23 13:49:09 UTC (rev 8573)
@@ -1,6 +0,0 @@
-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
-07_fix-for-lucene-2.3.dpatch
Copied: tags/solr/1.2.0+ds2-6/debian/patches/00list (from rev 7896, branches/solr/1.2.0+ds2/debian/patches/00list)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/patches/00list (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/patches/00list 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,6 @@
+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
+07_fix-for-lucene-2.4.dpatch
Deleted: tags/solr/1.2.0+ds2-6/debian/patches/07_fix-for-lucene-2.3.dpatch
===================================================================
--- branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.3.dpatch 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/patches/07_fix-for-lucene-2.3.dpatch 2009-06-23 13:49:09 UTC (rev 8573)
@@ -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.2.0+ds2-6/debian/patches/07_fix-for-lucene-2.4.dpatch (from rev 7896, branches/solr/1.2.0+ds2/debian/patches/07_fix-for-lucene-2.4.dpatch)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/patches/07_fix-for-lucene-2.4.dpatch (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/patches/07_fix-for-lucene-2.4.dpatch 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,42 @@
+#! /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 1.2.0+ds2~/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java 1.2.0+ds2/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java
+--- 1.2.0+ds2~/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java 2007-05-30 17:51:11.000000000 +0200
++++ 1.2.0+ds2/src/java/org/apache/solr/analysis/EnglishPorterFilterFactory.java 2009-01-28 13:26:02.000000000 +0100
+@@ -59,12 +59,12 @@
+ */
+ class EnglishPorterFilter extends TokenFilter {
+ private final Set protWords;
+- private net.sf.snowball.ext.EnglishStemmer stemmer;
++ private org.tartarus.snowball.ext.EnglishStemmer stemmer;
+
+ public EnglishPorterFilter(TokenStream source, Set protWords) {
+ super(source);
+ this.protWords=protWords;
+- stemmer = new net.sf.snowball.ext.EnglishStemmer();
++ stemmer = new org.tartarus.snowball.ext.EnglishStemmer();
+ }
+
+
+diff -urNad 1.2.0+ds2~/src/java/org/apache/solr/analysis/StopFilterFactory.java 1.2.0+ds2/src/java/org/apache/solr/analysis/StopFilterFactory.java
+--- 1.2.0+ds2~/src/java/org/apache/solr/analysis/StopFilterFactory.java 2009-01-28 13:24:37.000000000 +0100
++++ 1.2.0+ds2/src/java/org/apache/solr/analysis/StopFilterFactory.java 2009-01-28 13:24:38.000000000 +0100
+@@ -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) {
Deleted: tags/solr/1.2.0+ds2-6/debian/po/gl.po
===================================================================
--- branches/solr/1.2.0+ds2/debian/po/gl.po 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/po/gl.po 2009-06-23 13:49:09 UTC (rev 8573)
@@ -1,41 +0,0 @@
-# Galician translation of solr's debconf templates
-# This file is distributed under the same license as the solr package.
-# Jacobo Tarrio <jtarrio at debian.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: solr\n"
-"Report-Msgid-Bugs-To: pkg-java-maintainers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-04 07:18+0200\n"
-"PO-Revision-Date: 2007-10-14 12:29+0100\n"
-"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
-"Language-Team: Galician <proxecto at trasno.net>\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:2001
-msgid "Remove Solr index files?"
-msgstr "¿Eliminar os ficheiros de índice de Solr?"
-
-#. Type: boolean
-#. Description
-#: ../solr-common.templates:2001
-msgid ""
-"The Solr data directory (/var/lib/solr), and the index files it contains, "
-"may be removed while purging the package."
-msgstr ""
-"Pódese eliminar o directorio de datos de Solr (/var/lib/solr), xunto cos "
-"ficheiros de índices que contén, ao purgar o paquete."
-
-#. Type: boolean
-#. Description
-#: ../solr-common.templates:2001
-msgid ""
-"You should not choose this option if you intend to re-use Solr's index files "
-"later."
-msgstr ""
-"Non escolla esta opción se quere reutilizar os ficheiros de índice de Solr "
-"máis adiante."
Copied: tags/solr/1.2.0+ds2-6/debian/po/gl.po (from rev 7892, branches/solr/1.2.0+ds2/debian/po/gl.po)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/po/gl.po (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/po/gl.po 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,45 @@
+# translation of solr_1.2.0+ds1-3_gl.po to galician
+# Galician translation of solr's debconf templates
+# This file is distributed under the same license as the solr package.
+#
+# Jacobo Tarrio <jtarrio at debian.org>, 2007.
+# mvillarino <mvillarino at users.sourceforge.net>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: solr_1.2.0+ds1-3_gl\n"
+"Report-Msgid-Bugs-To: pkg-java-maintainers at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-10-04 07:18+0200\n"
+"PO-Revision-Date: 2009-01-26 22:12+0100\n"
+"Last-Translator: Marce Villarino <mvillarino at users.sourceforge.net>\n"
+"Language-Team: galician <proxecto at trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Type: boolean
+#. Description
+#: ../solr-common.templates:2001
+msgid "Remove Solr index files?"
+msgstr "Desexa eliminar os ficheiros de índice de Solr?"
+
+#. Type: boolean
+#. Description
+#: ../solr-common.templates:2001
+msgid ""
+"The Solr data directory (/var/lib/solr), and the index files it contains, "
+"may be removed while purging the package."
+msgstr ""
+"Póndese eliminar o directorio de datos de Solr (/var/lib/solr), xunto cos "
+"ficheiros de índices que contén, ao purgar o paquete."
+
+#. Type: boolean
+#. Description
+#: ../solr-common.templates:2001
+msgid ""
+"You should not choose this option if you intend to re-use Solr's index files "
+"later."
+msgstr ""
+"Non escolla esta opción se quere reutilizar os ficheiros de índice de Solr "
+"máis adiante."
Deleted: tags/solr/1.2.0+ds2-6/debian/po/se.po
===================================================================
--- branches/solr/1.2.0+ds2/debian/po/se.po 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/po/se.po 2009-06-23 13:49:09 UTC (rev 8573)
@@ -1,41 +0,0 @@
-# translation of solr_1.2.0+ds1-3_templates.po to swedish
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Martin Bagge <martin.bagge at bthstudent.se>, 2008.
-msgid ""
-msgstr ""
-"Project-Id-Version: solr_1.2.0+ds1-3_templates\n"
-"Report-Msgid-Bugs-To: pkg-java-maintainers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2007-10-04 07:18+0200\n"
-"PO-Revision-Date: 2008-05-28 20:16+0200\n"
-"Last-Translator: Martin Bagge <martin.bagge at bthstudent.se>\n"
-"Language-Team: swedish <sv at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#. Type: boolean
-#. Description
-#: ../solr-common.templates:2001
-msgid "Remove Solr index files?"
-msgstr "Ta bort index filer för Solr?"
-
-#. Type: boolean
-#. Description
-#: ../solr-common.templates:2001
-msgid ""
-"The Solr data directory (/var/lib/solr), and the index files it contains, "
-"may be removed while purging the package."
-msgstr "Data-katalogen (/var/lib/solr), samt index-filerna som finns däri, kan raderas när paketet rensas ut."
-
-#. Type: boolean
-#. Description
-#: ../solr-common.templates:2001
-msgid ""
-"You should not choose this option if you intend to re-use Solr's index files "
-"later."
-msgstr "Du ska inte välja det här alternativet om du har tänkt använda Solrs index-filer vid ett senare tillfälle."
-
-
Copied: tags/solr/1.2.0+ds2-6/debian/po/sv.po (from rev 7136, branches/solr/1.2.0+ds2/debian/po/sv.po)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/po/sv.po (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/po/sv.po 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,41 @@
+# translation of solr_1.2.0+ds1-3_templates.po to swedish
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Martin Bagge <martin.bagge at bthstudent.se>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: solr_1.2.0+ds1-3_templates\n"
+"Report-Msgid-Bugs-To: pkg-java-maintainers at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2007-10-04 07:18+0200\n"
+"PO-Revision-Date: 2008-05-28 20:16+0200\n"
+"Last-Translator: Martin Bagge <martin.bagge at bthstudent.se>\n"
+"Language-Team: swedish <sv at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: boolean
+#. Description
+#: ../solr-common.templates:2001
+msgid "Remove Solr index files?"
+msgstr "Ta bort index filer för Solr?"
+
+#. Type: boolean
+#. Description
+#: ../solr-common.templates:2001
+msgid ""
+"The Solr data directory (/var/lib/solr), and the index files it contains, "
+"may be removed while purging the package."
+msgstr "Data-katalogen (/var/lib/solr), samt index-filerna som finns däri, kan raderas när paketet rensas ut."
+
+#. Type: boolean
+#. Description
+#: ../solr-common.templates:2001
+msgid ""
+"You should not choose this option if you intend to re-use Solr's index files "
+"later."
+msgstr "Du ska inte välja det här alternativet om du har tänkt använda Solrs index-filer vid ett senare tillfälle."
+
+
Deleted: tags/solr/1.2.0+ds2-6/debian/rules
===================================================================
--- branches/solr/1.2.0+ds2/debian/rules 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/rules 2009-06-23 13:49:09 UTC (rev 8573)
@@ -1,107 +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
-
-# 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 junit
-
-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
- 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 ../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 ; \
- ) | less
- #dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \
-
-upload:
- dupload -t mentors $(CHANGESFILE)
Copied: tags/solr/1.2.0+ds2-6/debian/rules (from rev 8567, branches/solr/1.2.0+ds2/debian/rules)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/rules (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/rules 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,107 @@
+#!/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-tomcat6
+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 junit
+
+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-tomcat6::
+ # Configure tomcat (also see solr-tomcat6.links)
+ install --mode 0644 debian/solr-tomcat6.xml $(TOMCAT_INSTDIR)/etc/solr/
+ install --mode 0644 debian/tomcat.policy $(TOMCAT_INSTDIR)/etc/solr/
+
+#install/solr-jetty::
+# # Configure Jetty
+# install --mode 0644 debian/jetty-web.xml $(JETTY_INSTDIR)/usr/share/solr/WEB-INF/
+
+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 ../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-tomcat6_$(DEB_VERSION)_all.deb ; \
+ ) | less
+ #dpkg --contents ../solr-jetty_$(DEB_VERSION)_all.deb ; \
+
+upload:
+ dupload -t mentors $(CHANGESFILE)
Deleted: tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.dirs
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.dirs 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.dirs 2009-06-23 13:49:09 UTC (rev 8573)
@@ -1,4 +0,0 @@
-/etc/solr
-/etc/tomcat5/policy.d
-/var/lib/solr
-/var/lib/solr/data
Deleted: tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.links
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.links 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.links 2009-06-23 13:49:09 UTC (rev 8573)
@@ -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.2.0+ds2-6/debian/solr-tomcat5.5.postinst
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postinst 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.postinst 2009-06-23 13:49:09 UTC (rev 8573)
@@ -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.2.0+ds2-6/debian/solr-tomcat5.5.postrm
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.postrm 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.postrm 2009-06-23 13:49:09 UTC (rev 8573)
@@ -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.2.0+ds2-6/debian/solr-tomcat5.5.xml
===================================================================
--- branches/solr/1.2.0+ds2/debian/solr-tomcat5.5.xml 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/solr-tomcat5.5.xml 2009-06-23 13:49:09 UTC (rev 8573)
@@ -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>
Copied: tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.dirs (from rev 8567, branches/solr/1.2.0+ds2/debian/solr-tomcat6.dirs)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.dirs (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.dirs 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,4 @@
+/etc/solr
+/etc/tomcat6/policy.d
+/var/lib/solr
+/var/lib/solr/data
Copied: tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.links (from rev 8567, branches/solr/1.2.0+ds2/debian/solr-tomcat6.links)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.links (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.links 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1 @@
+/etc/solr/solr-tomcat6.xml /etc/tomcat6/Catalina/localhost/solr.xml
Copied: tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.postinst (from rev 8568, branches/solr/1.2.0+ds2/debian/solr-tomcat6.postinst)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.postinst (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.postinst 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,43 @@
+#!/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)
+
+ # 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.2.0+ds2-6/debian/solr-tomcat6.postrm (from rev 8567, branches/solr/1.2.0+ds2/debian/solr-tomcat6.postrm)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.postrm (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.postrm 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,42 @@
+#!/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
+
+ 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.2.0+ds2-6/debian/solr-tomcat6.xml (from rev 8567, branches/solr/1.2.0+ds2/debian/solr-tomcat6.xml)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.xml (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/solr-tomcat6.xml 2009-06-23 13:49:09 UTC (rev 8573)
@@ -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>
Deleted: tags/solr/1.2.0+ds2-6/debian/tomcat.policy
===================================================================
--- branches/solr/1.2.0+ds2/debian/tomcat.policy 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/tomcat.policy 2009-06-23 13:49:09 UTC (rev 8573)
@@ -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.2.0+ds2-6/debian/tomcat.policy (from rev 8567, branches/solr/1.2.0+ds2/debian/tomcat.policy)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/tomcat.policy (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/tomcat.policy 2009-06-23 13:49:09 UTC (rev 8573)
@@ -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/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";
+};
Deleted: tags/solr/1.2.0+ds2-6/debian/watch
===================================================================
--- branches/solr/1.2.0+ds2/debian/watch 2008-10-12 15:19:56 UTC (rev 7133)
+++ tags/solr/1.2.0+ds2-6/debian/watch 2009-06-23 13:49:09 UTC (rev 8573)
@@ -1,4 +0,0 @@
-version=3
-
-opts=dversionmangle=s/\+ds\d+$// \
- http://www.apache.org/dist/lucene/solr/(?:[0-9]*\.[0-9]*)/apache-solr-(.*).tgz
Copied: tags/solr/1.2.0+ds2-6/debian/watch (from rev 7908, branches/solr/1.2.0+ds2/debian/watch)
===================================================================
--- tags/solr/1.2.0+ds2-6/debian/watch (rev 0)
+++ tags/solr/1.2.0+ds2-6/debian/watch 2009-06-23 13:49:09 UTC (rev 8573)
@@ -0,0 +1,4 @@
+version=3
+
+opts=dversionmangle=s/\+ds\d+$// \
+ http://archive.apache.org/dist/lucene/solr/(?:[\d\.]+)/apache-solr-(.*).tgz
More information about the pkg-java-commits
mailing list