[lucene-solr] 04/11: wrap-and-sort -sa.
Markus Koschany
apo at moszumanska.debian.org
Sun Jan 14 14:29:29 UTC 2018
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository lucene-solr.
commit 1e59be688a63e03b68b0bcc886f3af6ff5ab6695
Author: Markus Koschany <apo at debian.org>
Date: Sat Jan 13 21:28:48 2018 +0100
wrap-and-sort -sa.
---
debian/control | 57 ++++++++++++++++++++++++++++++++--------------
debian/libsolr-java.docs | 2 +-
debian/solr-common.docs | 2 +-
debian/solr-common.install | 2 +-
debian/solr-common.links | 20 ++++++++--------
5 files changed, 53 insertions(+), 30 deletions(-)
diff --git a/debian/control b/debian/control
index 9ecee20..60d1299 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: lucene-solr
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Mat Scales <mat at wibbly.org.uk>, James Page <james.page at ubuntu.com>,
+Uploaders:
+ Mat Scales <mat at wibbly.org.uk>,
+ James Page <james.page at ubuntu.com>,
Jakub Adam <jakub.adam at ktknet.cz>
Build-Depends:
ant,
@@ -30,8 +32,8 @@ Build-Depends:
libhttpclient-java (>= 4.1.1),
libhttpmime-java,
libicu4j-4.4-java,
- libjetty9-java,
libjetty9-extra-java,
+ libjetty9-java,
libjmock-java,
liblog4j1.2-java,
libregexp-java,
@@ -51,9 +53,14 @@ Homepage: http://lucene.apache.org
Package: liblucene3-java
Architecture: all
-Depends: ${misc:Depends}
-Suggests: ant, ant-optional, junit4
-Recommends: liblucene3-contrib-java
+Depends:
+ ${misc:Depends}
+Suggests:
+ ant,
+ ant-optional,
+ junit4
+Recommends:
+ liblucene3-contrib-java
Description: Full-text search engine library for Java - core library
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
@@ -63,8 +70,11 @@ Description: Full-text search engine library for Java - core library
Package: liblucene3-contrib-java
Architecture: all
-Depends: liblucene3-java, ${misc:Depends}
-Suggests: liblucene3-java-doc
+Depends:
+ liblucene3-java,
+ ${misc:Depends}
+Suggests:
+ liblucene3-java-doc
Recommends:
libavalon-framework-java,
libcommons-beanutils-java,
@@ -90,8 +100,10 @@ Description: Full-text search engine library for Java - additional libraries
Package: liblucene3-java-doc
Architecture: all
Section: doc
-Suggests: liblucene3-java
-Depends: ${misc:Depends}
+Suggests:
+ liblucene3-java
+Depends:
+ ${misc:Depends}
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
@@ -117,8 +129,10 @@ Depends:
libslf4j-java (>= 1.6.1),
libwoodstox-java,
${misc:Depends}
-Breaks: solr-common (<< 3.6.0-1)
-Replaces: solr-common (<< 3.6.0-1)
+Breaks:
+ solr-common (<< 3.6.0-1)
+Replaces:
+ solr-common (<< 3.6.0-1)
Suggests:
junit4,
libeasymock-java,
@@ -144,8 +158,10 @@ Depends:
libsolr-java (= ${binary:Version}),
procps,
${misc:Depends}
-Recommends: solr-tomcat (= ${binary:Version}) | solr-jetty (= ${binary:Version})
-Suggests: libmysql-java
+Recommends:
+ solr-tomcat (= ${binary:Version}) | solr-jetty (= ${binary:Version})
+Suggests:
+ libmysql-java
Description: Enterprise search server based on Lucene3 - common files
Solr is an open source enterprise search server based on the Lucene
Java search library, with XML/HTTP and JSON APIs, hit highlighting,
@@ -163,8 +179,13 @@ Description: Enterprise search server based on Lucene3 - common files
Package: solr-tomcat
Architecture: all
-Depends: solr-common (= ${binary:Version}), tomcat8 | tomcat8-user, ${misc:Depends}
-Conflicts: solr-jetty, solr-tomcat6
+Depends:
+ solr-common (= ${binary:Version}),
+ tomcat8 | tomcat8-user,
+ ${misc:Depends}
+Conflicts:
+ solr-jetty,
+ solr-tomcat6
Description: Enterprise search server based on Lucene3 - Tomcat integration
Solr is an open source enterprise search server based on the Lucene
Java search library, with XML/HTTP and JSON APIs, hit highlighting,
@@ -176,12 +197,14 @@ Description: Enterprise search server based on Lucene3 - Tomcat integration
Package: solr-jetty
Architecture: all
Depends:
+ default-jdk | java5-sdk,
jetty9,
libjetty9-extra-java,
solr-common (= ${binary:Version}),
- default-jdk | java5-sdk,
${misc:Depends}
-Conflicts: solr-tomcat, solr-tomcat6
+Conflicts:
+ solr-tomcat,
+ solr-tomcat6
Description: Enterprise search server based on Lucene3 - Jetty integration
Solr is an open source enterprise search server based on the Lucene
Java search library, with XML/HTTP and JSON APIs, hit highlighting,
diff --git a/debian/libsolr-java.docs b/debian/libsolr-java.docs
index 7536e84..467d288 100644
--- a/debian/libsolr-java.docs
+++ b/debian/libsolr-java.docs
@@ -1,2 +1,2 @@
-solr/README.txt
solr/NOTICE.txt
+solr/README.txt
diff --git a/debian/solr-common.docs b/debian/solr-common.docs
index 7536e84..467d288 100644
--- a/debian/solr-common.docs
+++ b/debian/solr-common.docs
@@ -1,2 +1,2 @@
-solr/README.txt
solr/NOTICE.txt
+solr/README.txt
diff --git a/debian/solr-common.install b/debian/solr-common.install
index 605e1b5..767d54d 100644
--- a/debian/solr-common.install
+++ b/debian/solr-common.install
@@ -1,7 +1,7 @@
+debian/conf/* /etc/solr/conf
solr/build/web/* /usr/share/solr/web
solr/example/solr/conf /etc/solr
solr/example/solr/solr.xml /etc/solr
-debian/conf/* /etc/solr/conf
solr/scripts/* /usr/share/solr/bin
solr/webapp/web/* /usr/share/solr/web
solr/webapp/web/WEB-INF/web.xml /etc/solr/
diff --git a/debian/solr-common.links b/debian/solr-common.links
index 9bce3ef..1d4116b 100644
--- a/debian/solr-common.links
+++ b/debian/solr-common.links
@@ -1,13 +1,6 @@
-/etc/solr/web.xml /usr/share/solr/web/WEB-INF/web.xml
/etc/solr/conf /usr/share/solr/conf
/etc/solr/solr.xml /usr/share/solr/solr.xml
-/var/lib/solr/data /usr/share/solr/data
-/var/log/solr /usr/share/solr/logs
-/usr/share/solr/bin /usr/share/solr/scripts
-/usr/share/javascript/jquery/jquery.min.js /usr/share/solr/web/admin/jquery-1.4.3.min.js
-/usr/share/java/solr-core.jar /usr/share/solr/web/WEB-INF/lib/solr-core.jar
-/usr/share/java/solr-solrj.jar /usr/share/solr/web/WEB-INF/lib/solr-solrj.jar
-/usr/share/java/solr-dataimporthandler.jar /usr/share/solr/web/WEB-INF/lib/solr-dataimporthandler.jar
+/etc/solr/web.xml /usr/share/solr/web/WEB-INF/web.xml
/usr/share/java/commons-codec.jar /usr/share/solr/web/WEB-INF/lib/commons-codec.jar
/usr/share/java/commons-fileupload.jar /usr/share/solr/web/WEB-INF/lib/commons-fileupload.jar
/usr/share/java/commons-httpclient.jar /usr/share/solr/web/WEB-INF/lib/commons-httpclient.jar
@@ -15,8 +8,8 @@
/usr/share/java/commons-lang.jar /usr/share/solr/web/WEB-INF/lib/commons-lang.jar
/usr/share/java/commons-logging.jar /usr/share/solr/web/WEB-INF/lib/commons-logging.jar
/usr/share/java/guava.jar /usr/share/solr/web/WEB-INF/lib/guava.jar
-/usr/share/java/httpcore.jar /usr/share/solr/web/WEB-INF/lib/httpcore.jar
/usr/share/java/httpclient.jar /usr/share/solr/web/WEB-INF/lib/httpclient.jar
+/usr/share/java/httpcore.jar /usr/share/solr/web/WEB-INF/lib/httpcore.jar
/usr/share/java/httpmime.jar /usr/share/solr/web/WEB-INF/lib/httpmime.jar
/usr/share/java/jcl-over-slf4j.jar /usr/share/solr/web/WEB-INF/lib/jcl-over-slf4j.jar
/usr/share/java/log4j-over-slf4j.jar /usr/share/solr/web/WEB-INF/lib/log4j-over-slf4j.jar
@@ -33,5 +26,12 @@
/usr/share/java/lucene3-spellchecker.jar /usr/share/solr/web/WEB-INF/lib/lucene3-spellchecker.jar
/usr/share/java/slf4j-api.jar /usr/share/solr/web/WEB-INF/lib/slf4j-api.jar
/usr/share/java/slf4j-jdk14.jar /usr/share/solr/web/WEB-INF/lib/slf4j-jdk14.jar
-/usr/share/java/wstx-lgpl.jar /usr/share/solr/web/WEB-INF/lib/wstx-lgpl.jar
+/usr/share/java/solr-core.jar /usr/share/solr/web/WEB-INF/lib/solr-core.jar
+/usr/share/java/solr-dataimporthandler.jar /usr/share/solr/web/WEB-INF/lib/solr-dataimporthandler.jar
+/usr/share/java/solr-solrj.jar /usr/share/solr/web/WEB-INF/lib/solr-solrj.jar
/usr/share/java/stax2-api.jar /usr/share/solr/web/WEB-INF/lib/stax2-api.jar
+/usr/share/java/wstx-lgpl.jar /usr/share/solr/web/WEB-INF/lib/wstx-lgpl.jar
+/usr/share/javascript/jquery/jquery.min.js /usr/share/solr/web/admin/jquery-1.4.3.min.js
+/usr/share/solr/bin /usr/share/solr/scripts
+/var/lib/solr/data /usr/share/solr/data
+/var/log/solr /usr/share/solr/logs
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene-solr.git
More information about the pkg-java-commits
mailing list