Control: tags -1 patch -- On Mon, Sep 19, 2022 at 03:55:54PM +0100, Sudip Mukherjee wrote: > Source: eclipse-platform-runtime > Version: 4.19-1 > Severity: important > X-Debbugs-Cc: sudipm.mukher...@gmail.com > > Dear Maintainer, > > eclipse-platform-runtime needs javax.annotation.PostConstruct and > javax.annotation.PreDestroy and the MANIFEST.MF file mentions: > > Import-Package: javax.annotation;version="1.3.5" and also mentions > javax.annotation;bundle-version="[1.3.5,2.0.0)" in Require-Bundle.
The attached patch is the minimum required to unblock eclipse-tracecompass. But Emmanuel Bourg did not agree so I am not doing an upload but keeping the patch here for record. Ref: https://lists.debian.org/debian-java/2022/09/msg00002.html -- Regards Sudip
diff -Nru eclipse-platform-runtime-4.19/debian/changelog eclipse-platform-runtime-4.19/debian/changelog --- eclipse-platform-runtime-4.19/debian/changelog 2021-10-09 15:47:19.000000000 +0100 +++ eclipse-platform-runtime-4.19/debian/changelog 2022-05-27 23:58:33.000000000 +0100 @@ -1,3 +1,10 @@ +eclipse-platform-runtime (4.19-1.1) UNRELEASED; urgency=medium + + * Team upload. + * Fix manifest information. (Closes: #1020298) + + -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Fri, 27 May 2022 23:58:33 +0100 + eclipse-platform-runtime (4.19-1) unstable; urgency=medium * New upstream release diff -Nru eclipse-platform-runtime-4.19/debian/patches/manifest.patch eclipse-platform-runtime-4.19/debian/patches/manifest.patch --- eclipse-platform-runtime-4.19/debian/patches/manifest.patch 1970-01-01 01:00:00.000000000 +0100 +++ eclipse-platform-runtime-4.19/debian/patches/manifest.patch 2022-05-27 23:58:33.000000000 +0100 @@ -0,0 +1,47 @@ +Description: Fix Manifest + +Author: Sudip Mukherjee <sudipm.mukher...@gmail.com> + +--- + +Bug-Debian: https://bugs.debian.org/1020298 +Forwarded: no + +--- eclipse-platform-runtime-4.19.orig/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF ++++ eclipse-platform-runtime-4.19/bundles/org.eclipse.e4.core.di.extensions.supplier/META-INF/MANIFEST.MF +@@ -17,7 +17,7 @@ Import-Package: org.eclipse.core.runtime + org.osgi.service.component.annotations;version="1.3.0";resolution:=optional, + org.osgi.service.event;version="1.3.0", + org.osgi.service.log;version="1.3.0", +- javax.annotation;version="1.3.5" ++ javax.annotation;version="[1.3,1.3.5]" + Service-Component: OSGI-INF/org.eclipse.e4.core.di.internal.extensions.OSGiObjectSupplier.xml, + OSGI-INF/org.eclipse.e4.core.di.internal.extensions.EventObjectSupplier.xml, + OSGI-INF/org.eclipse.e4.core.di.internal.extensions.PreferencesObjectSupplier.xml, +--- eclipse-platform-runtime-4.19.orig/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF ++++ eclipse-platform-runtime-4.19/bundles/org.eclipse.e4.core.di/META-INF/MANIFEST.MF +@@ -12,10 +12,10 @@ Export-Package: org.eclipse.e4.core.di;v + org.eclipse.e4.core.internal.di;x-friends:="org.eclipse.e4.core.contexts", + org.eclipse.e4.core.internal.di.osgi;x-internal:=true, + org.eclipse.e4.core.internal.di.shared;x-friends:="org.eclipse.e4.core.contexts,org.eclipse.e4.core.di.extensions.supplier" +-Require-Bundle: org.eclipse.e4.core.di.annotations;bundle-version="[1.4.0,2.0.0)";visibility:=reexport, +- javax.annotation;bundle-version="[1.3.5,2.0.0)" ++Require-Bundle: org.eclipse.e4.core.di.annotations;bundle-version="[1.4.0,2.0.0)";visibility:=reexport + Import-Package: javax.inject;version="1.0.0", + org.eclipse.osgi.framework.log;version="1.1.0", + org.osgi.framework;version="1.8.0", +- org.osgi.util.tracker;version="1.5.1" ++ org.osgi.util.tracker;version="1.5.1", ++ javax.annotation;version="[1.3,1.3.5]" + Automatic-Module-Name: org.eclipse.e4.core.di +--- eclipse-platform-runtime-4.19.orig/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF ++++ eclipse-platform-runtime-4.19/bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF +@@ -7,7 +7,7 @@ Bundle-Localization: plugin + Bundle-Version: 2.2.600.qualifier + Bundle-ActivationPolicy: lazy + Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +-Import-Package: javax.annotation;version="1.3.5", ++Import-Package: javax.annotation;version="[1.3,1.3.5]", + javax.inject;version="1.0.0", + org.eclipse.osgi.service.debug;version="1.1.0", + org.eclipse.osgi.service.localization;version="1.1.0", diff -Nru eclipse-platform-runtime-4.19/debian/patches/series eclipse-platform-runtime-4.19/debian/patches/series --- eclipse-platform-runtime-4.19/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ eclipse-platform-runtime-4.19/debian/patches/series 2022-05-27 23:58:33.000000000 +0100 @@ -0,0 +1 @@ +manifest.patch
