[pkg-java] r6915 - trunk/solr/debian
janpascal-guest at alioth.debian.org
janpascal-guest at alioth.debian.org
Tue Aug 19 15:35:31 UTC 2008
Author: janpascal-guest
Date: 2008-08-19 15:35:30 +0000 (Tue, 19 Aug 2008)
New Revision: 6915
Added:
trunk/solr/debian/README.Debian
Removed:
trunk/solr/debian/README
trunk/solr/debian/solr-common.docs
Modified:
trunk/solr/debian/changelog
trunk/solr/debian/control
trunk/solr/debian/copyright
trunk/solr/debian/rules
trunk/solr/debian/solr-common.dirs
trunk/solr/debian/solr-tomcat5.5.dirs
Log:
- 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
Deleted: trunk/solr/debian/README
===================================================================
--- trunk/solr/debian/README 2008-08-17 23:18:23 UTC (rev 6914)
+++ trunk/solr/debian/README 2008-08-19 15:35:30 UTC (rev 6915)
@@ -1,25 +0,0 @@
-README for solr
----------------
-
-Solr is an enterprise search server based on the Lucene Java library. The
-Debian packaging of Solr consists of three binary packages:
-- solr-common contains the Solr software itself and general configuration.
-- solr-tomcat5.5 installs Solr as a servlet in Tomcat 5.5. After installation,
- point your browser to http://localhost:8180/solr/admin
- to see the Solr web administration interface.
-- solr-jetty installs Solr as a servlet in Jetty. The Solr admin interface is at
- http://localhost:8280/solr/admin/
-
-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 (see bug #352093).
-
-Homepage: http://lucene.apache.org/solr/
-
-Replication
------------
-Solr's replication scripts are installed into /usr/share/solr/scripts
Copied: trunk/solr/debian/README.Debian (from rev 6191, trunk/solr/debian/README)
===================================================================
--- trunk/solr/debian/README.Debian (rev 0)
+++ trunk/solr/debian/README.Debian 2008-08-19 15:35:30 UTC (rev 6915)
@@ -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-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
Property changes on: trunk/solr/debian/README.Debian
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/solr/debian/changelog
===================================================================
--- trunk/solr/debian/changelog 2008-08-17 23:18:23 UTC (rev 6914)
+++ trunk/solr/debian/changelog 2008-08-19 15:35:30 UTC (rev 6915)
@@ -1,3 +1,17 @@
+solr (1.2.0+ds1-4) UNRELEASED; 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
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Tue, 19 Aug 2008 17:35:00 +0200
+
solr (1.2.0+ds1-3) unstable; urgency=low
* Updated control file for new Vcs-* and Homepage fields
Modified: trunk/solr/debian/control
===================================================================
--- trunk/solr/debian/control 2008-08-17 23:18:23 UTC (rev 6914)
+++ trunk/solr/debian/control 2008-08-19 15:35:30 UTC (rev 6915)
@@ -1,5 +1,5 @@
Source: solr
-Section: contrib/web
+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>
@@ -7,22 +7,22 @@
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,
- sun-java5-jdk (>= 1.5.0),
+ openjdk-6-jdk (>= 6b11-5),
ant (>= 1.7.0), ant-optional (>= 1.7.0),
- junit (>= 3.8.1.1), libeasymock-java (>= 2.3),
+ 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),
+ liblucene2-java (>= 2.3.2),
libxpp3-java (>= 1.1.3.4.0)
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Package: solr-common
Architecture: all
Depends: debconf (>= 1.5),
- sun-java5-jre (>= 1.5.0) | sun-java6-jre (>= 6),
+ openjdk-6-jre (>= 6b11-5) | java5-runtime,
libcommons-codec-java (>= 1.3),
libcommons-csv-java (>= 0.1-SNAPSHOT+svn558885),
libcommons-fileupload-java (>= 1.2),
Modified: trunk/solr/debian/copyright
===================================================================
--- trunk/solr/debian/copyright 2008-08-17 23:18:23 UTC (rev 6914)
+++ trunk/solr/debian/copyright 2008-08-19 15:35:30 UTC (rev 6915)
@@ -9,215 +9,14 @@
to download the source tarball from Apache and repack it into the Debian source.
Apache Solr is
- Copyright 2007 The Apache Software Foundation
+ Copyright 2007,2008 The Apache Software Foundation
Authors: Doug Cutting <cutting at apache.org>, Erik Hatcher
<ehatcher at apacher.org>, Otis Gospodnetic <otis at apache.org> et.al.
The Debian packaging is
- Copyright 2007 by Jan-Pascal van Best <janpascal at vanbest.org>
+ Copyright 2007,2008 by Jan-Pascal van Best <janpascal at vanbest.org>
-Both the original software and the Debian packaging are subject to the following
-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.
+Both the original software and the Debian packaging are licensed under the
+Apache License, version 2.0. On Debian systems, the complete text of the Apache
+License, version 2.0, can be found in `/usr/share/common-licenses/Apache-2.0'.
Modified: trunk/solr/debian/rules
===================================================================
--- trunk/solr/debian/rules 2008-08-17 23:18:23 UTC (rev 6914)
+++ trunk/solr/debian/rules 2008-08-19 15:35:30 UTC (rev 6915)
@@ -20,10 +20,8 @@
JETTY_INSTDIR=$(CURDIR)/debian/solr-jetty
SHAREDIR=$(COMMON_INSTDIR)/usr/share/solr
-# We should like to build with gcj, but solr fails the unit
-# tests with gcj. Use Sun's java 1.5.0 instead.
-#JAVA_HOME = /usr/lib/jvm/java-gcj
-JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun
+# Build with OpenJDK
+JAVA_HOME = /usr/lib/jvm/java-6-openjdk
JAR = $(JAVA_HOME)/bin/jar
# Set ant parameters
@@ -33,6 +31,8 @@
DEB_INSTALL_CHANGELOGS_solr-common := CHANGES.txt
+DEB_COMPRESS_EXCLUDE = .xsl .js .xslt
+
cleanbuilddir:: build.xml
build.xml:
debian/rules restore-from-source
@@ -57,6 +57,15 @@
# 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)
Modified: trunk/solr/debian/solr-common.dirs
===================================================================
--- trunk/solr/debian/solr-common.dirs 2008-08-17 23:18:23 UTC (rev 6914)
+++ trunk/solr/debian/solr-common.dirs 2008-08-19 15:35:30 UTC (rev 6915)
@@ -2,5 +2,7 @@
/etc/solr/conf
/usr/share/solr
/usr/share/solr/scripts
+/usr/share/doc/solr-common
+/usr/share/doc/solr-common/docs
/var/lib/solr
/var/lib/solr/data
Deleted: trunk/solr/debian/solr-common.docs
===================================================================
--- trunk/solr/debian/solr-common.docs 2008-08-17 23:18:23 UTC (rev 6914)
+++ trunk/solr/debian/solr-common.docs 2008-08-19 15:35:30 UTC (rev 6915)
@@ -1,5 +0,0 @@
-KEYS.txt
-NOTICE.txt
-README.txt
-docs/
-build/docs
Modified: trunk/solr/debian/solr-tomcat5.5.dirs
===================================================================
--- trunk/solr/debian/solr-tomcat5.5.dirs 2008-08-17 23:18:23 UTC (rev 6914)
+++ trunk/solr/debian/solr-tomcat5.5.dirs 2008-08-19 15:35:30 UTC (rev 6915)
@@ -1,6 +1,4 @@
/etc/solr
/etc/tomcat5/policy.d
-/usr/share/tomcat5.5/conf/Catalina/localhost
/var/lib/solr
/var/lib/solr/data
-
More information about the pkg-java-commits
mailing list