[pkg-java] r8748 - trunk/solr/debian/patches
Jan-Pascal van Best
janpascal-guest at alioth.debian.org
Thu Jul 2 06:53:10 UTC 2009
Author: janpascal-guest
Date: 2009-07-02 06:53:06 +0000 (Thu, 02 Jul 2009)
New Revision: 8748
Added:
trunk/solr/debian/patches/24_fix-syntax-error-in-shell-script.dpatch
Removed:
trunk/solr/debian/patches/02_fix-solr-version.dpatch
trunk/solr/debian/patches/06_use-debian-java-libraries-but-include-them-in-lib.dpatch
Modified:
trunk/solr/debian/patches/00list
trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
Log:
Remove unused patches; fix Lintian error about syntax error in shell scripts; re-add disabling of a test that needs network access
Modified: trunk/solr/debian/patches/00list
===================================================================
--- trunk/solr/debian/patches/00list 2009-07-02 00:23:49 UTC (rev 8747)
+++ trunk/solr/debian/patches/00list 2009-07-02 06:53:06 UTC (rev 8748)
@@ -7,3 +7,4 @@
16_fix-failed-SolrInfoMBeanTest.dpatch
20_remove-dependency-on-javanet-staxutils-SOLR-851.dpatch
22_fix-compile-error-with-ambiguous-assert.dpatch
+24_fix-syntax-error-in-shell-script.dpatch
Deleted: trunk/solr/debian/patches/02_fix-solr-version.dpatch
===================================================================
--- trunk/solr/debian/patches/02_fix-solr-version.dpatch 2009-07-02 00:23:49 UTC (rev 8747)
+++ trunk/solr/debian/patches/02_fix-solr-version.dpatch 2009-07-02 06:53:06 UTC (rev 8748)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_fix-solr-version.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The upstream source tarball contains a -dev version number in the
-## DP: build.xml file. Fix that.
-
- at DPATCH@
-diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2006-12-17 23:08:58.000000000 +0100
-+++ trunk/build.xml 2007-05-31 11:35:45.000000000 +0200
-@@ -42,7 +42,7 @@
- By default, this should be set to "X.Y.N-dev" where X.Y.N is
- "1 greater" then the last version released (on this branch).
- -->
-- <property name="version" value="1.2.1-dev" />
-+ <property name="version" value="1.2.0" />
-
- <!-- Solr Specification Version -->
- <!--
Deleted: 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 2009-07-02 00:23:49 UTC (rev 8747)
+++ trunk/solr/debian/patches/06_use-debian-java-libraries-but-include-them-in-lib.dpatch 2009-07-02 06:53:06 UTC (rev 8748)
@@ -1,48 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_use-debian-java-libraries.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link to libraries under /usr/share/java instead of those
-## DP: included with upstream tarball. Do not include the libraries
-## DP: into the war file.
-
- at DPATCH@
-diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2007-06-01 16:05:00.000000000 +0200
-+++ trunk/build.xml 2007-06-01 16:05:55.000000000 +0200
-@@ -59,7 +59,7 @@
- <property name="incubation-suffix" value="-incubating" />
-
- <!-- 3rd party libraries for compilation -->
-- <property name="lib" value="lib" />
-+ <property name="lib" value="/usr/share/java" />
-
- <!-- solr source files -->
- <property name="src" value="src" />
-@@ -154,7 +154,11 @@
- <!-- The compilation classpath -->
- <path id="compile.classpath">
- <fileset dir="${lib}">
-- <include name="*.jar" />
-+ <include name="servlet-api.jar" />
-+ <include name="lucene-core.jar" />
-+ <include name="lucene-highlighter.jar" />
-+ <include name="lucene-snowball.jar" />
-+ <include name="xpp3.jar" />
- </fileset>
- </path>
-
-@@ -360,9 +364,12 @@
- webxml="${src}/webapp/WEB-INF/web.xml"
- filesetmanifest="skip"
- manifest="${dest}/META-INF/MANIFEST.MF">
- <lib dir="${lib}">
-- <exclude name="servlet-api*.jar" />
-+ <include name="lucene-core.jar" />
-+ <include name="lucene-highlighter.jar" />
-+ <include name="lucene-snowball.jar" />
-+ <include name="xpp3.jar" />
- </lib>
- <lib dir="${dist}">
- <include name="${fullnamever}.jar" />
- </lib>
Modified: trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch
===================================================================
--- trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch 2009-07-02 00:23:49 UTC (rev 8747)
+++ trunk/solr/debian/patches/08_disable-tests-that-need-network-access.dpatch 2009-07-02 06:53:06 UTC (rev 8748)
@@ -27,3 +27,21 @@
public void testUrlParamParsing()
{
String[][] teststr = new String[][] {
+diff -urNad 1.2.0+ds2~/src/test/org/apache/solr/common/util/ContentStreamTest.java 1.2.0+ds2/src/test/org/apache/solr/common/util/ContentStreamTest.java
+--- 1.2.0+ds2~/src/test/org/apache/solr/common/util/ContentStreamTest.java 2007-05-30 17:51:03.000000000 +0200
++++ 1.2.0+ds2/src/test/org/apache/solr/common/util/ContentStreamTest.java 2009-06-24 13:55:59.000000000 +0200
+@@ -56,7 +56,7 @@
+ assertTrue( IOUtils.contentEquals( new FileReader( file ), stream.getReader() ) );
+ }
+
+-
++/* Disabled for Debian build because this test needs network access
+ public void testURLStream() throws IOException
+ {
+ String content = null;
+@@ -88,4 +88,5 @@
+ stream = new ContentStreamBase.URLStream( url );
+ assertTrue( IOUtils.contentEquals( new StringReader( content ), stream.getReader() ) );
+ }
++*/
+ }
Added: trunk/solr/debian/patches/24_fix-syntax-error-in-shell-script.dpatch
===================================================================
--- trunk/solr/debian/patches/24_fix-syntax-error-in-shell-script.dpatch (rev 0)
+++ trunk/solr/debian/patches/24_fix-syntax-error-in-shell-script.dpatch 2009-07-02 06:53:06 UTC (rev 8748)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 24_fix-syntax-error-in-shell-script.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad solr~/example/solr/bin/abo solr/example/solr/bin/abo
+--- solr~/example/solr/bin/abo 2008-08-29 15:36:35.000000000 +0200
++++ solr/example/solr/bin/abo 2009-07-02 08:50:58.000000000 +0200
+@@ -175,7 +175,7 @@
+
+ # make a backup using hard links into temporary location
+ # then move it into place atomically
+-if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD"]]
++if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+ then
+ orig_dir=$(pwd)
+ mkdir ${data_dir}/${temp}
+diff -urNad solr~/src/scripts/abo solr/src/scripts/abo
+--- solr~/src/scripts/abo 2008-08-27 15:05:07.000000000 +0200
++++ solr/src/scripts/abo 2009-07-02 08:50:48.000000000 +0200
+@@ -175,7 +175,7 @@
+
+ # make a backup using hard links into temporary location
+ # then move it into place atomically
+-if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD"]]
++if [[ "${OS}" == "SunOS" || "${OS}" == "Darwin" || "${OS}" == "FreeBSD" ]]
+ then
+ orig_dir=$(pwd)
+ mkdir ${data_dir}/${temp}
Property changes on: trunk/solr/debian/patches/24_fix-syntax-error-in-shell-script.dpatch
___________________________________________________________________
Added: svn:executable
+ *
More information about the pkg-java-commits
mailing list