No longer remove the embedded copy of ASM (Closes: #800851)

0cadccdf · Emmanuel Bourg · cf40ff66 · 0cadccdf · 0cadccdf · 0cadccdf
Commit 0cadccdf authored 7 years ago by Emmanuel Bourg
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ eclipselink (2.6.2-1) UNRELEASED; urgency=medium
  * Team upload.
  * New upstream release
    - New dependency on libjsonp-java
+  * No longer remove the embedded copy of ASM (Closes: #800851)

 -- Emmanuel Bourg <ebourg@apache.org>  Tue, 19 Jul 2016 11:30:24 +0200


--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -11,6 +11,5 @@ usr/share/java/jsr311-api.jar
 usr/share/java/servlet-api-3.1.jar
 usr/share/java/antlr3.jar
 usr/share/java/antlr3-runtime.jar
-usr/share/java/asm3-all.jar
 usr/share/java/javax.mail.jar
 usr/share/java/javax.json.jar
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends:
 default-jdk,
 default-jdk-doc,
 javahelper,
- libasm3-java,
 libcdi-api-java,
 libgeronimo-j2ee-connector-1.5-spec-java,
 libgeronimo-jms-1.1-spec-java,
@@ -33,7 +32,6 @@ Package: libeclipselink-java
 Architecture: all
 Depends:
 antlr3 (>= 3.2),
- libasm3-java,
 libcdi-api-java,
 libgeronimo-j2ee-connector-1.5-spec-java,
 libgeronimo-jms-1.1-spec-java,

--- a/debian/libeclipselink-java.manifest
+++ b/debian/libeclipselink-java.manifest
@@ -8,7 +8,7 @@ usr/share/java/eclipselink.jar:
 Specification-Title: Eclipse Persistence Services
 Specification-Version: 2.5.1
 Main-Class: org.eclipse.persistence.Version
- Class-Path: /usr/share/java/javax.persistence-api.jar /usr/share/java/geronimo-jta_1.1_spec.jar /usr/share/java/geronimo-validation.jar /usr/share/java/javax.mail.jar /usr/share/java/geronimo-jms-1.1-spec.jar /usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/java/aspectjtools.jar /usr/share/java/sdo-api.jar /usr/share/java/antlr3.jar /usr/share/java/antlr3-runtime.jar /usr/share/java/asm3-all.jar /usr/share/java/cdi-api.jar /usr/share/java/jsr311-api.jar /usr/share/java/servlet-api-3.0.jar
+ Class-Path: /usr/share/java/javax.persistence-api.jar /usr/share/java/geronimo-jta_1.1_spec.jar /usr/share/java/geronimo-validation.jar /usr/share/java/javax.mail.jar /usr/share/java/geronimo-jms-1.1-spec.jar /usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/java/aspectjtools.jar /usr/share/java/sdo-api.jar /usr/share/java/antlr3.jar /usr/share/java/antlr3-runtime.jar /usr/share/java/cdi-api.jar /usr/share/java/jsr311-api.jar /usr/share/java/servlet-api-3.0.jar

 usr/share/java/org.eclipse.persistence.jpa.jpql.jar:
 Bundle-Name: EclipseLink Hermes Parser

--- a/debian/patches/disable_asm_embedded_copy.diff
+++ b/debian/patches/disable_asm_embedded_copy.diff
--- a/debian/patches/series
+++ b/debian/patches/series
 disable_antlr3_embedded_copy.diff
-disable_asm_embedded_copy.diff
 charset.patch
 typeparameters.patch
 explicitcast.patch