[Git][java-team/intellij-annotations][master] 6 commits: Fixed the compatibility with Gradle 5
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Thu Nov 5 09:20:18 GMT 2026
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / intellij-annotations
Commits:
98560534 by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Fixed the compatibility with Gradle 5
- - - - -
9cac7123 by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Standards-Version updated to 4.7.4
- - - - -
4aa2f525 by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Removed the Priority field
- - - - -
bff39b8c by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Converted debian/watch to the version 5 format
- - - - -
aa3a07e3 by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Removed the libjetbrains-annotations-java-doc and libintellij-annotations-java-doc packages (Closes: #1032761)
- - - - -
609ba522 by Emmanuel Bourg at 2026-11-05T09:48:29+01:00
Upload to unstable
- - - - -
9 changed files:
- debian/changelog
- debian/control
- − debian/libintellij-annotations-java-doc.links
- − debian/libjetbrains-annotations-java-doc.doc-base
- − debian/libjetbrains-annotations-java-doc.install
- + debian/patches/gradle-compatibility.patch
- debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+intellij-annotations (23.0.0-3) unstable; urgency=medium
+
+ * Team upload.
+ * Fixed the compatibility with Gradle 5
+ * Removed the libjetbrains-annotations-java-doc and
+ libintellij-annotations-java-doc packages (Closes: #1032761)
+ * Standards-Version updated to 4.7.4
+ * Removed the Priority field
+ * Converted debian/watch to the version 5 format
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 05 Nov 2026 09:11:06 +0100
+
intellij-annotations (23.0.0-2) unstable; urgency=medium
* Fix debian/watch file.
=====================================
debian/control
=====================================
@@ -1,6 +1,5 @@
Source: intellij-annotations
Section: java
-Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders:
Markus Koschany <apo at debian.org>,
@@ -9,9 +8,8 @@ Build-Depends:
debhelper-compat (= 13),
gradle-debian-helper,
maven-repo-helper,
- default-jdk,
- default-jdk-doc
-Standards-Version: 4.6.2
+ default-jdk
+Standards-Version: 4.7.4
Vcs-Git: https://salsa.debian.org/java-team/intellij-annotations.git
Vcs-Browser: https://salsa.debian.org/java-team/intellij-annotations
Homepage: https://github.com/JetBrains/java-annotations/
@@ -23,8 +21,6 @@ Depends:
${java:Depends},
${misc:Depends},
libjetbrains-annotations-java (>= ${source:Version})
-Suggests:
- libjetbrains-annotations-java-doc
Description: transitional package for libjetbrains-annotations-java
JetBrains Annotations is a set of annotations used for code inspection
support and code documentation. It is part of the IntelliJ IDEA Community
@@ -43,46 +39,8 @@ Replaces:
libintellij-annotations-java (<< 16.0.2-4)
Breaks:
libintellij-annotations-java (<< 16.0.2-4)
-Suggests:
- libjetbrains-annotations-java-doc
Description: annotations used for code inspection support and code documentation
JetBrains Annotations is a set of annotations used for code inspection
support and code documentation. It is part of the IntelliJ IDEA Community
Edition and can be used among other things to annotate String fields, local
variables, method parameters and methods returning Strings.
-
-Package: libintellij-annotations-java-doc
-Architecture: all
-Section: oldlibs
-Depends:
- ${misc:Depends},
- libjetbrains-annotations-java-doc (>= ${source:Version})
-Recommends:
- ${java:Recommends}
-Description: transitional package for libjetbrains-annotations-java-doc
- JetBrains Annotations is a set of annotations used for code inspection
- support and code documentation. It is part of the IntelliJ IDEA Community
- Edition and can be used among other things to annotate String fields, local
- variables, method parameters and methods returning Strings.
- .
- This package contains symlinks to the actual documentation now in
- libjetbrains-annotations-java, and can be safely removed.
-
-Package: libjetbrains-annotations-java-doc
-Architecture: all
-Section: doc
-Depends:
- ${misc:Depends}
-Recommends:
- ${java:Recommends}
-Replaces:
- libintellij-annotations-java-doc (<< 16.0.2-4)
-Breaks:
- libintellij-annotations-java-doc (<< 16.0.2-4)
-Description: documentation for libjetbrains-annotations-java
- JetBrains Annotations is a set of annotations used for code inspection
- support and code documentation. It is part of the IntelliJ IDEA Community
- Edition and can be used among other things to annotate String fields, local
- variables, method parameters and methods returning Strings.
- .
- This package contains documentation for libjetbrains-annotations-java.
=====================================
debian/libintellij-annotations-java-doc.links deleted
=====================================
@@ -1 +0,0 @@
-/usr/share/doc/libjetbrains-annotations-java/api /usr/share/doc/libintellij-annotations-java/api
=====================================
debian/libjetbrains-annotations-java-doc.doc-base deleted
=====================================
@@ -1,9 +0,0 @@
-Document: libjetbrains-annotations-java
-Title: API JavaDoc for libjetbrains-annotations-java
-Author: The authors of libjetbrains-annotations-java
-Abstract: This is the API JavaDoc for libjetbrains-annotations-java
-Section: Programming/Java
-
-Format: HTML
-Index: /usr/share/doc/libjetbrains-annotations-java/api/index.html
-Files: /usr/share/doc/libjetbrains-annotations-java/api/*.html
=====================================
debian/libjetbrains-annotations-java-doc.install deleted
=====================================
@@ -1 +0,0 @@
-java8/build/docs/javadoc/* /usr/share/doc/libjetbrains-annotations-java/api
=====================================
debian/patches/gradle-compatibility.patch
=====================================
@@ -0,0 +1,17 @@
+Description: Fix the compatibility with Gradle 5
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -46,6 +46,11 @@
+ project(':java8').archivesBaseName = 'annotations'
+
+ configure([project(':java8')]) {
++ def javaExtension = extensions.findByName('java')
++ if (javaExtension?.respondsTo('disableAutoTargetJvm')) {
++ javaExtension.disableAutoTargetJvm()
++ }
++
+ dependencies {
+ compile project(':module-info')
+ }
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
build.patch
+gradle-compatibility.patch
=====================================
debian/rules
=====================================
@@ -8,7 +8,7 @@ export DEB_VERSION_UPSTREAM
dh $@ --buildsystem=gradle --with maven-repo-helper
override_dh_auto_build:
- dh_auto_build -- -p java8 assemble javadoc
+ dh_auto_build -- -p java8 assemble
override_mh_install:
mh_install
=====================================
debian/watch
=====================================
@@ -1,3 +1,6 @@
-version=4
-opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/,uversionmangle=s/-beta/~beta/;s/-rc/~rc/ \
-https://github.com/JetBrains/java-annotations/tags .*/@ANY_VERSION@@ARCHIVE_EXT@
+Version: 5
+Mode: git
+Source: https://github.com/JetBrains/java-annotations
+Matching-Pattern: refs/tags/([\d.]+)
+Repack: yes
+Compression: xz
View it on GitLab: https://salsa.debian.org/java-team/intellij-annotations/-/compare/9e5faeca430a85d481355c3b3d5ed30ffc3bdca9...609ba522b5c8ff77ecf641175615a94ed618722a
--
View it on GitLab: https://salsa.debian.org/java-team/intellij-annotations/-/compare/9e5faeca430a85d481355c3b3d5ed30ffc3bdca9...609ba522b5c8ff77ecf641175615a94ed618722a
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/20261105/63dc6e5c/attachment.htm>
More information about the pkg-java-commits
mailing list