debian/bootstrap.xml

@@ -26,7 +26,6 @@
       <classpath>
         <path id="classpath.jdtcore">
           <fileset dir="/usr/lib/eclipse/plugins/">
-            <include name="org.eclipse.osgi_*.jar"/>
             <include name="org.eclipse.text_*.jar"/>
             <include name="org.eclipse.update.configurator_*.jar"/>
             <include name="org.eclipse.core.runtime_*.jar"/>
@@ -42,6 +41,7 @@
           <fileset dir="/usr/share/java/">
             <include name="aspectjrt.jar"/>
             <include name="ant.jar"/>
+            <include name="org.eclipse.osgi.jar"/>
           </fileset>
         </path>
       </classpath>

debian/changelog

+aspectj (1.8.9-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build with org.eclipse.osgi.jar from libequinox-osgi-java
+  * Standards-Version updated to 4.1.4
+  * Switch to debhelper level 10
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Wed, 04 Jul 2018 00:46:34 +0200
+
 aspectj (1.8.9-2) unstable; urgency=medium
 
   * Team upload.

debian/compat

-9
+10

debian/control

@@ -3,8 +3,12 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib@debian.org>
-Build-Depends: ant, ant-optional, cdbs, debhelper (>= 9), default-jdk
-Build-Depends-Indep: default-jdk-doc,
+Build-Depends:
+ ant,
+ ant-optional,
+ cdbs,
+ debhelper (>= 10~),
+ default-jdk,
  docbook-to-man,
  docbook-xml,
  docbook-xsl,
@@ -15,18 +19,20 @@ Build-Depends-Indep: default-jdk-doc,
  libasm-java-doc,
  libaspectj-java,
  libcommons-logging-java,
+ libequinox-osgi-java,
  libregexp-java,
  libxalan2-java,
  maven-repo-helper,
  xsltproc
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/aspectj.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/aspectj.git
+Standards-Version: 4.1.4
+Vcs-Git: https://salsa.debian.org/java-team/aspectj.git
+Vcs-Browser: https://salsa.debian.org/java-team/aspectj
 Homepage: http://www.eclipse.org/aspectj
 
 Package: aspectj
 Architecture: all
-Depends: default-jre-headless | java7-runtime-headless,
+Depends:
+ default-jre-headless | java7-runtime-headless,
  libaspectj-java (= ${source:Version}),
  ${misc:Depends}
 Description: aspect-oriented extension for Java - tools

debian/rules

@@ -95,7 +95,7 @@ debian/stamp-bootstrap:
 	$(LN_S) /usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.core.resources.jar
 	$(LN_S) /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.core.runtime.jar
 	$(LN_S) /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.core.jobs.jar
-	$(LN_S) /usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar $(AJ_ECLIPSE_HOME)/org.eclipse.osgi.jar
+	$(LN_S) /usr/share/java/org.eclipse.osgi.jar $(AJ_ECLIPSE_HOME)/org.eclipse.osgi.jar
 	
 	$(DEB_ANT_INVOKE)
 	touch $@