Hi Sebastiaan,
should I remove the experimental branch on salsa after it has been merged?
kind regards
antonio
Il 10/08/25 20:29, Antonio Valentino (@antonio.valentino) ha scritto:
Antonio Valentino pushed to branch master at Debian GIS Project / gmtsar
Commits:
210a3ca0 by Antonio Valentino at 2025-06-08T07:30:25+00:00
Update branch in gbp.conf & Vcs-Git URL
- - - - -
a24446a6 by Antonio Valentino at 2025-06-08T07:41:17+00:00
Import disable_-m64_option_on_riscv64.patch provided by Yue Gui
- - - - -
c9828cef by Antonio Valentino at 2025-06-08T07:54:01+00:00
Rename patches
- - - - -
98ca9675 by Antonio Valentino at 2025-06-08T10:40:24+00:00
Set distribution to experimental
- - - - -
97d48943 by Antonio Valentino at 2025-08-07T05:32:02+00:00
Mark gmtsar-data as Multi-Arch: foreign
- - - - -
4a71dfdc by Antonio Valentino at 2025-08-07T05:35:36+00:00
Update d/copyright
- - - - -
86dfff5c by Antonio Valentino at 2025-08-10T18:19:26+00:00
Revert "Update branch in gbp.conf & Vcs-Git URL"
This reverts commit 210a3ca05193ea5705b1235d51c45b45cd74bc81.
- - - - -
caebb1dc by Antonio Valentino at 2025-08-10T18:21:55+00:00
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/patches/loong64.patch → debian/patches/0008-loong64.patch
- + debian/patches/0009-Disable-m64-gcc-flag-on-riscv64.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,22 @@
+gmtsar (6.5+ds-4) unstable; urgency=medium
+
+ * Upload to unstable.
+ * Mark gmtsar-data as Multi-Arch: foreign.
+ * Update d/copyright.
+
+ -- Antonio Valentino <[email protected]> Sun, 10 Aug 2025
18:20:49 +0000
+
+gmtsar (6.5+ds-4~exp1) experimental; urgency=medium
+
+ [ Gui-Yue ]
+ * Disable -m64 option in riscv64 (Closes: #1107403).
+
+ [ Antonio Valentino ]
+ * debian/patches:
+ - Rename patches.
+
+ -- Antonio Valentino <[email protected]> Sun, 08 Jun 2025
10:40:00 +0000
+
gmtsar (6.5+ds-3) unstable; urgency=medium
[ Bas Couwenberg ]
=====================================
debian/control
=====================================
@@ -63,6 +63,7 @@ Description: ${source:Synopsis} - core
Package: gmtsar-data
Architecture: all
Depends: ${misc:Depends}
+Multi-Arch: foreign
Description: ${source:Synopsis} - data
${source:Extended-Description}
.
=====================================
debian/copyright
=====================================
@@ -45,7 +45,7 @@ Copyright: David T. Sandwell
License: GPL-3.0
Files: debian/*
-Copyright: 2024, Antonio Valentino <[email protected]>
+Copyright: 2024-2025, Antonio Valentino <[email protected]>
License: GPL-3.0
License: GPL-3.0
=====================================
debian/patches/loong64.patch → debian/patches/0008-loong64.patch
=====================================
@@ -1,11 +1,18 @@
-Description: Add support for loong64
-Author: wuruilong <[email protected]>
+From: wuruilong <[email protected]>
+Date: Sun, 8 Jun 2025 07:41:28 +0000
+Subject: Add support for loong64
+
Bug-Debian: https://bugs.debian.org/1099721
Forwarded: not-needed
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+diff --git a/configure.ac b/configure.ac
+index a15990d..13ce195 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -226,6 +226,9 @@ if test -x "$GMT_CONF" && test "X$GMT_IN
+@@ -226,6 +226,9 @@ if test -x "$GMT_CONF" && test "X$GMT_INC" = "X" && test "X$GMT_LIB"
= "X" ; the
if test "$host_cpu" = "aarch64" && test "$os" = "Linux"; then
GCC_64=""
LDFLAGS="$LDFLAGS"
=====================================
debian/patches/0009-Disable-m64-gcc-flag-on-riscv64.patch
=====================================
@@ -0,0 +1,22 @@
+From: Yue Gui <[email protected]>
+Date: Sun, 8 Jun 2025 07:41:28 +0000
+Subject: Disable -m64 gcc flag on riscv64
+
+---
+ configure.ac | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 13ce195..a714b77 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -229,6 +229,9 @@ if test -x "$GMT_CONF" && test "X$GMT_INC" = "X" && test "X$GMT_LIB"
= "X" ; the
+ elif test "$host_cpu" = "loongarch64" && test "$os" = "Linux"; then
+ GCC_64=""
+ LDFLAGS="$LDFLAGS"
++ elif test "$host_cpu" = "riscv64" && test "$os" = "Linux"; then
++ GCC_64=""
++ LDFLAGS="$LDFLAGS"
+ else
+ bits=`$GMT_CONF --bits`
+ GCC_64="-m${bits}"
=====================================
debian/patches/series
=====================================
@@ -5,4 +5,5 @@
0005-Spelling.patch
0006-LDFLAGS.patch
0007-Clean.patch
-loong64.patch
+0008-loong64.patch
+0009-Disable-m64-gcc-flag-on-riscv64.patch
View it on GitLab:
https://salsa.debian.org/debian-gis-team/gmtsar/-/compare/6470061c0ad148744eca0afe56e8fdb406f13c72...caebb1dcfdafd99b265109dd9e44a8c7574c1844
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
--
Antonio Valentino
_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
