Author: janpascal-guest Date: 2009-07-01 20:55:42 +0000 (Wed, 01 Jul 2009) New Revision: 8718
Modified: trunk/solr/debian/README.Debian trunk/solr/debian/changelog trunk/solr/debian/compat trunk/solr/debian/control trunk/solr/debian/copyright trunk/solr/debian/tomcat.policy trunk/solr/debian/watch Log: Move to section Java; depend on debhelper >=5; bumpstandards-version to 3.8.2; backup watch, README.Debian, compat, tomcat.policy from 1.2.0+ds2 branch; fix Tomcat policy for solr 1.3.0; update changelog, mark fixes bugs; update and fix typo in copyright Modified: trunk/solr/debian/README.Debian =================================================================== --- trunk/solr/debian/README.Debian 2009-07-01 20:49:38 UTC (rev 8717) +++ trunk/solr/debian/README.Debian 2009-07-01 20:55:42 UTC (rev 8718) @@ -4,21 +4,10 @@ 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 +- solr-tomcat6 installs Solr as a servlet in Tomcat 6. After installation, + point your browser to http://localhost:8080/solr/admin to see the Solr web administration interface. -- solr-jetty installs Solr as a servlet in Jetty. After installation, - point your browser to http://localhost:8280/solr/admin - to see the Solr web administration interface. -Solr-tomcat5.5 and solr-jetty use the same index files. If you remove solr-tomcat5.5 -and install solr-jetty, you keep the indexes. This implies that solr-tomcat5.5 and -solr-jetty cannot be installed at the same time. - -Jetty is broken as of version 5.1.14-1: you need to add the line - $(tomcat.lib.home)/jasper-compiler-jdt.jar ! available org.eclipse.jdt.core.JDTCompilerAdapter -near the end of your /etc/jetty/start.config - Homepage: http://lucene.apache.org/solr/ Replication Modified: trunk/solr/debian/changelog =================================================================== --- trunk/solr/debian/changelog 2009-07-01 20:49:38 UTC (rev 8717) +++ trunk/solr/debian/changelog 2009-07-01 20:55:42 UTC (rev 8718) @@ -1,12 +1,16 @@ solr (1.3.0+ds1-1) UNRELEASED; urgency=low - * New upstream release (1.3.0). + * New upstream release (1.3.0). Closes: #521009. * Added workaround of bug #452586 in Jetty to debian/README.Debian. Note that solr-jetty is still disabled because Jetty has been removed from Lenny. * Removed dependency on javanet staxutils (see upstream issue SOLR-851). + * Disable unit tests that need network access. Closes: #534031. + * Change Section: to java. + * Fix Tomcat policy for Solr 1.3.0. + * Bump Standards-Version to 3.8.2 (no changes needed). - -- Jan-Pascal van Best <[email protected]> Wed, 01 Jul 2009 20:54:28 +0200 + -- Jan-Pascal van Best <[email protected]> Wed, 01 Jul 2009 22:47:44 +0200 solr (1.2.0+ds2-6) unstable; urgency=low Modified: trunk/solr/debian/compat =================================================================== --- trunk/solr/debian/compat 2009-07-01 20:49:38 UTC (rev 8717) +++ trunk/solr/debian/compat 2009-07-01 20:55:42 UTC (rev 8718) @@ -1 +1 @@ -4 +5 Modified: trunk/solr/debian/control =================================================================== --- trunk/solr/debian/control 2009-07-01 20:49:38 UTC (rev 8717) +++ trunk/solr/debian/control 2009-07-01 20:55:42 UTC (rev 8718) @@ -1,5 +1,5 @@ Source: solr -Section: web +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Jan-Pascal van Best <[email protected]> @@ -7,7 +7,7 @@ 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, +Build-Depends: cdbs, debhelper (>= 5.0.0), dpatch (>= 2.0), po-debconf, openjdk-6-jdk (>= 6b11-5), ant (>= 1.7.0), ant-optional (>= 1.7.0), junit4 (>= 4.6), libeasymock-java (>= 2.4), @@ -21,7 +21,7 @@ libtomcat6-java (>= 6.0.20), libservlet2.5-java (>= 6.0.20), libjetty-java (>= 6.1.18) -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 Package: solr-common Architecture: all Modified: trunk/solr/debian/copyright =================================================================== --- trunk/solr/debian/copyright 2009-07-01 20:49:38 UTC (rev 8717) +++ trunk/solr/debian/copyright 2009-07-01 20:55:42 UTC (rev 8718) @@ -3,19 +3,22 @@ It was downloaded from http://www.apache.org/dist/lucene/solr/1.2/apache-solr-1.2.tgz -and then superflous library .jars and generated .jars, .war and Javadoc +and then superfluous library .jars and generated .jars, .war and Javadoc was removed to generate the .orig.tar.gz file. Run debian/rules get-orig-source to download the source tarball from Apache and repack it into the Debian source. Apache Solr is - Copyright 2007,2008 The Apache Software Foundation + Copyright 2007,2008,2009 The Apache Software Foundation -Authors: Doug Cutting <[email protected]>, Erik Hatcher - <[email protected]>, Otis Gospodnetic <[email protected]> et.al. +Authors: + Doug Cutting <[email protected]> + Erik Hatcher <[email protected]> + Otis Gospodnetic <[email protected]> + et.al. The Debian packaging is - Copyright 2007,2008 by Jan-Pascal van Best <[email protected]> + Copyright 2007,2008,2009 by Jan-Pascal van Best <[email protected]> Both the original software and the Debian packaging are licensed under the Apache License, version 2.0. On Debian systems, the complete text of the Apache Modified: trunk/solr/debian/tomcat.policy =================================================================== --- trunk/solr/debian/tomcat.policy 2009-07-01 20:49:38 UTC (rev 8717) +++ trunk/solr/debian/tomcat.policy 2009-07-01 20:55:42 UTC (rev 8718) @@ -7,12 +7,15 @@ 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 "/var/log/tomcat6/-", "read,write"; + permission java.io.FilePermission "/var/lib/tomcat6/webapps/solr/-", "read"; + permission java.io.FilePermission "/var/lib/tomcat6/temp/-", "read,write"; permission java.io.FilePermission "/etc/solr/-", "read"; permission java.io.FilePermission "/usr/share/solr/-", "read"; permission java.io.FilePermission "/usr/share/solr", "read"; permission java.io.FilePermission "/var/lib/solr", "read,write,delete"; permission java.io.FilePermission "/var/lib/solr/-", "read,write,delete"; + permission javax.management.MBeanServerPermission "findMBeanServer"; + permission javax.management.MBeanPermission "org.apache.solr.core.*", "*"; + permission javax.management.MBeanTrustPermission "register"; }; Modified: trunk/solr/debian/watch =================================================================== --- trunk/solr/debian/watch 2009-07-01 20:49:38 UTC (rev 8717) +++ trunk/solr/debian/watch 2009-07-01 20:55:42 UTC (rev 8718) @@ -1,4 +1,4 @@ version=3 opts=dversionmangle=s/\+ds\d+$// \ - http://www.apache.org/dist/lucene/solr/(?:[0-9\.]*)/apache-solr-(.*).tgz + http://archive.apache.org/dist/lucene/solr/(?:[\d\.]+)/apache-solr-(.*).tgz _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
