[Git][java-team/commons-daemon][master] 8 commits: Apply patch for FTBFS w/GCC-15 (Closes: #1096455)
Tony Mancill (@tmancill)
gitlab at salsa.debian.org
Sun Sep 21 23:44:40 BST 2025
Tony Mancill pushed to branch master at Debian Java Maintainers / commons-daemon
Commits:
52ffd6bd by tony mancill at 2025-09-21T15:43:31-07:00
Apply patch for FTBFS w/GCC-15 (Closes: #1096455)
- - - - -
08cd3b30 by tony mancill at 2025-09-21T15:43:31-07:00
libcommons-daemon-java is now marked Multi-Arch: foreign
- - - - -
a58f5c69 by tony mancill at 2025-09-21T15:43:31-07:00
Update debian/watch to version 5
- - - - -
c2f42f9d by tony mancill at 2025-09-21T15:43:31-07:00
Freshen years in debian/copyright
- - - - -
ebd4a55e by tony mancill at 2025-09-21T15:43:31-07:00
Freshen patch with invalid metadata
- - - - -
f6157e28 by tony mancill at 2025-09-21T15:43:31-07:00
Bump Standards-Version to 4.7.2
- - - - -
477cff8f by tony mancill at 2025-09-21T15:43:31-07:00
Add Origin to support-for-loongarch64.patch
- - - - -
69195dd8 by tony mancill at 2025-09-21T15:43:31-07:00
Prepare changelog for upload
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/ftbfs_with_GCC-15.patch
- debian/patches/kfreebsd_support.diff
- debian/patches/series
- debian/patches/support-for-loongarch64.patch
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+commons-daemon (1.0.15-12) unstable; urgency=medium
+
+ * Team upload.
+ * Apply patch for FTBFS w/GCC-15 (Closes: #1096455)
+ Thank you to Florian Ernst <florian at debian.org> for the patch.
+ * libcommons-daemon-java is now marked Multi-Arch: foreign
+ * Update debian/watch to version 5
+ * Freshen years in debian/copyright
+ * Bump Standards-Version to 4.7.2
+
+ -- tony mancill <tmancill at debian.org> Sun, 21 Sep 2025 15:33:54 -0700
+
commons-daemon (1.0.15-11) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -13,7 +13,7 @@ Build-Depends: ant,
maven-repo-helper,
xsltproc
Build-Conflicts: autoconf2.13
-Standards-Version: 4.6.0
+Standards-Version: 4.7.2
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/
@@ -21,6 +21,7 @@ Rules-Requires-Root: no
Package: libcommons-daemon-java
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Suggests: java-virtual-machine
Recommends: jsvc
=====================================
debian/copyright
=====================================
@@ -14,7 +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>
+ 2022-2025, tony mancill <tmancill at debian.org>
License: Apache-2.0
License: Apache-2.0
=====================================
debian/patches/ftbfs_with_GCC-15.patch
=====================================
@@ -0,0 +1,23 @@
+Description: Address FTBFS with GCC-15
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1096455
+Author: Florian Ernst <florian at debian.org>
+
+Index: commons-daemon-1.0.15/src/native/unix/native/jsvc.h
+===================================================================
+--- commons-daemon-1.0.15.orig/src/native/unix/native/jsvc.h
++++ commons-daemon-1.0.15/src/native/unix/native/jsvc.h
+@@ -26,14 +26,7 @@
+ #include <sys/stat.h>
+
+ /* Definitions for booleans */
+-#ifdef OS_DARWIN
+ #include <stdbool.h>
+-#else
+-typedef enum {
+- false,
+- true
+-} bool;
+-#endif
+
+ #include "version.h"
+ #include "debug.h"
=====================================
debian/patches/kfreebsd_support.diff
=====================================
@@ -1,7 +1,8 @@
Description: Add support for kFreeBSD/GNU arch
-Bug: http://bugs.debian.org/498376
+Bug-Debian: http://bugs.debian.org/498376
Author: Petr Salinger <Petr.Salinger at seznam.cz>
Last-Update: 2010-07-28
+
--- a/src/native/unix/support/apsupport.m4
+++ b/src/native/unix/support/apsupport.m4
@@ -73,6 +73,11 @@
=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@ ppc64el.diff
risv64.diff
debian-935336.patch
support-for-loongarch64.patch
+ftbfs_with_GCC-15.patch
=====================================
debian/patches/support-for-loongarch64.patch
=====================================
@@ -1,5 +1,7 @@
Description: Add support for loongarch64
Last-Update: 2023-09-14
+Author: zhangdandan <zhangdandan at loongson.cn>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1051976
--- a/src/native/unix/support/apsupport.m4
+++ b/src/native/unix/support/apsupport.m4
=====================================
debian/watch
=====================================
@@ -1,2 +1,4 @@
-version=3
-https://www.apache.org/dist/commons/daemon/source/commons-daemon-([\d\.]+)-src\.tar\.gz
+Version: 5
+
+Source: https://www.apache.org/dist/commons/daemon/source/
+Matching-Pattern: commons-daemon-([\d\.]+)-src\.tar\.gz
View it on GitLab: https://salsa.debian.org/java-team/commons-daemon/-/compare/ec4c7ec213b895ea8c1fbd763b3140f3d76cbf67...69195dd89bd8c13c60c471b7dbf7d33f663e34cf
--
View it on GitLab: https://salsa.debian.org/java-team/commons-daemon/-/compare/ec4c7ec213b895ea8c1fbd763b3140f3d76cbf67...69195dd89bd8c13c60c471b7dbf7d33f663e34cf
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/20250921/3c25e803/attachment.htm>
More information about the pkg-java-commits
mailing list