[Git][java-team/osgi-compendium][master] 6 commits: Removed the javadoc package

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / osgi-compendium


Commits:
38e31f71 by Emmanuel Bourg at 2026-10-19T16:21:48+02:00
Removed the javadoc package

- - - - -
c6c49720 by Emmanuel Bourg at 2026-10-19T16:21:49+02:00
Converted debian/watch to version 5 format

- - - - -
3d0d1559 by Emmanuel Bourg at 2026-10-19T16:21:49+02:00
Standards-Version updated to 4.7.4

- - - - -
f968d745 by Emmanuel Bourg at 2026-10-19T16:21:49+02:00
Removed the Priority field

- - - - -
152368a0 by Emmanuel Bourg at 2026-10-19T16:29:00+02:00
Depend on libservlet-api-java instead of libservlet3.1-java

- - - - -
4aaefa42 by Emmanuel Bourg at 2026-10-19T16:30:29+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- − debian/libosgi-compendium-java-doc.javadoc
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+osgi-compendium (7.0.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the javadoc package
+  * Converted debian/watch to version 5 format
+  * Standards-Version updated to 4.7.4
+  * Removed the Priority field
+  * Depend on libservlet-api-java instead of libservlet3.1-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 19 Oct 2026 16:30:18 +0200
+
 osgi-compendium (7.0.0-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -1,6 +1,5 @@
 Source: osgi-compendium
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders:
  Ludovic Claude <ludovic.claude at laposte.net>
@@ -14,9 +13,9 @@ Build-Depends:
  libosgi-annotation-java (>= 7.0.0),
  libosgi-core-java (>= 5.0.0~),
  libosgi-foundation-ee-java,
- libservlet3.1-java,
+ libservlet-api-java,
  maven-repo-helper
-Standards-Version: 4.5.0
+Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/java-team/osgi-compendium.git
 Vcs-Browser: https://salsa.debian.org/java-team/osgi-compendium
 Homepage: http://www.osgi.org/Specifications/HomePage
@@ -27,8 +26,6 @@ Depends:
  ${misc:Depends},
  libosgi-annotation-java (>= 7.0.0),
  libosgi-core-java
-Suggests:
- libosgi-compendium-java-doc
 Description: Java OSGi API - Compendium module
  OSGi, for Open Services Gateway initiative framework, is a module system and
  service platform for the Java programming language.
@@ -37,21 +34,3 @@ Description: Java OSGi API - Compendium module
  .
  On top of OSGi Core, this provide additional services to help dynamic
  components.
-
-Package: libosgi-compendium-java-doc
-Architecture: all
-Section: doc
-Depends:
- ${misc:Depends}
-Recommends:
- ${java:Recommends}
-Description: Javadoc for Java OSGi API - Compendium module
- OSGi, for Open Services Gateway initiative framework, is a module system and
- service platform for the Java programming language.
- .
- This package contains OSGi Compendium for Release 6.
- .
- On top of OSGi Core, this provide additional services to help dynamic
- components.
- .
- This package contains Javadoc HTML documentation for libosgi-compendium-java.


=====================================
debian/libosgi-compendium-java-doc.javadoc deleted
=====================================
@@ -1 +0,0 @@
-internal /usr/share/doc/libosgi-compendium-java/api/


=====================================
debian/rules
=====================================
@@ -3,7 +3,7 @@
 include /usr/share/dpkg/pkg-info.mk
 
 export JAVA_HOME	:= /usr/lib/jvm/default-java
-export CLASSPATH	:= /usr/share/java/osgi.core.jar:/usr/share/java/servlet-api-3.1.jar:/usr/share/java/ee.foundation.jar:/usr/share/java/geronimo-jpa_2.0_spec.jar:/usr/share/java/osgi.annotation.jar:/usr/share/java/jaxrs-api.jar
+export CLASSPATH	:= /usr/share/java/osgi.core.jar:/usr/share/java/servlet-api.jar:/usr/share/java/ee.foundation.jar:/usr/share/java/geronimo-jpa_2.0_spec.jar:/usr/share/java/osgi.annotation.jar:/usr/share/java/jaxrs-api.jar
 
 MAVEN_REPO		:= https://repo1.maven.org/maven2/org/osgi/osgi.cmpn
 JAR_NAME		:= osgi.cmpn
@@ -13,7 +13,7 @@ PACKAGE			:= libosgi-compendium-java
 	dh $@ --with javahelper --with maven_repo_helper
 
 override_jh_build:
-	jh_build --javacopts='--release 8' --javadoc-opts='--release 8'
+	jh_build --no-javadoc --javacopts='--release 8'
 
 get-orig-pom:
 	wget --user-agent="" -O debian/pom.xml $(MAVEN_REPO)/$(DEB_VERSION_UPSTREAM)/osgi.cmpn-$(DEB_VERSION_UPSTREAM).pom


=====================================
debian/watch
=====================================
@@ -1,4 +1,5 @@
-version=4
-opts="repack,compression=xz,uversionmangle=s/-(alpha|beta)-/~$1/" \
-https://repo1.maven.org/maven2/org/osgi/osgi.cmpn/(\d.*)/\
- osgi.cmpn-(\d.*)-sources.jar
+Version: 5
+Source: https://repo1.maven.org/maven2/org/osgi/osgi.cmpn/([\d.]+)/
+Matching-Pattern: osgi.cmpn-([\d.]+)-sources\.jar
+Repack: yes
+Compression: xz



View it on GitLab: https://salsa.debian.org/java-team/osgi-compendium/-/compare/a130c9fecd86a7a1f9fa375704592ae869278c0c...4aaefa421d6c85e0acf5dbf76578684adea94b6a

-- 
View it on GitLab: https://salsa.debian.org/java-team/osgi-compendium/-/compare/a130c9fecd86a7a1f9fa375704592ae869278c0c...4aaefa421d6c85e0acf5dbf76578684adea94b6a
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/20261019/a2f99d50/attachment.htm>