Merge branch 'master' into ha (v0.12)

[lui-solr.git] / debian / control

diff --git a/debian/control b/debian/control
index 7cdfcc4..fb41250 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Homepage: http://www.indexdata.com/masterkey
 
 Package: masterkey-lui-solr5
 Architecture: all
-Depends: openjdk-7-jdk, ${misc:Depends}
+Depends: openjdk-7-jdk | openjdk-8-jdk, ${misc:Depends}
 Conflicts: masterkey-lui-solr4-common, masterkey-lui-solr4-master, masterkey-lui-solr4-slave, masterkey-lui-solr4-zookeeper, masterkey-lui-solr4-common-tomcat6, masterkey-lui-solr4-master-tomcat6, masterkey-lui-solr4-slave-tomcat6, masterkey-lui-solr4-common-tomcat8, masterkey-lui-solr4-master-tomcat8, masterkey-lui-solr4-slave-tomcat8
 Replaces: masterkey-lui-solr4-common, masterkey-lui-solr4-master, masterkey-lui-solr4-slave, masterkey-lui-solr4-zookeeper, masterkey-lui-solr4-common-tomcat6, masterkey-lui-solr4-master-tomcat6, masterkey-lui-solr4-slave-tomcat6, masterkey-lui-solr4-common-tomcat8, masterkey-lui-solr4-master-tomcat8, masterkey-lui-solr4-slave-tomcat8
 Description: Local Unified Index (Solr)
@@ -16,6 +16,16 @@ Description: Local Unified Index (Solr)
  (subdatabases). The underlying index is a Solr/Lucene 5 index configured 
  to use a specific LUI schema.
 
+Package: masterkey-lui-solr6
+Architecture: all
+Depends: openjdk-8-jdk, ${misc:Depends}
+Conflicts: masterkey-lui-solr4-common, masterkey-lui-solr4-master, masterkey-lui-solr4-slave, masterkey-lui-solr4-zookeeper, masterkey-lui-solr4-common-tomcat6, masterkey-lui-solr4-master-tomcat6, masterkey-lui-solr4-slave-tomcat6, masterkey-lui-solr4-common-tomcat8, masterkey-lui-solr4-master-tomcat8, masterkey-lui-solr4-slave-tomcat8, masterkey-lui-solr5
+Replaces: masterkey-lui-solr4-common, masterkey-lui-solr4-master, masterkey-lui-solr4-slave, masterkey-lui-solr4-zookeeper, masterkey-lui-solr4-common-tomcat6, masterkey-lui-solr4-master-tomcat6, masterkey-lui-solr4-slave-tomcat6, masterkey-lui-solr4-common-tomcat8, masterkey-lui-solr4-master-tomcat8, masterkey-lui-solr4-slave-tomcat8, masterkey-lui-solr5
+Description: Local Unified Index (Solr)
+ The Local Unified Index is a index that contains multiple logical indexes 
+ (subdatabases). The underlying index is a Solr/Lucene 6 index configured 
+ to use a specific LUI schema.
+
 Package: masterkey-lui-zookeeper
 Architecture: all
 Depends: openjdk-7-jdk, ${misc:Depends}