[Git][java-team/sbt-ivy][master] 5 commits: Fixed the build failure with OpenJDK 17 (Closes: #1011610)

[Emmanuel Bourg (@ebourg)]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / sbt-ivy


Commits:
426635d1 by Emmanuel Bourg at 2022-06-02T12:28:48+02:00
Fixed the build failure with OpenJDK 17 (Closes: #1011610)

- - - - -
0fba3759 by Emmanuel Bourg at 2022-06-02T12:31:12+02:00
Removed the doc package

- - - - -
2c13d8ea by Emmanuel Bourg at 2022-06-02T12:31:18+02:00
Standards-Version updated to 4.6.1

- - - - -
92e31aa7 by Emmanuel Bourg at 2022-06-02T12:31:35+02:00
Switch to debhelper level 13

- - - - -
6547577c by Emmanuel Bourg at 2022-06-02T12:33:35+02:00
Upload to unstable

- - - - -


7 changed files:

- debian/build.xml
- debian/changelog
- − debian/compat
- debian/control
- debian/rules
- − debian/sbt-ivy-doc.doc-base.api
- − debian/sbt-ivy-doc.install


Changes:

=====================================
debian/build.xml
=====================================
@@ -27,8 +27,7 @@
 
   <target name="compile">
     <mkdir dir="${class.dir}" />
-    <javac srcdir="${source.dir}" destdir="${class.dir}"
-	   debug="true" source="1.5" target="1.5"/>
+    <javac srcdir="${source.dir}" destdir="${class.dir}" debug="true" release="8"/>
     <copy todir="${class.dir}">
       <fileset dir="${source.dir}">
         <patternset refid="compiler.resources" />
@@ -58,10 +57,4 @@
     <jar jarfile="${jar.name}" basedir="${class.dir}" manifest="META-INF/MANIFEST.MF"/>
   </target>
 
-  <target name="javadoc" description="Creates Javadoc documentation">
-    <mkdir dir="${doc.dir}" />
-    <javadoc packagenames="*" locale="en" additionalparam="-notimestamp"
-    sourcepath="${source.dir}" destdir="${doc.dir}" />
-  </target>
-
 </project>


=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+sbt-ivy (2.4.0~rc1+dfsg-3) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with OpenJDK 17 (Closes: #1011610)
+  * Removed the doc package
+  * Standards-Version updated to 4.6.1
+  * Switch to debhelper level 13
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 02 Jun 2022 12:31:51 +0200
+
 sbt-ivy (2.4.0~rc1+dfsg-2) unstable; urgency=medium
 
   * Team upload.


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


=====================================
debian/control
=====================================
@@ -5,9 +5,8 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Frédéric Bonnard <frediz at linux.vnet.ibm.com>
 Build-Depends:
  ant,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
- default-jdk-doc,
  junit,
  libbcpg-java,
  libbcprov-java,
@@ -20,7 +19,7 @@ Build-Depends:
  libjsch-java,
  liboro-java,
  maven-repo-helper
-Standards-Version: 4.2.1
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/java-team/sbt-ivy.git
 Vcs-Browser: https://salsa.debian.org/java-team/sbt-ivy
 Homepage: https://github.com/sbt/ivy
@@ -33,7 +32,6 @@ Depends:
  ${misc:Depends}
 Suggests:
  default-jre | java2-runtime,
- ivy-doc,
  libbcpg-java,
  libbcprov-java,
  libjsch-agent-proxy-java,
@@ -43,15 +41,3 @@ Description: agile dependency manager
  Ivy is a very powerful dependency manager oriented toward Java
  dependency management, even though it could be used to manage
  dependencies of any kind.
-
-Package: sbt-ivy-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}, default-jdk-doc
-Description: agile dependency manager (documentation)
- Sbt Ivy is patched Apache Ivy for sbt.
- Ivy is a very powerful dependency manager oriented toward Java
- dependency management, even though it could be used to manage
- dependencies of any kind.
- .
- This package contains the documentation.


=====================================
debian/rules
=====================================
@@ -22,7 +22,7 @@ export CLASSPATH=/usr/share/java/commons-httpclient.jar \
 	dh $@ --buildsystem=ant --with maven-repo-helper
 
 override_dh_auto_build:
-	dh_auto_build -- -f debian/build.xml jar javadoc
+	dh_auto_build -- -f debian/build.xml jar
 
 get-orig-pom:
 	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/org/scala-sbt/ivy/ivy/$(MVN_VERSION)/ivy-$(MVN_VERSION).pom


=====================================
debian/sbt-ivy-doc.doc-base.api deleted
=====================================
@@ -1,9 +0,0 @@
-Document: sbt-ivy
-Title: API for sbt-ivy
-Author: The Apache Software Foundation
-Abstract: The agile dependency manager
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/sbt-ivy/api/index.html
-Files: /usr/share/doc/sbt-ivy/api/*.html


=====================================
debian/sbt-ivy-doc.install deleted
=====================================
@@ -1 +0,0 @@
-api      usr/share/doc/sbt-ivy



View it on GitLab: https://salsa.debian.org/java-team/sbt-ivy/-/compare/e27b1919f5fdf411cf21327faf1936fc4a686168...6547577c564216c7e5b0e389a8b0ac0c8fae9188

-- 
View it on GitLab: https://salsa.debian.org/java-team/sbt-ivy/-/compare/e27b1919f5fdf411cf21327faf1936fc4a686168...6547577c564216c7e5b0e389a8b0ac0c8fae9188
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220602/e9c2f2b8/attachment.htm>