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

Emmanuel Bourg (@ebourg) gitlab at salsa.debian.org
Mon Jan 2 18:07:47 GMT 2023



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


Commits:
a701117b by Emmanuel Bourg at 2023-01-02T19:02:33+01:00
Explicit dependency on libosgi-compendium-java

- - - - -
90a6ab9c by Emmanuel Bourg at 2023-01-02T19:02:41+01:00
Standards-Version updated to 4.6.2

- - - - -
ae2ea896 by Emmanuel Bourg at 2023-01-02T19:02:52+01:00
Upload to unstable

- - - - -


3 changed files:

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


Changes:

=====================================
debian/build.xml
=====================================
@@ -5,7 +5,9 @@
 
   <!-- 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"/>
+    <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>
 
   <!-- Equinox Bidirectional Text Support -->
@@ -17,6 +19,7 @@
   <target name="org.eclipse.equinox.cm">
     <make-bundle name="org.eclipse.equinox.cm">
       <pathelement path="/usr/share/java/eclipse-osgi-services.jar"/>
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
@@ -34,6 +37,7 @@
   <target name="org.eclipse.equinox.console">
     <make-bundle name="org.eclipse.equinox.console">
       <pathelement path="/usr/share/java/org.apache.felix.gogo.runtime.jar"/>
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
@@ -50,17 +54,22 @@
   <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"/>
+    <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"/>
+    <make-bundle name="org.eclipse.equinox.event">
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
+    </make-bundle>
   </target>
 
   <!-- Equinox Http Services Servlet -->
@@ -69,6 +78,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>
@@ -80,6 +90,7 @@
       <pathelement path="/usr/share/java/jetty9-server.jar"/>
       <pathelement path="/usr/share/java/jetty9-servlet.jar"/>
       <pathelement path="/usr/share/java/jetty9-util.jar"/>
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
       <pathelement path="/usr/share/java/servlet-api.jar"/>
     </make-bundle>
   </target>
@@ -87,6 +98,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>
@@ -117,12 +129,16 @@
 
   <!-- Equinox Meta Type -->
   <target name="org.eclipse.equinox.metatype">
-    <make-bundle 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="11"/>
+    <make-bundle name="org.eclipse.equinox.preferences" depends="org.eclipse.equinox.common,org.eclipse.equinox.registry" release="11">
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
+    </make-bundle>
   </target>
 
   <!-- Equinox Region -->
@@ -142,6 +158,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">
       <pathelement path="/usr/share/java/eclipse-core-jobs.jar"/>
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
     </make-bundle>
   </target>
 
@@ -154,6 +171,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>
 
@@ -176,7 +194,9 @@
 
   <!-- Equinox User Admin Service -->
   <target name="org.eclipse.equinox.useradmin">
-    <make-bundle name="org.eclipse.equinox.useradmin"/>
+    <make-bundle name="org.eclipse.equinox.useradmin">
+      <pathelement path="/usr/share/java/osgi.cmpn.jar"/>
+    </make-bundle>
   </target>
 
   <!-- Equinox Weaving Caching -->


=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+eclipse-equinox (4.26-3) unstable; urgency=medium
+
+  * Explicit dependency on libosgi-compendium-java
+  * Standards-Version updated to 4.6.2
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 02 Jan 2023 19:02:43 +0100
+
 eclipse-equinox (4.26-2) unstable; urgency=medium
 
   * Sources only upload


=====================================
debian/control
=====================================
@@ -25,7 +25,7 @@ Build-Depends:
  libswt-gtk-4-java (>= 4.22),
  libtomcat9-java,
  xmlstarlet
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 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 +43,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 +67,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
@@ -105,7 +105,7 @@ Description: Eclipse Equinox Concurrent API
 Package: libequinox-console-java
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${bundle:Depends}
+Depends: ${misc:Depends}, ${bundle:Depends}, libosgi-compendium-java
 Description: Eclipse Equinox Console plug-in
  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 +117,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 +130,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 +143,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 +167,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 +179,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 +239,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 +251,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 +288,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 +352,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/3d1bed30c6b17a735ce52a3f6d6a19d7d45bdcb8...ae2ea8965cd3a4f7f7abf51c7c0a81e7aeb6efa4

-- 
View it on GitLab: https://salsa.debian.org/java-team/eclipse-equinox/-/compare/3d1bed30c6b17a735ce52a3f6d6a19d7d45bdcb8...ae2ea8965cd3a4f7f7abf51c7c0a81e7aeb6efa4
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/20230102/27b0d4ac/attachment.htm>


More information about the pkg-java-commits mailing list