Tony Mancill pushed to branch master at Debian Java Maintainers / gnome-split
Commits:
b3e27513 by tony mancill at 2021-02-07T12:44:16-08:00
Patch configure to build with -ea releases of JDK (Closes: #981862)
- - - - -
e1eeba21 by tony mancill at 2021-02-07T12:45:23-08:00
Update Vcs URLs to point to Salsa
- - - - -
477aef9b by tony mancill at 2021-02-07T12:46:02-08:00
Use debhelper-compat 13
- - - - -
2240c491 by tony mancill at 2021-02-07T12:47:02-08:00
Set Rules-Requires-Root: no in debian/control
- - - - -
fa8ab8ab by tony mancill at 2021-02-07T12:47:30-08:00
prepare changelog for upload to unstable
- - - - -
5 changed files:
- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/03_java17_compatibility.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+gnome-split (1.2-4) unstable; urgency=medium
+
+ * Team upload.
+ * Patch configure to build with -ea releases of JDK (Closes: #981862)
+ * Update Vcs URLs to point to Salsa
+ * Use debhelper-compat 13
+ * Set Rules-Requires-Root: no in debian/control
+
+ -- tony mancill <tmanc...@debian.org> Sun, 07 Feb 2021 12:47:05 -0800
+
gnome-split (1.2-3) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -3,13 +3,14 @@ Section: gnome
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintain...@lists.alioth.debian.org>
Uploaders: Guillaume Mazoyer <respawne...@gmail.com>
-Build-Depends: debhelper (>= 11),
+Build-Depends: debhelper-compat (= 13),
default-jdk,
libjava-gnome-java (>= 4.1.3)
-Standards-Version: 4.2.0
+Standards-Version: 4.5.1
Homepage: https://github.com/respawner/gnome-split
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/gnome-split.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/gnome-split.git
+Vcs-Git: https://salsa.debian.org/java-team/gnome-split.git
+Vcs-Browser: https://salsa.debian.org/java-team/gnome-split
+Rules-Requires-Root: no
Package: gnome-split
Architecture: all
=====================================
debian/patches/03_java17_compatibility.patch
=====================================
@@ -0,0 +1,42 @@
+Author: tony mancill <tmanc...@debian.org>
+Description: Allow compilation with EA JDK versions, e.g. "17-ea"
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=981862
+
+--- a/configure
++++ b/configure
+@@ -301,22 +301,25 @@
+
+ my $output = `$program -version 2>&1 | grep 'version "'`;
+ $output =~ s/.*version \"(.*)\".*/$1/g;
+- my @version = split(/[\.\-\_]/, $output);
+
+- for (my $i = 0; $i < 3; $i++) {
+- chomp $version[$i];
++ # allow "$version-ea" early adopter releases of JVM
++ unless ($output =~ /^\d+-ea$/) {
++ my @version = split(/[\.\-\_]/, $output);
++ for (my $i = 0; $i < 3; $i++) {
++ chomp $version[$i];
+
+- if (!($version[$i] =~ /^\d+$/)) {
+- output "can't parse version\n";
++ if (!($version[$i] =~ /^\d+$/)) {
++ output "can't parse version\n";
++ $$scalarref = "";
++ return
++ }
++ }
++ if (($version[0] < 1) || ($version[0] == 1 && ($version[1] < 4
|| ($version[1] == 4 && $version[2] < 2)))) {
++ output "not >= 1.4.2\n";
+ $$scalarref = "";
+ return
+ }
+ }
+- if (($version[0] < 1) || ($version[0] == 1 && ($version[1] < 4 ||
($version[1] == 4 && $version[2] < 2)))) {
+- output "not >= 1.4.2\n";
+- $$scalarref = "";
+- return
+- }
+
+ $output = `$program $args Hello 2>/dev/null`;
+ chomp $output;
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
01_manifest_main_class.patch
02_java9_compatibility.patch
+03_java17_compatibility.patch
View it on GitLab:
https://salsa.debian.org/java-team/gnome-split/-/compare/9c52463c4e278c541c8eb0277738c19ca4a77a33...fa8ab8ab790723bcfb748f177e7c7fcf22337ec1
--
View it on GitLab:
https://salsa.debian.org/java-team/gnome-split/-/compare/9c52463c4e278c541c8eb0277738c19ca4a77a33...fa8ab8ab790723bcfb748f177e7c7fcf22337ec1
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
