[Git][java-team/commons-daemon][master] 12 commits: Add patch to build on riscv64 (Closes: #1010381)
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Mon May 2 05:18:10 BST 2022
Tony Mancill pushed to branch master at Debian Java Maintainers / commons-daemon
Commits:
cfd13584 by tony mancill at 2022-05-01T18:52:40-07:00
Add patch to build on riscv64 (Closes: #1010381)
Thank you to Bo YU for the patch.
- - - - -
91fec76a by tony mancill at 2022-05-01T18:53:52-07:00
Update Uploaders (Closes: #889446)
- - - - -
483af557 by tony mancill at 2022-05-01T20:27:52-07:00
Add patch to locate recent JDKs (Closes: #935336)
Thank you to Graeme Vetterlein for the patch.
- - - - -
8f0299ae by tony mancill at 2022-05-01T20:35:05-07:00
Update Vcs URLs to point to Salsa
- - - - -
1273fb59 by tony mancill at 2022-05-01T20:35:17-07:00
Update debian/copyright
Gbp-Dch: ignore
- - - - -
ba9b99e6 by tony mancill at 2022-05-01T21:08:54-07:00
Remove get-orig-source target from debian/rules
- - - - -
24a12dd1 by tony mancill at 2022-05-01T21:08:54-07:00
Remove unnecessary "--with autotools_dev" from dh sequencer
- - - - -
db294654 by tony mancill at 2022-05-01T21:08:54-07:00
Set Rules-Requires-Root: no in debian/control
- - - - -
b5fe5eef by tony mancill at 2022-05-01T21:08:54-07:00
Use debhelper-compat 13
- - - - -
f072fa11 by tony mancill at 2022-05-01T21:08:54-07:00
Remove Build-Depends on autotools_dev
- - - - -
6316cad8 by tony mancill at 2022-05-01T21:08:54-07:00
Bump Standards-Version to 4.6.0
- - - - -
26889002 by tony mancill at 2022-05-01T21:10:36-07:00
Prepare changelog for upload to unstable
- - - - -
8 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/debian-935336.patch
- + debian/patches/risv64.diff
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+commons-daemon (1.0.15-9) unstable; urgency=medium
+
+ * Team upload.
+ * Add patch to build on riscv64 (Closes: #1010381)
+ * Update Uploaders (Closes: #889446)
+ * Add patch to locate recent JDKs (Closes: #935336)
+ * Update Vcs URLs to point to Salsa
+ * Remove get-orig-source target from debian/rules
+ * Remove unnecessary "--with autotools_dev" from dh sequencer
+ * Remove Build-Depends on autotools_dev
+ * Set Rules-Requires-Root: no in debian/control
+ * Use debhelper-compat 13
+ * Bump Standards-Version to 4.6.0
+
+ -- tony mancill <tmancill at debian.org> Sun, 01 May 2022 21:07:56 -0700
+
commons-daemon (1.0.15-8) unstable; urgency=medium
* Team upload.
@@ -385,4 +401,3 @@ commons-daemon (1.0-1) unstable; urgency=low
* Initial Release.
-- Arnaud Vandyck <avdyk at debian.org> Sat, 9 Oct 2004 17:51:44 +0200
-
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9
=====================================
debian/control
=====================================
@@ -3,22 +3,21 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Marcus Better <marcus at better.se>,
- Damien Raude-Morvan <drazzib at debian.org>,
Emmanuel Bourg <ebourg at apache.org>
Build-Depends: ant,
autoconf,
- autotools-dev,
- debhelper (>= 9),
+ debhelper-compat (= 13),
default-jdk (>= 2:1.8),
docbook-xsl,
libcap-dev [linux-any],
maven-repo-helper,
xsltproc
Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/commons-daemon.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/commons-daemon.git
-Homepage: http://commons.apache.org/daemon/
+Standards-Version: 4.6.0
+Vcs-Git: https://salsa.debian.org/java-team/commons-daemon.git
+Vcs-Browser: https://salsa.debian.org/java-team/commons-daemon
+Homepage: https://commons.apache.org/proper/commons-daemon/
+Rules-Requires-Root: no
Package: libcommons-daemon-java
Architecture: all
=====================================
debian/copyright
=====================================
@@ -1,7 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Apache Commons Daemon
Upstream-Contact: Apache Commons Developers <dev at commons.apache.org>
-Source: http://commons.apache.org/daemon/
+Source: https://commons.apache.org/proper/commons-daemon/
Files: *
Copyright: 1999-2011 The Apache Software Foundation.
@@ -14,6 +14,7 @@ Files: debian/*
Copyright: 2004, Arnaud Vandyck <avdyk at debian.org>
2006 Marcus Better
2010-2011, Damien Raude-Morvan
+ 2022, tony mancill <tmancill at debian.org>
License: Apache-2.0
License: Apache-2.0
=====================================
debian/patches/debian-935336.patch
=====================================
@@ -0,0 +1,14 @@
+Description: locate more recent JVM (including OpenJDK)
+Author: Graeme Vetterlein <graeme.reportbug at vetterlein.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=935336
+
+--- a/src/native/unix/native/location.c
++++ b/src/native/unix/native/location.c
+@@ -115,6 +115,7 @@
+ "$JAVA_HOME/jre/lib/libjvm.so",
+ "$JAVA_HOME/lib/classic/libjvm.so",
+ "$JAVA_HOME/lib/client/libjvm.so",
++ "$JAVA_HOME/lib/server/libjvm.so",
+ "$JAVA_HOME/lib/libjvm.so",
+ "$JAVA_HOME/jre/bin/classic/libjvm.so",
+ "$JAVA_HOME/jre/bin/client/libjvm.so",
=====================================
debian/patches/risv64.diff
=====================================
@@ -0,0 +1,32 @@
+Description: address FTBFS on riscv64
+Author: Bo YU <tsu.yubo at gmail.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010381
+
+--- a/src/native/unix/configure
++++ b/src/native/unix/configure
+@@ -2707,6 +2707,11 @@
+ supported_os="ppc64le"
+ HOST_CPU=ppc64le
+ ;;
++ riscv64)
++ CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\""
++ supported_os="riscv64"
++ HOST_CPU=riscv64
++ ;;
+ *)
+ echo "$as_me:$LINENO: result: failed" >&5
+ echo "${ECHO_T}failed" >&6
+--- a/src/native/unix/support/apsupport.m4
++++ b/src/native/unix/support/apsupport.m4
+@@ -186,6 +186,11 @@
+ supported_os="ppc64le"
+ HOST_CPU=ppc64le
+ ;;
++ riscv64)
++ CFLAGS="$CFLAGS -DCPU=\\\"riscv64\\\""
++ supported_os="riscv64"
++ HOST_CPU=riscv64
++ ;;
+ *)
+ AC_MSG_RESULT([failed])
+ AC_MSG_ERROR([Unsupported CPU architecture "$host_cpu"]);;
=====================================
debian/patches/series
=====================================
@@ -5,3 +5,5 @@ hurd_support.diff
mips_abi_n32_n64_support.diff
arm64.diff
ppc64el.diff
+risv64.diff
+debian-935336.patch
=====================================
debian/rules
=====================================
@@ -16,7 +16,7 @@ include /usr/share/java/java_defaults.mk
export DEB_CPPFLAGS_MAINT_APPEND = ${jvm_includes}
%:
- dh $@ --sourcedirectory=$(NATIVE_SRC) --buildsystem=autoconf --with autotools_dev
+ dh $@ --sourcedirectory=$(NATIVE_SRC) --buildsystem=autoconf
override_dh_auto_configure:
(cd $(NATIVE_SRC); autoconf)
@@ -38,6 +38,3 @@ override_dh_auto_install:
dh_auto_install
mh_installpoms -plib$(PKGNAME)-java
mh_installjar -plib$(PKGNAME)-java -l pom.xml dist/$(PKGNAME)-$(VERSION).jar
-
-get-orig-source:
- uscan --force-download --rename
View it on GitLab: https://salsa.debian.org/java-team/commons-daemon/-/compare/7dc099666e81d4d50a76bed12abb825d23312ac6...268890025dde188cf8f69282a20efedbfe9fa559
--
View it on GitLab: https://salsa.debian.org/java-team/commons-daemon/-/compare/7dc099666e81d4d50a76bed12abb825d23312ac6...268890025dde188cf8f69282a20efedbfe9fa559
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/20220502/81597ba2/attachment.htm>
More information about the pkg-java-commits
mailing list