[Git][java-team/apache-directory-server][master] 4 commits: Ad missing dependencies.

Dominik George gitlab at salsa.debian.org
Sat Oct 27 15:47:54 BST 2018


Dominik George pushed to branch master at Debian Java Maintainers / apache-directory-server


Commits:
aeae6197 by Dominik George at 2018-10-27T14:22:38Z
Ad missing dependencies.

- - - - -
2653dc70 by Dominik George at 2018-10-27T14:29:16Z
wrap-and-sort

- - - - -
bfea0b60 by Dominik George at 2018-10-27T14:30:41Z
Release for sid.

- - - - -
3db1d17c by Dominik George at 2018-10-27T14:42:31Z
Install NOTICE file.

- - - - -


4 changed files:

- + debian/apacheds.docs
- debian/apacheds.links
- debian/changelog
- debian/control


Changes:

=====================================
debian/apacheds.docs
=====================================
@@ -0,0 +1 @@
+installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE


=====================================
debian/apacheds.links
=====================================
@@ -1,3 +1,6 @@
+etc/apacheds                                            var/lib/apacheds/instances/default/conf
+usr/share/java/antlr.jar                                usr/share/apacheds/lib/antlr.jar
+usr/share/java/apache-directory-api-all.jar             usr/share/apacheds/lib/apache-directory-api-all.jar
 usr/share/java/apacheds-core-annotations.jar            usr/share/apacheds/lib/apacheds-core-annotations.jar
 usr/share/java/apacheds-core-api.jar                    usr/share/apacheds/lib/apacheds-core-api.jar
 usr/share/java/apacheds-core-avl.jar                    usr/share/apacheds/lib/apacheds-core-avl.jar
@@ -26,6 +29,7 @@ usr/share/java/apacheds-interceptors-schema.jar         usr/share/apacheds/lib/a
 usr/share/java/apacheds-interceptors-subtree.jar        usr/share/apacheds/lib/apacheds-interceptors-subtree.jar
 usr/share/java/apacheds-interceptors-trigger.jar        usr/share/apacheds/lib/apacheds-interceptors-trigger.jar
 usr/share/java/apacheds-jdbm-partition.jar              usr/share/apacheds/lib/apacheds-jdbm-partition.jar
+usr/share/java/apacheds-jdbm1.jar                       usr/share/apacheds/lib/apacheds-jdbm1.jar
 usr/share/java/apacheds-kerberos-codec.jar              usr/share/apacheds/lib/apacheds-kerberos-codec.jar
 usr/share/java/apacheds-ldif-partition.jar              usr/share/apacheds/lib/apacheds-ldif-partition.jar
 usr/share/java/apacheds-mavibot-partition.jar           usr/share/apacheds/lib/apacheds-mavibot-partition.jar
@@ -38,14 +42,9 @@ usr/share/java/apacheds-protocol-shared.jar             usr/share/apacheds/lib/a
 usr/share/java/apacheds-server-annotations.jar          usr/share/apacheds/lib/apacheds-server-annotations.jar
 usr/share/java/apacheds-server-config.jar               usr/share/apacheds/lib/apacheds-server-config.jar
 usr/share/java/apacheds-server-jndi.jar                 usr/share/apacheds/lib/apacheds-server-jndi.jar
-usr/share/java/apacheds-service.jar                     usr/share/apacheds/lib/apacheds-service.jar
 usr/share/java/apacheds-service-builder.jar             usr/share/apacheds/lib/apacheds-service-builder.jar
+usr/share/java/apacheds-service.jar                     usr/share/apacheds/lib/apacheds-service.jar
 usr/share/java/apacheds-xdbm-partition.jar              usr/share/apacheds/lib/apacheds-xdbm-partition.jar
-usr/share/java/kerberos-client.jar                      usr/share/apacheds/lib/kerberos-client.jar
-
-usr/share/java/antlr.jar                                usr/share/apacheds/lib/antlr.jar
-usr/share/java/apache-directory-api-all.jar             usr/share/apacheds/lib/apache-directory-api-all.jar
-usr/share/java/apacheds-jdbm1.jar                       usr/share/apacheds/lib/apacheds-jdbm1.jar
 usr/share/java/bcprov.jar                               usr/share/apacheds/lib/bcprov.jar
 usr/share/java/commons-collections3.jar                 usr/share/apacheds/lib/commons-collections3.jar
 usr/share/java/commons-io.jar                           usr/share/apacheds/lib/commons-io.jar
@@ -53,13 +52,12 @@ usr/share/java/commons-lang.jar                         usr/share/apacheds/lib/c
 usr/share/java/commons-pool.jar                         usr/share/apacheds/lib/commons-pool.jar
 usr/share/java/dom4j.jar                                usr/share/apacheds/lib/dom4j.jar
 usr/share/java/ehcache-core.jar                         usr/share/apacheds/lib/ehcache-core.jar
+usr/share/java/kerberos-client.jar                      usr/share/apacheds/lib/kerberos-client.jar
 usr/share/java/log4j-1.2.jar                            usr/share/apacheds/lib/log4j-1.2.jar
 usr/share/java/mavibot.jar                              usr/share/apacheds/lib/mavibot.jar
 usr/share/java/mina2-core.jar                           usr/share/apacheds/lib/mina2-core.jar
 usr/share/java/slf4j-api.jar                            usr/share/apacheds/lib/slf4j-api.jar
 usr/share/java/slf4j-log4j12.jar                        usr/share/apacheds/lib/slf4j-log4j12.jar
 usr/share/java/xpp3.jar                                 usr/share/apacheds/lib/xpp3.jar
-
 var/lib/apacheds/instances                              usr/share/apacheds/instances
-etc/apacheds                                            var/lib/apacheds/instances/default/conf
 var/log/apacheds                                        var/lib/apacheds/instances/default/log


=====================================
debian/changelog
=====================================
@@ -1,9 +1,12 @@
-apache-directory-server (2.0.0~M24-2) UNRELEASED; urgency=medium
+apache-directory-server (2.0.0~M24-2) unstable; urgency=medium
 
   * Team upload.
   * Fix command in systemd service file. (Closes: #909063)
+  * Add missing dependencies to libraries. (Closes: #911557)
+    + wrap-and-sort.
+  * Install NOTICE file to docs as required by Apache licence.
 
- -- Dominik George <natureshadow at debian.org>  Sat, 27 Oct 2018 15:32:48 +0200
+ -- Dominik George <natureshadow at debian.org>  Sat, 27 Oct 2018 16:30:27 +0200
 
 apache-directory-server (2.0.0~M24-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -2,7 +2,8 @@ Source: apache-directory-server
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Emmanuel Bourg <ebourg at apache.org>
+Uploaders:
+ Emmanuel Bourg <ebourg at apache.org>,
 Build-Depends:
  ant,
  debhelper (>= 11),
@@ -22,7 +23,7 @@ Build-Depends:
  libmina2-java,
  libplexus-utils2-java (>= 2.x),
  libslf4j-java,
- maven-debian-helper (>= 2.0)
+ maven-debian-helper (>= 2.0),
 Standards-Version: 4.1.4
 Vcs-Git: https://salsa.debian.org/java-team/apache-directory-server.git
 Vcs-Browser: https://salsa.debian.org/java-team/apache-directory-server
@@ -30,8 +31,16 @@ Homepage: http://directory.apache.org
 
 Package: libapacheds-java
 Architecture: all
-Depends: ${maven:Depends}, ${misc:Depends}, libapacheds-i18n-java (= ${source:Version}), libapacheds-kerberos-codec-java (= ${source:Version})
-Suggests: ${maven:OptionalDepends}
+Depends:
+ libantlr-java,
+ libapacheds-i18n-java (= ${source:Version}),
+ libapacheds-kerberos-codec-java (= ${source:Version}),
+ libcommons-io-java,
+ liblog4j-java,
+ ${maven:Depends},
+ ${misc:Depends},
+Suggests:
+ ${maven:OptionalDepends},
 Description: Apache Directory Server (Libraries)
  ApacheDS is an embbedable directory server entirely written in Java, which
  has been certified LDAPv3 compatible by the Open Group. Besides LDAP it
@@ -43,7 +52,10 @@ Description: Apache Directory Server (Libraries)
 
 Package: libapacheds-kerberos-codec-java
 Architecture: all
-Depends: ${misc:Depends}, libapacheds-i18n-java (= ${source:Version}), libehcache-java (>= 2.6.11-2~)
+Depends:
+ libapacheds-i18n-java (= ${source:Version}),
+ libehcache-java (>= 2.6.11-2~),
+ ${misc:Depends},
 Description: Apache Directory Server (Kerberos Codec)
  ApacheDS is an embbedable directory server entirely written in Java, which
  has been certified LDAPv3 compatible by the Open Group. Besides LDAP it
@@ -55,7 +67,8 @@ Description: Apache Directory Server (Kerberos Codec)
 
 Package: libapacheds-i18n-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: Apache Directory Server (i18n)
  ApacheDS is an embbedable directory server entirely written in Java, which
  has been certified LDAPv3 compatible by the Open Group. Besides LDAP it
@@ -67,7 +80,11 @@ Description: Apache Directory Server (i18n)
 
 Package: apacheds
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java7-runtime-headless, libapacheds-java (= ${source:Version}), adduser
+Depends:
+ adduser,
+ default-jre-headless | java7-runtime-headless,
+ libapacheds-java (= ${source:Version}),
+ ${misc:Depends},
 Description: Apache Directory Server
  ApacheDS is an embbedable directory server entirely written in Java, which
  has been certified LDAPv3 compatible by the Open Group. Besides LDAP it



View it on GitLab: https://salsa.debian.org/java-team/apache-directory-server/compare/82fbf6ce293ea900d00b92c866480b84c4199676...3db1d17cf9124bf86184aa87c669d68f61e5923c

-- 
View it on GitLab: https://salsa.debian.org/java-team/apache-directory-server/compare/82fbf6ce293ea900d00b92c866480b84c4199676...3db1d17cf9124bf86184aa87c669d68f61e5923c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181027/365cd9e9/attachment.html>


More information about the pkg-java-commits mailing list