[lucene2] 44/104: Removed three empty directories from the -doc package; Disabled one of the contrib/highlighter tests since it needs network access; Removed the gdata patch completely, since gdata is removed from lucene
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Mar 23 16:27:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository lucene2.
commit ad9dd929ed6255b225ea68280bab789300df7ebe
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date: Fri Feb 1 13:19:40 2008 +0000
Removed three empty directories from the -doc package; Disabled one of the contrib/highlighter tests since it needs network access; Removed the gdata patch completely, since gdata is removed from lucene
---
debian/changelog | 4 +-
debian/patches/00list | 3 +-
debian/patches/81_prevent-network-access.dpatch | 29 +++++++++
debian/patches/old/20_remove-gdata-server.dpatch | 78 ------------------------
debian/rules | 5 ++
5 files changed, 37 insertions(+), 82 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4eff0bd..22cc537 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lucene2 (2.3.0+ds1-1) UNRELEASED; urgency=low
+lucene2 (2.3.0+ds1-1) unstable; urgency=low
[ Varun Hiremath ]
* New upstream release
@@ -27,7 +27,7 @@ lucene2 (2.3.0+ds1-1) UNRELEASED; urgency=low
* Prevent the test run to download anything, which would not work for
autobuilders
- -- Jan-Pascal van Best <janpascal at vanbest.org> Fri, 01 Feb 2008 10:42:29 +0100
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Fri, 01 Feb 2008 14:18:11 +0100
lucene2 (2.2.0-2) unstable; urgency=low
diff --git a/debian/patches/00list b/debian/patches/00list
index 1c979cb..db62a9b 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,5 +8,4 @@
61_lucli-script.dpatch
70_fix-contrib-regex-libs.dpatch
80_prevent-downloading-data-files.dpatch
-#80_fix-javadocs-classpath.dpatch
-#81_fix-javadocs-links.dpatch
+81_prevent-network-access.dpatch
diff --git a/debian/patches/81_prevent-network-access.dpatch b/debian/patches/81_prevent-network-access.dpatch
new file mode 100755
index 0000000..8b231b7
--- /dev/null
+++ b/debian/patches/81_prevent-network-access.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 81_prevent-network-access.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable one of the tests in contrib/highlighter. It seems the XML parser
+## DP: resolves the DTD or xmlns address, causing network access which can cause
+## DP: trouble when running automated builds.
+
+ at DPATCH@
+diff -urNad lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
+--- lucene2~/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java 2008-01-21 02:29:36.000000000 +0100
++++ lucene2/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java 2008-02-01 14:15:45.000000000 +0100
+@@ -449,6 +449,8 @@
+ * Demonstrates creation of an XHTML compliant doc using new encoding facilities.
+ * @throws Exception
+ */
++
++ /* Disabled for Debian packaging, causes network access during builds
+ public void testEncoding() throws Exception
+ {
+ String rawDocContent = "\"Smith & sons' prices < 3 and >4\" claims article";
+@@ -499,6 +501,7 @@
+ String decodedSnippet=h2.getFirstChild().getNodeValue();
+ assertEquals("XHTML Encoding should have worked:", rawDocContent,decodedSnippet);
+ }
++ */
+
+ public void testMultiSearcher() throws Exception
+ {
diff --git a/debian/patches/old/20_remove-gdata-server.dpatch b/debian/patches/old/20_remove-gdata-server.dpatch
deleted file mode 100755
index 44d867f..0000000
--- a/debian/patches/old/20_remove-gdata-server.dpatch
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_remove-gdata-server.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 trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2007-06-05 13:18:25.000000000 +0200
-+++ trunk/build.xml 2007-06-05 13:19:51.000000000 +0200
-@@ -28,6 +28,7 @@
- <!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk -->
- <fileset dir="contrib">
- <include name="**/*.jar"/>
-+ <exclude name="gdata-server/**/*.jar"/>
- </fileset>
- </path>
-
-@@ -51,10 +52,11 @@
-
- <patternset id="src.dist.patterns"
- includes="src/,build.xml,*build*.xml,docs/,*.txt,contrib/,"
-- excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/"
-+ excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/gdata-server/"
- />
- <patternset id="binary.build.dist.patterns"
- includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar"
-+ excludes="contrib/gdata-server/*.jar"
- />
- <patternset id="binary.root.dist.patterns"
- includes="src/demo/,src/jsp/,docs/,*.txt"
-@@ -370,6 +372,7 @@
- <subant target="@{target}" failonerror="@{failonerror}">
- <fileset dir="."
- includes="contrib/*/build.xml"
-+ excludes="contrib/gdata-server/build.xml"
- />
- </subant>
- </sequential>
-@@ -399,7 +402,7 @@
- <attribute name="access"/>
- <attribute name="destdir"/>
- <sequential>
--
-+ <!-- debian-ignore
- <dirset dir="contrib/gdata-server/src/core/src/java" id="gdata-server-core">
- <include name="**" if="build-1-5-contrib" />
- </dirset>
-@@ -409,6 +412,7 @@
- <dirset dir="contrib/gdata-server/src/hivemind/src/java" id="gdata-server-hivemind">
- <include name="**" if="build-1-5-contrib" />
- </dirset>
-+ -->
-
- <javadoc
- overview="src/java/overview.html"
-@@ -459,9 +463,11 @@
- <packageset dir="contrib/wordnet/src/java"/>
- <packageset dir="contrib/xml-query-parser/src/java"/>
- <!-- end alpha sort -->
-+ <!-- debian-ignore
- <packageset refid="gdata-server-core" />
- <packageset refid="gdata-server-gom" />
- <packageset refid="gdata-server-hivemind" />
-+ -->
-
- <!-- If the main javadoc Group listing includes an "Other -->
- <!-- Packages" group after the ones listed here, then those -->
-@@ -476,7 +482,9 @@
- <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
- <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
- <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
-+ <!-- debian-ignore
- <group title="contrib: GData Server (Java1.5)" packages="org.apache.lucene.gdata.*"/>
-+ -->
- <group title="contrib: Lucli" packages="lucli*"/>
- <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
- <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
diff --git a/debian/rules b/debian/rules
index b129ed2..8662a62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ DEB_INSTALL_CHANGELOGS_liblucene2-java := CHANGES.txt
# Build with Sun JDK 1.5
JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun
+# JAVA_HOME := /usr/lib/jvm/java-gcj
DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo javadocs
DEB_ANT_CHECK_TARGET := test
@@ -66,6 +67,10 @@ install/liblucene2-java-doc::
mkdir -p $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/
cp -r docs $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/
cp -r build/docs/* $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/
+ # Remove empty directories
+ rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/skin/css
+ rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/skin/scripts
+ rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/skin/translations
install -d $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo
install -m 644 build/lucene-demos-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo/
install -m 644 build/luceneweb.war $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git
More information about the pkg-java-commits
mailing list