[Git][java-team/icu4j-4.4][master] 8 commits: Standards-Version updated to 4.5.1

Mon Feb 8 12:15:31 GMT 2021


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / icu4j-4.4


Commits:
b2302440 by Emmanuel Bourg at 2021-02-08T13:11:00+01:00
Standards-Version updated to 4.5.1

- - - - -
27f48762 by Emmanuel Bourg at 2021-02-08T13:11:04+01:00
Wrap and sort

- - - - -
a79eb86e by Emmanuel Bourg at 2021-02-08T13:11:04+01:00
Switch to debhelper level 13

- - - - -
ff69943c by Emmanuel Bourg at 2021-02-08T13:11:04+01:00
Use salsa.debian.org Vcs-* URLs

- - - - -
3d234c81 by Emmanuel Bourg at 2021-02-08T13:11:04+01:00
Fixed the build failure with OpenJDK 17 (Closes: #981953)

- - - - -
1c5bfdf1 by Emmanuel Bourg at 2021-02-08T13:11:04+01:00
Updated the watch file and removed debian/orig-tar.sh

- - - - -
9cce665e by Emmanuel Bourg at 2021-02-08T13:13:03+01:00
No longer install the change report

- - - - -
2c890717 by Emmanuel Bourg at 2021-02-08T13:15:15+01:00
Upload to unstable

- - - - -


9 changed files:

- debian/changelog
- âˆ’ debian/compat
- debian/control
- âˆ’ debian/docs
- âˆ’ debian/orig-tar.sh
- + debian/patches/02-java17-compatibility.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+icu4j-4.4 (4.4.2.2-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure with OpenJDK 17 (Closes: #981953)
+  * No longer install the change report
+  * Standards-Version updated to 4.5.1
+  * Switch to debhelper level 13
+  * Use salsa.debian.org Vcs-* URLs
+  * Updated the watch file and removed debian/orig-tar.sh
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 08 Feb 2021 13:15:10 +0100
+
 icu4j-4.4 (4.4.2.2-3) unstable; urgency=medium
 
   * Team upload.


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


=====================================
debian/control
=====================================
@@ -3,11 +3,16 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: debhelper (>= 11), ant (>= 1.7.0), default-jdk, unzip,
- javahelper, zip
-Standards-Version: 4.1.3
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/icu4j-4.4.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/icu4j-4.4.git
+Build-Depends:
+ ant (>= 1.7.0),
+ debhelper-compat (= 13),
+ default-jdk,
+ javahelper,
+ unzip,
+ zip
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/java-team/icu4j-4.4.git
+Vcs-Browser: https://salsa.debian.org/java-team/icu4j-4.4
 Homepage: http://www.icu-project.org
 
 Package: libicu4j-4.4-java


=====================================
debian/docs deleted
=====================================
@@ -1 +0,0 @@
-APIChangeReport.html


=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-TMPDIR=`mktemp -d`
-[ -d $TMPDIR ] || exit 1
-TMPDIR=`cd $TMPDIR > /dev/null && pwd`
-VERSION=$2
-VERSION_FLAT=`echo $VERSION | sed "s/\./_/g"`
-MAJOR=`echo $VERSION | cut -d . -f 1,2`
-
-mkdir $TMPDIR/icu4j-$MAJOR
-echo "Unzipping..."
-unzip -qq -d $TMPDIR/icu4j-$MAJOR $3
-rm -f $3
-echo "Tar'ing..."
-tar -c -z -f ../icu4j-${MAJOR}_$VERSION.orig.tar.gz -C $TMPDIR icu4j-$MAJOR
-rm -fr $TMPDIR
-echo ../icu4j-${MAJOR}_$VERSION.orig.tar.gz


=====================================
debian/patches/02-java17-compatibility.patch
=====================================
@@ -0,0 +1,17 @@
+Description: Fixes the detection of the JDK to allow the compilation with Java 17.
+ Do not compile the build tools which relies on internal JDK classes
+ no longer available in Java 17.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/tools/build/build.xml
++++ b/tools/build/build.xml
+@@ -32,6 +32,9 @@
+             debug="${javac.debug}">
+             <compilerarg value="${javac.compilerarg}"/>
+             <exclude name="**/ICUTaglet*"/>
++            <exclude name="**/docs/CheckAPI*"/>
++            <exclude name="**/docs/CheckTags*"/>
++            <exclude name="**/docs/GatherAPIData*"/>
+         </javac>
+     </target>
+ 


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 01-java8-compatibility.patch
+02-java17-compatibility.patch


=====================================
debian/rules
=====================================
@@ -27,6 +27,3 @@ override_dh_install:
 override_dh_auto_clean:
 	jh_clean
 	rm -f *.jar
-
-get-orig-source:
-	uscan --rename --force-download


=====================================
debian/watch
=====================================
@@ -1,6 +1,3 @@
-version=3
-
-# This is not useful for finding the source, but provides a decent version tracker
-opts="uversionmangle=s?_?.?g" \
-http://download.icu-project.org/files/icu4j/(4\.4\.[\d.]*)/icu4j-([[:digit:]_]+)-src\.jar \
-  debian debian/orig-tar.sh
+version=4
+opts="mode=git,uversionmangle=s/-/./g" \
+https://github.com/unicode-org/icu refs/tags/icu(?:4j)?-release-(4-4[\d-]*)



View it on GitLab: https://salsa.debian.org/java-team/icu4j-4.4/-/compare/ed56a776da706040df2093d26b38d3c8da28aa49...2c890717bd15a556192763c3c07089da66e1e88a

-- 
View it on GitLab: https://salsa.debian.org/java-team/icu4j-4.4/-/compare/ed56a776da706040df2093d26b38d3c8da28aa49...2c890717bd15a556192763c3c07089da66e1e88a
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/20210208/795dbee7/attachment.html>
