[Git][java-team/s2-geometry-library][master] 5 commits: Declare the dependency on jsr305, no longer provided by Guava (Closes: #1149759)

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / s2-geometry-library


Commits:
2b2fcefa by Emmanuel Bourg at 2026-10-18T01:39:46+02:00
Declare the dependency on jsr305, no longer provided by Guava (Closes: #1149759)

- - - - -
e0aa11d9 by Emmanuel Bourg at 2026-10-18T01:39:59+02:00
Converted debian/watch to the version 5 format

- - - - -
cebbd92c by Emmanuel Bourg at 2026-10-18T01:39:59+02:00
Standards-Version updated to 4.7.4

- - - - -
7ee5885e by Emmanuel Bourg at 2026-10-18T01:39:59+02:00
Removed the Priority field

- - - - -
bbc84044 by Emmanuel Bourg at 2026-10-18T10:53:52+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/declare-jsr305-dependency.patch
- + debian/patches/series
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+s2-geometry-library (1.0.1-4) unstable; urgency=medium
+
+  * Team upload.
+  * Declare the dependency on jsr305, no longer provided by Guava
+    (Closes: #1149759)
+  * Converted debian/watch to the version 5 format
+  * Standards-Version updated to 4.7.4
+  * Removed the Priority field
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 18 Oct 2026 10:53:33 +0200
+
 s2-geometry-library (1.0.1-3) unstable; urgency=medium
 
   * Remove homepage and update description. (Closes: #990674)


=====================================
debian/control
=====================================
@@ -1,11 +1,10 @@
 Source: s2-geometry-library
 Section: java
-Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
 Build-Depends: debhelper-compat (= 13), default-jdk,
- maven-debian-helper, libguava-java
-Standards-Version: 4.6.0.1
+ maven-debian-helper, libguava-java, libjsr305-java
+Standards-Version: 4.7.4
 Vcs-Git: https://salsa.debian.org/java-team/s2-geometry-library.git
 Vcs-Browser: https://salsa.debian.org/java-team/s2-geometry-library
 


=====================================
debian/patches/declare-jsr305-dependency.patch
=====================================
@@ -0,0 +1,21 @@
+Description: Declare the dependency on jsr305 explicitly
+ S2AreaCentroid uses javax.annotation.Nullable but the dependency was never
+ declared; it came transitively from Guava, which dropped it in 33.4.3 when it
+ moved its nullness annotations to JSpecify. The version is spelled out because
+ the io.sgr:common-dependencies BOM that managed it is ignored in Debian.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -57,6 +57,11 @@
+             <artifactId>guava</artifactId>
+         </dependency>
+         <dependency>
++            <groupId>com.google.code.findbugs</groupId>
++            <artifactId>jsr305</artifactId>
++            <version>3.0.2</version>
++        </dependency>
++        <dependency>
+             <groupId>junit</groupId>
+             <artifactId>junit</artifactId>
+         </dependency>


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+declare-jsr305-dependency.patch


=====================================
debian/watch
=====================================
@@ -1,3 +1,4 @@
-version=4
-opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/s2-geometry-library-java-$1\.tar\.gz/ \
-  https://github.com/io-sgr/s2-geometry-library-java/tags .*/v?(\d\S+)\.tar\.gz
+Version: 5
+Template: GitHub
+Owner: io-sgr
+Project: s2-geometry-library-java



View it on GitLab: https://salsa.debian.org/java-team/s2-geometry-library/-/compare/233f542d78b3ff91daa42fe49a79a8f1dbc8fe1b...bbc84044ced59d2c42f5991605844b970be923cd

-- 
View it on GitLab: https://salsa.debian.org/java-team/s2-geometry-library/-/compare/233f542d78b3ff91daa42fe49a79a8f1dbc8fe1b...bbc84044ced59d2c42f5991605844b970be923cd
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/20261018/c587cd0e/attachment.htm>