[Git][java-team/osgi-annotation][master] 6 commits: Removed the libosgi-annotation-java-doc package

[Emmanuel Bourg (@ebourg)]

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


Commits:
03b19d58 by Emmanuel Bourg at 2026-10-19T15:49:14+02:00
Removed the libosgi-annotation-java-doc package

- - - - -
6b1b8633 by Emmanuel Bourg at 2026-10-19T15:49:14+02:00
Embed the Maven metadata in the jar

- - - - -
47ca9b6f by Emmanuel Bourg at 2026-10-19T15:49:14+02:00
Converted debian/watch to version 5 format

- - - - -
a90d6972 by Emmanuel Bourg at 2026-10-19T15:49:14+02:00
Standards-Version updated to 4.7.4

- - - - -
18932948 by Emmanuel Bourg at 2026-10-19T15:49:14+02:00
Removed the Priority field

- - - - -
e9e9bee4 by Emmanuel Bourg at 2026-10-19T16:53:38+02:00
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- debian/control
- − debian/libosgi-annotation-java-doc.javadoc
- + debian/maven-metadata/META-INF/maven/org.osgi/osgi.annotation/pom.properties
- + debian/maven-metadata/META-INF/maven/org.osgi/osgi.annotation/pom.xml
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+osgi-annotation (8.1.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Removed the libosgi-annotation-java-doc package
+  * Embed the Maven metadata in the jar
+  * Converted debian/watch to version 5 format
+  * Standards-Version updated to 4.7.4
+  * Removed the Priority field
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 19 Oct 2026 16:53:30 +0200
+
 osgi-annotation (8.1.0-1) unstable; urgency=medium
 
   * New upstream version 8.1.0.


=====================================
debian/control
=====================================
@@ -1,6 +1,5 @@
 Source: osgi-annotation
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders:
  Markus Koschany <apo at debian.org>
@@ -10,7 +9,7 @@ Build-Depends:
  default-jdk,
  javahelper,
  maven-repo-helper
-Standards-Version: 4.6.1
+Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/java-team/osgi-annotation.git
 Vcs-Browser: https://salsa.debian.org/java-team/osgi-annotation
 Homepage: https://www.osgi.org/
@@ -20,8 +19,6 @@ Architecture: all
 Depends:
  ${java:Depends},
  ${misc:Depends}
-Suggests:
- libosgi-annotation-java-doc
 Description: Java OSGi API - annotation module
  OSGi, for Open Services Gateway initiative framework, is a module system and
  service platform for the Java programming language.
@@ -30,16 +27,3 @@ Description: Java OSGi API - annotation module
  .
  On top of OSGi Core it provides additional services to help dynamic
  components.
-
-Package: libosgi-annotation-java-doc
-Architecture: all
-Section: doc
-Depends:
- ${misc:Depends}
-Recommends:
- ${java:Recommends}
-Description: Javadoc for Java OSGi API - annotation module
- OSGi, for Open Services Gateway initiative framework, is a module system and
- service platform for the Java programming language.
- .
- This package contains Javadoc HTML documentation for libosgi-annotation-java.


=====================================
debian/libosgi-annotation-java-doc.javadoc deleted
=====================================
@@ -1 +0,0 @@
-internal


=====================================
debian/maven-metadata/META-INF/maven/org.osgi/osgi.annotation/pom.properties
=====================================
@@ -0,0 +1,3 @@
+version=8.1.0
+groupId=org.osgi
+artifactId=osgi.annotation


=====================================
debian/maven-metadata/META-INF/maven/org.osgi/osgi.annotation/pom.xml
=====================================
@@ -0,0 +1 @@
+../../../../../pom.xml
\ No newline at end of file


=====================================
debian/rules
=====================================
@@ -10,5 +10,11 @@ PACKAGE := libosgi-annotation-java
 %:
 	dh $@ --with javahelper --with jh_maven_repo_helper
 
+override_jh_build:
+	jh_build --no-javadoc
+
 get-orig-pom:
 	wget --user-agent="" -O debian/pom.xml $(MAVEN_REPO)/$(VERSION)/osgi.annotation-$(VERSION).pom
+
+execute_after_jh_build:
+	jar uf $(JAR_NAME).jar -C debian/maven-metadata META-INF


=====================================
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.annotation/(\d.*)/\
- osgi.annotation-(\d.*)-sources.jar
+Version: 5
+Source: https://repo1.maven.org/maven2/org/osgi/osgi.annotation/([\d.]+)/
+Matching-Pattern: osgi.annotation-([\d.]+)-sources\.jar
+Repack: yes
+Compression: xz



View it on GitLab: https://salsa.debian.org/java-team/osgi-annotation/-/compare/1b834b2922585992ceefa311b51994abcc829481...e9e9bee4e0b63436d8b5ef1377450d74793294e6

-- 
View it on GitLab: https://salsa.debian.org/java-team/osgi-annotation/-/compare/1b834b2922585992ceefa311b51994abcc829481...e9e9bee4e0b63436d8b5ef1377450d74793294e6
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/47e8bb6a/attachment.htm>