diff -Nru apache-directory-server-2.0.0~M24/debian/apacheds.docs apache-directory-server-2.0.0~M24/debian/apacheds.docs --- apache-directory-server-2.0.0~M24/debian/apacheds.docs 1970-01-01 00:00:00.000000000 +0000 +++ apache-directory-server-2.0.0~M24/debian/apacheds.docs 2018-10-27 14:30:27.000000000 +0000 @@ -0,0 +1 @@ +installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/NOTICE diff -Nru apache-directory-server-2.0.0~M24/debian/apacheds.links apache-directory-server-2.0.0~M24/debian/apacheds.links --- apache-directory-server-2.0.0~M24/debian/apacheds.links 2018-05-30 13:41:07.000000000 +0000 +++ apache-directory-server-2.0.0~M24/debian/apacheds.links 2018-10-27 14:30:27.000000000 +0000 @@ -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-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-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-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 diff -Nru apache-directory-server-2.0.0~M24/debian/apacheds.service apache-directory-server-2.0.0~M24/debian/apacheds.service --- apache-directory-server-2.0.0~M24/debian/apacheds.service 2018-05-30 09:26:35.000000000 +0000 +++ apache-directory-server-2.0.0~M24/debian/apacheds.service 2018-10-27 14:30:27.000000000 +0000 @@ -8,14 +8,15 @@ User=apacheds Group=apacheds EnvironmentFile=/etc/default/apacheds -ExecStart=${JAVA_HOME}/bin/java ${JAVA_OPTS} \ - -Dapacheds.controls=${ADS_CONTROLS} \ - -Dapacheds.extendedOperations=${ADS_EXTENDED_OPERATIONS} \ - -Dlog4j.configuration=file:${ADS_INSTANCES}/${ADS_INSTANCE}/conf/log4j.properties \ - -Dapacheds.log.dir=${ADS_INSTANCES}/${ADS_INSTANCE}/log \ - -cp '${ADS_HOME}/lib/*' \ - org.apache.directory.server.UberjarMain \ - ${ADS_INSTANCES}/${ADS_INSTANCE}/ +ExecStart=/bin/sh -c "exec \ + ${JAVA_HOME}/bin/java ${JAVA_OPTS} \ + -Dapacheds.controls=${ADS_CONTROLS} \ + -Dapacheds.extendedOperations=${ADS_EXTENDED_OPERATIONS} \ + -Dlog4j.configuration=file:${ADS_INSTANCES}/${ADS_INSTANCE}/conf/log4j.properties \ + -Dapacheds.log.dir=${ADS_INSTANCES}/${ADS_INSTANCE}/log \ + -cp '${ADS_HOME}/lib/*' \ + org.apache.directory.server.UberjarMain \ + ${ADS_INSTANCES}/${ADS_INSTANCE}/" PrivateTmp=true [Install] diff -Nru apache-directory-server-2.0.0~M24/debian/changelog apache-directory-server-2.0.0~M24/debian/changelog --- apache-directory-server-2.0.0~M24/debian/changelog 2018-05-30 14:07:52.000000000 +0000 +++ apache-directory-server-2.0.0~M24/debian/changelog 2018-10-27 14:30:27.000000000 +0000 @@ -1,3 +1,13 @@ +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 Sat, 27 Oct 2018 16:30:27 +0200 + apache-directory-server (2.0.0~M24-1) unstable; urgency=medium * Team upload. diff -Nru apache-directory-server-2.0.0~M24/debian/control apache-directory-server-2.0.0~M24/debian/control --- apache-directory-server-2.0.0~M24/debian/control 2018-05-30 13:41:19.000000000 +0000 +++ apache-directory-server-2.0.0~M24/debian/control 2018-10-27 14:30:27.000000000 +0000 @@ -2,7 +2,8 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers -Uploaders: Emmanuel Bourg +Uploaders: + Emmanuel Bourg , Build-Depends: ant, debhelper (>= 11), @@ -22,7 +23,7 @@ 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 @@ 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, + liblog4j1.2-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 @@ 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 @@ 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 @@ 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