[Git][java-team/bindex][master] 6 commits: Use the OSGi declarative services annotations

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / bindex


Commits:
1b86d146 by Emmanuel Bourg at 2026-10-15T16:21:56+02:00
Use the OSGi declarative services annotations

- - - - -
51b1b5ee by Emmanuel Bourg at 2026-10-15T16:21:56+02:00
Removed the Priority field

- - - - -
76eab977 by Emmanuel Bourg at 2026-10-15T16:21:56+02:00
Standards-Version updated to 4.7.4

- - - - -
d9a71d99 by Emmanuel Bourg at 2026-10-15T16:50:44+02:00
Switch to debhelper level 13

- - - - -
ed64a9fd by Emmanuel Bourg at 2026-10-16T00:55:47+02:00
Updated the Homepage field (Closes: #975083)

- - - - -
4256bcb2 by Emmanuel Bourg at 2026-10-16T01:00:10+02:00
Upload to unstable

- - - - -


7 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/osgi-ds-annotations.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+bindex (2.2+svn101-5) unstable; urgency=medium
+
+  * Team upload.
+  * Use the OSGi declarative services annotations (the annotations of bnd were
+    removed in the version 6.4.0)
+  * Updated the Homepage field (Closes: #975083)
+  * Removed the Priority field
+  * Standards-Version updated to 4.7.4
+  * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 15 Oct 2026 19:06:58 +0200
+
 bindex (2.2+svn101-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -1,23 +1,23 @@
 Source: bindex
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends:
  ant,
  bnd (>= 2.1.0),
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  javahelper,
  junit4,
  libfelix-osgi-obr-java,
  libkxml2-java,
+ libosgi-compendium-java,
  libosgi-core-java,
  libxpp3-java
-Standards-Version: 4.2.1
+Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/java-team/bindex.git
 Vcs-Browser: https://salsa.debian.org/java-team/bindex
-Homepage: http://www.osgi.org/Repository/BIndex
+Homepage: https://github.com/osgi/bindex
 
 Package: libbindex-java
 Architecture: all


=====================================
debian/copyright
=====================================
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: bindex
-Source: http://www.osgi.org/Repository/BIndex
+Source: https://github.com/osgi/bindex
 
 Files: *
 Copyright: OSGi Alliance (2002, 2006, 2007). All Rights Reserved.


=====================================
debian/patches/osgi-ds-annotations.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Use the OSGi declarative services annotations
+ The annotations of bnd were removed in the version 6.4.0, the standard OSGi
+ annotations replace them.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/org/osgi/impl/bundle/bindex/BundleIndexerImpl.java
++++ b/src/org/osgi/impl/bundle/bindex/BundleIndexerImpl.java
+@@ -25,7 +25,7 @@
+ import org.osgi.impl.bundle.obr.resource.*;
+ import org.osgi.service.bindex.*;
+ 
+-import aQute.bnd.annotation.component.*;
++import org.osgi.service.component.annotations.*;
+ 
+ /**
+  * BundleIndexer implementation based on Index


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 define_symbolic_name.diff
 ignore-tests.patch
+osgi-ds-annotations.patch


=====================================
debian/rules
=====================================
@@ -5,7 +5,7 @@ VERSION			:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/
 JAVA_HOME		:= /usr/lib/jvm/default-java/
 JAR_BASE		:= /usr/share/java
 export JH_JAR_EXTRA := NOTICE.txt LICENSE.txt about.html README
-export CLASSPATH :=/usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org.osgi.service.obr.jar:$(JAR_BASE)/osgi.core.jar:$(JAR_BASE)/junit4.jar:$(JAR_BASE)/bnd.annotation.jar
+export CLASSPATH :=/usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org.osgi.service.obr.jar:$(JAR_BASE)/osgi.core.jar:$(JAR_BASE)/junit4.jar:$(JAR_BASE)/osgi.cmpn.jar
 
 %:
 	dh $@ --with javahelper



View it on GitLab: https://salsa.debian.org/java-team/bindex/-/compare/a37c636c1dea8a9a2ce5635438a48f7da5bef487...4256bcb2badddcd24133c12e90c505260a23fce9

-- 
View it on GitLab: https://salsa.debian.org/java-team/bindex/-/compare/a37c636c1dea8a9a2ce5635438a48f7da5bef487...4256bcb2badddcd24133c12e90c505260a23fce9
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/20261015/3bea6f14/attachment.htm>