[Git][java-team/eclipse-equinox][master] 3 commits: Restored the dependency on libosgi-compendium-java

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Fri May 22 00:17:36 BST 2026



Emmanuel Bourg pushed to branch master at Debian Java Maintainers / eclipse-equinox


Commits:
d2478d27 by Emmanuel Bourg at 2026-05-22T01:16:02+02:00
Restored the dependency on libosgi-compendium-java

This reverts commit 91349f423d1064c69382d8255b4ed655804242dd.

- - - - -
1e3dc950 by Emmanuel Bourg at 2026-05-22T01:17:07+02:00
Standards-Version updated to 4.7.4

- - - - -
2b669b5f by Emmanuel Bourg at 2026-05-22T01:17:16+02:00
Upload to unstable

- - - - -


3 changed files:

- debian/build.xml
- debian/changelog
- debian/control


Changes:

=====================================
debian/build.xml
=====================================
@@ -6,6 +6,7 @@
   <!-- Equinox Application Container -->
   <target name="org.eclipse.equinox.app" depends="org.eclipse.equinox.common,org.eclipse.equinox.registry">
     <make-bundle name="org.eclipse.equinox.app" depends="org.eclipse.equinox.common,org.eclipse.equinox.registry">
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
@@ -18,6 +19,7 @@
   <target name="org.eclipse.equinox.cm">
     <make-bundle name="org.eclipse.equinox.cm" release="11">
       <pathelement path="/usr/share/java/eclipse-osgi-services.jar"/>
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
@@ -51,18 +53,21 @@
   <target name="org.eclipse.equinox.coordinator">
     <make-bundle name="org.eclipse.equinox.coordinator">
       <pathelement path="/usr/share/java/osgi.annotation.jar"/>
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
   <!-- Equinox Device Access Service -->
   <target name="org.eclipse.equinox.device">
     <make-bundle name="org.eclipse.equinox.device">
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
   <!-- Equinox Event Admin -->
   <target name="org.eclipse.equinox.event">
     <make-bundle name="org.eclipse.equinox.event">
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
@@ -72,6 +77,7 @@
       <pathelement path="/usr/share/java/commons-fileupload.jar"/>
       <pathelement path="/usr/share/java/eclipse-osgi-services.jar"/>
       <pathelement path="/usr/share/java/osgi.annotation.jar"/>
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
       <pathelement path="/usr/share/java/servlet-api.jar"/>
     </make-bundle>
   </target>
@@ -86,6 +92,7 @@
       <pathelement path="/usr/share/java/jetty12-server.jar"/>
       <pathelement path="/usr/share/java/jetty12-session.jar"/>
       <pathelement path="/usr/share/java/jetty12-util.jar"/>
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
       <pathelement path="/usr/share/java/servlet-api.jar"/>
     </make-bundle>
   </target>
@@ -93,6 +100,7 @@
   <!-- Equinox Http Service Registry Extensions -->
   <target name="org.eclipse.equinox.http.registry" depends="org.eclipse.equinox.common,org.eclipse.equinox.registry">
     <make-bundle name="org.eclipse.equinox.http.registry" depends="org.eclipse.equinox.common,org.eclipse.equinox.registry">
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
       <pathelement path="/usr/share/java/servlet-api.jar"/>
     </make-bundle>
   </target>
@@ -124,12 +132,14 @@
   <!-- Equinox Meta Type -->
   <target name="org.eclipse.equinox.metatype">
     <make-bundle name="org.eclipse.equinox.metatype">
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
   <!-- Equinox Preferences -->
   <target name="org.eclipse.equinox.preferences" depends="org.eclipse.equinox.common,org.eclipse.equinox.registry">
     <make-bundle name="org.eclipse.equinox.preferences" depends="org.eclipse.equinox.common,org.eclipse.equinox.registry" release="17">
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
@@ -150,6 +160,7 @@
     <!-- TODO build the native code -->
     <make-bundle name="org.eclipse.equinox.security" depends="org.eclipse.equinox.common,org.eclipse.equinox.registry,org.eclipse.equinox.preferences" release="17">
       <pathelement path="/usr/share/java/eclipse-core-jobs.jar"/>
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
@@ -162,6 +173,7 @@
       <pathelement path="/usr/share/java/eclipse-core-jobs.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-runtime.jar"/>
       <pathelement path="/usr/share/java/eclipse-core-commands.jar"/>
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
@@ -185,6 +197,7 @@
   <!-- Equinox User Admin Service -->
   <target name="org.eclipse.equinox.useradmin">
     <make-bundle name="org.eclipse.equinox.useradmin">
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+eclipse-equinox (4.34-2) unstable; urgency=medium
+
+  * Restored the dependency on libosgi-compendium-java
+  * Standards-Version updated to 4.7.4
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 22 May 2026 01:17:09 +0200
+
 eclipse-equinox (4.34-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/control
=====================================
@@ -21,11 +21,12 @@ Build-Depends:
  libjetty12-java,
  libjetty12-extra-java,
  libosgi-annotation-java,
+ libosgi-compendium-java,
  libservlet-api-java,
  libswt-gtk-4-java (>= 4.22),
  libtomcat11-java,
  xmlstarlet
-Standards-Version: 4.7.3
+Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/java-team/eclipse-equinox.git
 Vcs-Browser: https://salsa.debian.org/java-team/eclipse-equinox
 Homepage: http://www.eclipse.org/equinox/
@@ -43,7 +44,7 @@ Description: Eclipse Platform Launcher Executables
 
 Package: libequinox-app-java
 Architecture: all
-Depends: ${misc:Depends}, ${bundle:Depends}
+Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-compendium-java
 Description: Eclipse Equinox Application Container
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi
@@ -67,7 +68,7 @@ Description: Eclipse Equinox Bidirectional Text Support
 
 Package: libequinox-cm-java
 Architecture: all
-Depends: ${misc:Depends}, ${bundle:Depends}, libeclipse-osgi-services-java (>= 3.8)
+Depends: ${misc:Depends}, ${bundle:Depends}, libeclipse-osgi-services-java (>= 3.8), libosgi-compendium-java
 Description: Eclipse Equinox Configuration Admin
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi
@@ -117,7 +118,7 @@ Description: Eclipse Equinox Console plug-in
 
 Package: libequinox-coordinator-java
 Architecture: all
-Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-annotation-java
+Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-annotation-java, libosgi-compendium-java
 Description: Eclipse Equinox Coordinator
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi
@@ -130,7 +131,7 @@ Description: Eclipse Equinox Coordinator
 Package: libequinox-device-java
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${bundle:Depends}
+Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-compendium-java
 Description: Eclipse Equinox Device Access Service
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi
@@ -143,7 +144,7 @@ Description: Eclipse Equinox Device Access Service
 Package: libequinox-event-java
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${bundle:Depends}
+Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-compendium-java
 Description: Eclipse Equinox Event Admin
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi
@@ -167,7 +168,7 @@ Description: Eclipse Equinox Jetty HTTP Service
 
 Package: libequinox-http-registry-java
 Architecture: all
-Depends: ${misc:Depends}, ${bundle:Depends}
+Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-compendium-java
 Description: Eclipse Equinox HTTP Registry
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi
@@ -179,7 +180,7 @@ Description: Eclipse Equinox HTTP Registry
 
 Package: libequinox-http-servlet-java
 Architecture: all
-Depends: ${misc:Depends}, ${bundle:Depends}, libeclipse-osgi-services-java (>= 3.8), libosgi-annotation-java
+Depends: ${misc:Depends}, ${bundle:Depends}, libeclipse-osgi-services-java (>= 3.8), libosgi-annotation-java, libosgi-compendium-java
 Description: Eclipse Equinox HTTP Services Servlet
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi
@@ -239,7 +240,7 @@ Description: Eclipse Equinox Launcher
 Package: libequinox-metatype-java
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${bundle:Depends}
+Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-compendium-java
 Description: Eclipse Equinox Meta Type
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi
@@ -251,7 +252,7 @@ Description: Eclipse Equinox Meta Type
 
 Package: libequinox-preferences-java
 Architecture: all
-Depends: ${misc:Depends}, ${bundle:Depends}
+Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-compendium-java
 Description: Eclipse Preferences Mechanism
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi
@@ -288,7 +289,7 @@ Description: Eclipse Extension Registry Support
 
 Package: libequinox-security-java
 Architecture: all
-Depends: ${misc:Depends}, ${bundle:Depends}
+Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-compendium-java
 Description: Eclipse Equinox Java Authentication and Authorization Service (JAAS)
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi
@@ -352,7 +353,7 @@ Description: Eclipse Equinox Transforms XSLT
 Package: libequinox-useradmin-java
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${bundle:Depends}
+Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-compendium-java
 Description: Eclipse Equinox User Admin Service
  The Equinox Bundles project is tasked with implementing all add-on services
  detailed in the OSGi specifications including the output of the various OSGi



View it on GitLab: https://salsa.debian.org/java-team/eclipse-equinox/-/compare/54ee57171c98557ad72a315093bdaea01030d86e...2b669b5f8af2231989246776fef8438a374703fb

-- 
View it on GitLab: https://salsa.debian.org/java-team/eclipse-equinox/-/compare/54ee57171c98557ad72a315093bdaea01030d86e...2b669b5f8af2231989246776fef8438a374703fb
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260521/944e0ebb/attachment.htm>


More information about the pkg-java-commits mailing list