[Git][java-team/aspectj][master] 5 commits: Build with org.eclipse.osgi.jar from libequinox-osgi-java

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / aspectj


Commits:
2b923a76 by Emmanuel Bourg at 2018-07-04T00:47:48+02:00
Build with org.eclipse.osgi.jar from libequinox-osgi-java

- - - - -
ce62137f by Emmanuel Bourg at 2018-07-04T00:49:57+02:00
Wrap and sort

- - - - -
4c288640 by Emmanuel Bourg at 2018-07-04T00:50:14+02:00
Standards-Version updated to 4.1.4

- - - - -
73bdc7b3 by Emmanuel Bourg at 2018-07-04T00:51:11+02:00
Switch to debhelper level 10

- - - - -
f26213af by Emmanuel Bourg at 2018-07-04T00:51:19+02:00
Use salsa.debian.org Vcs-* URLs

- - - - -


5 changed files:

- debian/bootstrap.xml
- debian/changelog
- debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/bootstrap.xml
=====================================
--- a/debian/bootstrap.xml
+++ b/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
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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 at apache.org>  Wed, 04 Jul 2018 00:46:34 +0200
+
 aspectj (1.8.9-2) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,32 +3,38 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: ant, ant-optional, cdbs, debhelper (>= 9), default-jdk
-Build-Depends-Indep: default-jdk-doc,
-                     docbook-to-man,
-                     docbook-xml,
-                     docbook-xsl,
-                     eclipse-platform (>= 3.4.1),
-                     html2text,
-                     junit (>= 3.8.1),
-                     libasm-java (>= 5.0),
-                     libasm-java-doc,
-                     libaspectj-java,
-                     libcommons-logging-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
+Build-Depends:
+ ant,
+ ant-optional,
+ cdbs,
+ debhelper (>= 10~),
+ default-jdk,
+ docbook-to-man,
+ docbook-xml,
+ docbook-xsl,
+ eclipse-platform (>= 3.4.1),
+ html2text,
+ junit (>= 3.8.1),
+ libasm-java (>= 5.0),
+ libasm-java-doc,
+ libaspectj-java,
+ libcommons-logging-java,
+ libequinox-osgi-java,
+ libregexp-java,
+ libxalan2-java,
+ maven-repo-helper,
+ xsltproc
+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,
-         libaspectj-java (= ${source:Version}),
-         ${misc:Depends}
+Depends:
+ default-jre-headless | java7-runtime-headless,
+ libaspectj-java (= ${source:Version}),
+ ${misc:Depends}
 Description: aspect-oriented extension for Java - tools
  AspectJ enables the clean modularization of crosscutting concerns
  such as: error checking and handling, synchronization, context-sensitive


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/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 $@



View it on GitLab: https://salsa.debian.org/java-team/aspectj/compare/e548bdae665a1c38a72b35722832415fc6e89c3c...f26213afe072c5951c615fdf934bea6b6d5d882d

-- 
View it on GitLab: https://salsa.debian.org/java-team/aspectj/compare/e548bdae665a1c38a72b35722832415fc6e89c3c...f26213afe072c5951c615fdf934bea6b6d5d882d
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/20180703/1f1eb117/attachment.html>