[med-svn] [Git][med-team/libfreecontact-perl][master] 8 commits: Update Build-Depends for cross builds.
Andreas Tille (@tille)
gitlab at salsa.debian.org
Tue Sep 2 19:18:39 BST 2025
Andreas Tille pushed to branch master at Debian Med / libfreecontact-perl
Commits:
90d3ae99 by gregor herrmann at 2025-09-02T19:41:03+02:00
Update Build-Depends for cross builds.
Closes: #1102805
- - - - -
4df3a39a by gregor herrmann at 2025-09-02T19:42:38+02:00
Add patch to remove C++ reference markers from XS code
for Perl 5.42 / ExtUtils::ParseXS compatibility.
Thanks: Niko Tyni for the patch.
Closes: #1112626
- - - - -
8a4d90c4 by gregor herrmann at 2025-09-02T19:43:49+02:00
Declare compliance with Debian Policy 4.7.2.
- - - - -
c528bef4 by gregor herrmann at 2025-09-02T19:46:27+02:00
Remove B-D on debhelper (covered by debhelper-compat).
- - - - -
c42776aa by gregor herrmann at 2025-09-02T19:50:18+02:00
debian/rules: drop override_dh_auto_clean.
Makefile.old is removed by ExtUtils::MakeMaker by now.
- - - - -
2a5c59bb by gregor herrmann at 2025-09-02T19:50:49+02:00
Don't install boilerplate README.
- - - - -
ff5c5966 by gregor herrmann at 2025-09-02T19:55:20+02:00
update changelog
Gbp-Dch: Ignore
- - - - -
49c97280 by gregor herrmann at 2025-09-02T20:12:27+02:00
finalize changelog after successful salsa ci run
Gbp-Dch: Ignore
- - - - -
6 changed files:
- debian/changelog
- debian/control
- − debian/docs
- + debian/patches/0001-Remove-C-reference-markers-from-XS-code.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,23 @@
+libfreecontact-perl (0.08-11) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Andreas Tille ]
+ * debian/salsa-ci.yml: Build is prevented on i386
+
+ [ gregor herrmann ]
+ * Update Build-Depends for cross builds. (Closes: #1102805)
+ * Add patch to remove C++ reference markers from XS code for Perl 5.42 /
+ ExtUtils::ParseXS compatibility.
+ Thanks to Niko Tyni for the patch. (Closes: #1112626)
+ * Declare compliance with Debian Policy 4.7.2.
+ * Remove B-D on debhelper (covered by debhelper-compat).
+ * debian/rules: drop override_dh_auto_clean.
+ Makefile.old is removed by ExtUtils::MakeMaker by now.
+ * Don't install boilerplate README.
+
+ -- gregor herrmann <gregoa at debian.org> Tue, 02 Sep 2025 20:12:13 +0200
+
libfreecontact-perl (0.08-10) unstable; urgency=medium
* Build on 64 bit architectures only
=====================================
debian/control
=====================================
@@ -9,9 +9,9 @@ Build-Depends: debhelper-compat (= 13),
architecture-is-64-bit,
libextutils-xspp-perl,
libfreecontact-dev,
- perl,
- debhelper
-Standards-Version: 4.6.0
+ perl:native,
+ perl-xs-dev
+Standards-Version: 4.7.2
Vcs-Browser: https://salsa.debian.org/med-team/libfreecontact-perl
Vcs-Git: https://salsa.debian.org/med-team/libfreecontact-perl.git
Homepage: https://rostlab.org/owiki/index.php/FreeContact
=====================================
debian/docs deleted
=====================================
@@ -1 +0,0 @@
-README
=====================================
debian/patches/0001-Remove-C-reference-markers-from-XS-code.patch
=====================================
@@ -0,0 +1,52 @@
+From 8b7527df13a6b1f5ad6a719f2e545ef9aa554aae Mon Sep 17 00:00:00 2001
+From: Niko Tyni <ntyni at debian.org>
+Date: Sat, 30 Aug 2025 19:14:24 +0100
+Subject: [PATCH] Remove C++ reference markers from XS code
+
+These code blocks are not handled as XS++ but passed to XS as-is
+due to the %{ ... %} markers. The code was always invalid XS code,
+and ExtUtils::ParseXS has recently become stricter about parsing it.
+
+Just drop the ampersands, at least as a workaround. This is how
+the code was parsed earlier anyway.
+
+Bug-Debian: https://bugs.debian.org/1112626
+
+---
+ FreeContact.xsp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/FreeContact.xsp b/FreeContact.xsp
+index f002df1..c9e2d85 100644
+--- a/FreeContact.xsp
++++ b/FreeContact.xsp
+@@ -39,7 +39,7 @@ get_ps_psicov_sd()
+
+ %{
+ void
+-predictor::_get_seq_weights( freq_vec_t* __aliw, double* __wtot, ali_t& __ali, double __clustpc, bool __veczw = true, int __num_threads = 0 )
++predictor::_get_seq_weights( freq_vec_t* __aliw, double* __wtot, ali_t __ali, double __clustpc, bool __veczw = true, int __num_threads = 0 )
+ PREINIT:
+ freq_vec_t aliw;
+ double wtot = 0;
+@@ -71,7 +71,7 @@ predictor::_get_seq_weights( freq_vec_t* __aliw, double* __wtot, ali_t& __ali, d
+ %{
+ cont_res_t
+ predictor::_run( __ali, __cp, __density, __gapth, __mincontsep, __pseudocnt, __pscnt_weight, __estimate_ivcov, __shrink_lambda, __cov20, __apply_gapth, __rho, __veczw = true, __num_threads = 0, __icme_timeout = 1800, __timing = NULL )
+- ali_t& __ali
++ ali_t __ali
+ double __cp
+ double __density
+ double __gapth
+@@ -114,7 +114,7 @@ predictor::_run( __ali, __cp, __density, __gapth, __mincontsep, __pseudocnt, __p
+
+ %{
+ cont_res_t
+-predictor::_run_with_seq_weights(ali_t& __ali, freq_vec_t &__aliw, double __wtot, double __density, double __gapth, U16 __mincontsep, double __pseudocnt, double __pscnt_weight, bool __estimate_ivcov, double __shrink_lambda, bool __cov20, bool __apply_gapth, double __rho, int __num_threads = 0, time_t __icme_timeout = 1800, time_res_t *__timing = NULL)
++predictor::_run_with_seq_weights(ali_t __ali, freq_vec_t __aliw, double __wtot, double __density, double __gapth, U16 __mincontsep, double __pseudocnt, double __pscnt_weight, bool __estimate_ivcov, double __shrink_lambda, bool __cov20, bool __apply_gapth, double __rho, int __num_threads = 0, time_t __icme_timeout = 1800, time_res_t *__timing = NULL)
+ PREINIT:
+ time_res_t timing;
+ CODE:
+--
+2.49.0
+
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
0001-Fix-timing-initialization.patch
missing-use-carp.patch
+0001-Remove-C-reference-markers-from-XS-code.patch
=====================================
debian/rules
=====================================
@@ -12,7 +12,3 @@ override_dh_auto_configure:
override_dh_gencontrol:
dh_gencontrol -- '-VDescription=$(Description)'
-
-override_dh_auto_clean:
- rm -f Makefile.old
- dh_auto_clean
View it on GitLab: https://salsa.debian.org/med-team/libfreecontact-perl/-/compare/0e755349f71dc851c053b9c8ad45fcb05d900d35...49c97280f674908bd8426a11f050d99227d1afcf
--
View it on GitLab: https://salsa.debian.org/med-team/libfreecontact-perl/-/compare/0e755349f71dc851c053b9c8ad45fcb05d900d35...49c97280f674908bd8426a11f050d99227d1afcf
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/debian-med-commit/attachments/20250902/18034d6a/attachment-0001.htm>
More information about the debian-med-commit
mailing list