[SCM] lucene-solr packaging branch, master, updated. upstream/3.6.0-16-ge08b4b5
James Page
james.page at ubuntu.com
Mon May 28 14:13:43 UTC 2012
The following commit has been merged in the master branch:
commit 468534362efa4dee0cc853f832fb147adb342cc2
Author: James Page <james.page at ubuntu.com>
Date: Mon May 28 14:21:58 2012 +0100
Fixed up broken jar links and embedded javascript
diff --git a/debian/changelog b/debian/changelog
index ef2520e..f979104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,10 @@ lucene-solr (3.6.0-1) unstable; urgency=low
* New upstream release.
* Renamed source package to support a single source package for
solr and lucene (upstream release in sync).
+ * Merged debian/* from solr source package.
* Enabled test suites.
- -- James Page <james.page at ubuntu.com> Fri, 25 May 2012 10:13:07 +0100
+ -- James Page <james.page at ubuntu.com> Mon, 28 May 2012 14:08:52 +0100
lucene3 (3.5.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2c6a2e8..7664a9d 100644
--- a/debian/control
+++ b/debian/control
@@ -88,7 +88,7 @@ Package: liblucene3-java-doc
Architecture: all
Section: doc
Suggests: liblucene3-java
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-prototype
Description: Documentation for Lucene
Lucene is a full-text search engine for the Java(TM) programming language.
Lucene is not a complete application, but rather a code library and API
@@ -138,6 +138,7 @@ Depends:
debconf (>= 1.5),
default-jre-headless | java5-runtime-headless | java6-runtime-headless,
libsolr-java (= ${binary:Version}),
+ procps,
${misc:Depends}
Recommends: solr-tomcat (= ${binary:Version}) | solr-jetty (= ${binary:Version})
Description: Enterprise search server based on Lucene3 - common files
diff --git a/debian/liblucene3-java-doc.links b/debian/liblucene3-java-doc.links
new file mode 100644
index 0000000..2fb5980
--- /dev/null
+++ b/debian/liblucene3-java-doc.links
@@ -0,0 +1 @@
+/usr/share/javascript/prototype/prototype.js /usr/share/doc/liblucene3-java-doc/docs/skin/prototype.js
diff --git a/debian/rules b/debian/rules
index e48c338..bf491ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,8 +75,9 @@ override_dh_auto_install:
dh_auto_install
override_dh_installchangelogs:
- dh_installchangelogs -pliblucene3-java lucene/CHANGES.txt
+ dh_installchangelogs -pliblucene3-java lucene/CHANGES.txt
dh_installchangelogs -plibsolr-java solr/CHANGES.txt
+ dh_installchangelogs
get-orig-source:
uscan --force-download --rename
diff --git a/debian/solr-common.links b/debian/solr-common.links
index 2a8dd8c..4277271 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -1,9 +1,9 @@
-/etc/solr/web.xml /usr/share/solr/WEB-INF/web.xml
-/etc/solr/conf /usr/share/solr/conf
-/var/lib/solr/data /usr/share/solr/data
-/var/log/solr /usr/share/solr/logs
-/usr/share/java/apache-solr-core.jar /usr/share/solr/WEB-INF/lib/apache-solr-core.jar
-/usr/share/java/apache-solr-solrj.jar /usr/share/solr/WEB-INF/lib/apache-solr-solrj.jar
+/etc/solr/web.xml /usr/share/solr/WEB-INF/web.xml
+/etc/solr/conf /usr/share/solr/conf
+/var/lib/solr/data /usr/share/solr/data
+/var/log/solr /usr/share/solr/logs
+/usr/share/java/solr-core.jar /usr/share/solr/WEB-INF/lib/solr-core.jar
+/usr/share/java/solr-solrj.jar /usr/share/solr/WEB-INF/lib/solr-solrj.jar
/usr/share/java/commons-codec.jar /usr/share/solr/WEB-INF/lib/commons-codec.jar
/usr/share/java/commons-fileupload.jar /usr/share/solr/WEB-INF/lib/commons-fileupload.jar
/usr/share/java/commons-httpclient.jar /usr/share/solr/WEB-INF/lib/commons-httpclient.jar
@@ -17,17 +17,17 @@
/usr/share/java/httpmime.jar /usr/share/solr/WEB-INF/lib/httpmime.jar
/usr/share/java/jcl-over-slf4j.jar /usr/share/solr/WEB-INF/lib/jcl-over-slf4j.jar
/usr/share/java/log4j-over-slf4j.jar /usr/share/solr/WEB-INF/lib/log4j-over-slf4j.jar
-/usr/share/java/lucene-analyzers.jar /usr/share/solr/WEB-INF/lib/lucene-analyzers.jar
-/usr/share/java/lucene-core.jar /usr/share/solr/WEB-INF/lib/lucene-core.jar
-/usr/share/java/lucene-grouping.jar /usr/share/solr/WEB-INF/lib/lucene-grouping.jar
-/usr/share/java/lucene-highlighter.jar /usr/share/solr/WEB-INF/lib/lucene-highlighter.jar
-/usr/share/java/lucene-kuromoji.jar /usr/share/solr/WEB-INF/lib/lucene-kuromoji.jar
-/usr/share/java/lucene-memory.jar /usr/share/solr/WEB-INF/lib/lucene-memory.jar
-/usr/share/java/lucene-misc.jar /usr/share/solr/WEB-INF/lib/lucene-misc.jar
-/usr/share/java/lucene-phonetic.jar /usr/share/solr/WEB-INF/lib/lucene-phonetic.jar
-/usr/share/java/lucene-queries.jar /usr/share/solr/WEB-INF/lib/lucene-queries.jar
-/usr/share/java/lucene-spatial.jar /usr/share/solr/WEB-INF/lib/lucene-spatial.jar
-/usr/share/java/lucene-spellchecker.jar /usr/share/solr/WEB-INF/lib/lucene-spellchecker.jar
+/usr/share/java/lucene3-analyzers.jar /usr/share/solr/WEB-INF/lib/lucene3-analyzers.jar
+/usr/share/java/lucene3-core.jar /usr/share/solr/WEB-INF/lib/lucene3-core.jar
+/usr/share/java/lucene3-grouping.jar /usr/share/solr/WEB-INF/lib/lucene3-grouping.jar
+/usr/share/java/lucene3-highlighter.jar /usr/share/solr/WEB-INF/lib/lucene3-highlighter.jar
+/usr/share/java/lucene3-kuromoji.jar /usr/share/solr/WEB-INF/lib/lucene3-kuromoji.jar
+/usr/share/java/lucene3-memory.jar /usr/share/solr/WEB-INF/lib/lucene3-memory.jar
+/usr/share/java/lucene3-misc.jar /usr/share/solr/WEB-INF/lib/lucene3-misc.jar
+/usr/share/java/lucene3-phonetic.jar /usr/share/solr/WEB-INF/lib/lucene3-phonetic.jar
+/usr/share/java/lucene3-queries.jar /usr/share/solr/WEB-INF/lib/lucene3-queries.jar
+/usr/share/java/lucene3-spatial.jar /usr/share/solr/WEB-INF/lib/lucene3-spatial.jar
+/usr/share/java/lucene3-spellchecker.jar /usr/share/solr/WEB-INF/lib/lucene3-spellchecker.jar
/usr/share/java/slf4j-api.jar /usr/share/solr/WEB-INF/lib/slf4j-api.jar
/usr/share/java/slf4j-jdk14.jar /usr/share/solr/WEB-INF/lib/slf4j-jdk14.jar
/usr/share/java/wstx-lgpl.jar /usr/share/solr/WEB-INF/lib/wstx-lgpl.jar
--
lucene-solr packaging
More information about the pkg-java-commits
mailing list