debian/changelog

+eclipse-debian-helper (1.6) unstable; urgency=medium
+
+  * Mount the bundle dependencies before the default dependencies
+    in the compilation classpath
+  * Standards-Version updated to 4.4.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 11 Jul 2019 13:31:38 +0200
+
 eclipse-debian-helper (1.5) unstable; urgency=medium
 
   * Improved the detection of the bundle name

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg@apache.org>
 Build-Depends: debhelper (>= 11),
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
 Vcs-Git: https://salsa.debian.org/java-team/eclipse-debian-helper.git
 Vcs-Browser: https://salsa.debian.org/java-team/eclipse-debian-helper
 Homepage: https://salsa.debian.org/java-team/eclipse-debian-helper

src/ant/build-eclipse-bundle.xml

@@ -63,11 +63,11 @@
           <!-- Compile the source files to target/classes -->
           <javac srcdir="${bundle.dir.@{name}}/target/sources" destdir="${bundle.dir.@{name}}/target/classes" debug="yes" release="@{release}" includeantruntime="false" encoding="@{encoding}">
             <classpath>
+              <fileset dir="." includesfile="${bundle.dir.@{name}}/target/dependencies"/>
+              <bundle-classpath/>
               <pathelement path="/usr/share/java/eclipse-osgi.jar"/>
               <pathelement path="/usr/share/java/org.eclipse.osgi.jar"/>
               <pathelement path="/usr/share/java/osgi.compendium.jar"/>
-              <fileset dir="." includesfile="${bundle.dir.@{name}}/target/dependencies"/>
-              <bundle-classpath/>
             </classpath>
           </javac>