Bug#1038393: supertux: improve d/watch file

2023-06-18 Thread Patrice Duroux
Source: supertux
Version: 0.6.3-2
Followup-For: Bug #1038393

Hi,

Sorry for that. Here is a second version of the patch.

I suspect a bug in uscan because using the following rule in the d/watch file:

downloadurlmangle=s%archive/refs/tags/v?(@ANY_VERSION@)(@ARCHIVE_EXT@)%releases/download/v$1/SuperTux-v$1-Source$2%

gives the following message from uscan:

uscan info: Upstream URL(+tag) to download is identified as
https://github.com/SuperTux/supertux/releases/download/v0.6.3/SuperTux-v0.6.3-Source0.6.3

in place of the expected one:

uscan info: Upstream URL(+tag) to download is identified as
https://github.com/SuperTux/supertux/releases/download/v0.6.3/SuperTux-v0.6.3-Source.tar.gz


For this reason, the extension (.tar.gz) is hard-coded in the rule of this
second version.

Regards,
Patrice


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.3.0-1-amd64 (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_WARN
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff --git a/debian/watch b/debian/watch
index 83aa7f1..21a157b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,5 @@
 version=4
-opts="uversionmangle=s/-rc/~rc/;s/-alpha/~alpha/;s/-beta/~beta/;s/-Source//" \
-https://github.com/SuperTux/supertux/releases 
.*/SuperTux-v?@ANY_VERSION@-Source@ARCHIVE_EXT@
+#https://github.com/SuperTux/supertux/releases/download/v0.6.3/SuperTux-v0.6.3-Source.tar.gz
+#  
//github.com/SuperTux/supertux/releases/download/SuperTux-v0.6.3-Source.tar.gz
+opts="uversionmangle=s/-rc/~rc/;s/-alpha/~alpha/;s/-beta/~beta/, 
downloadurlmangle=s%archive/refs/tags/v?(@ANY_VERSION@).tar.gz%releases/download/v$1/SuperTux-v$1-Source.tar.gz%,
 filenamemangle=s%(?:.*?)?v?@ANY_VERSION@(@ARCHIVE_EXT@)%@PACKAGE@-$1$2%" \
+https://github.com/SuperTux/@PACKAGE@/tags 
(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@


Bug#1038393: supertux: improve d/watch file

2023-06-18 Thread Reiner Herrmann
Hi Patrick,

thank you for the watch file improvement.
With your change the auto-generated tarball from Github is getting
downloaded, not the official release tarball (e.g.
SuperTux-v0.6.3-Source.tar.gz), which also contains the git submodules
(some of them are needed in the build).
Can you please try to change it so that the official tarball can be
downloaded?

Thanks!

Kind regards,
  Reiner


signature.asc
Description: PGP signature


Bug#1038393: supertux: improve d/watch file

2023-06-17 Thread Patrice Duroux
Source: supertux
Version: 0.6.3-2
Severity: wishlist

Dear Maintainer,

Here is a patch that can do it.

Regards,
Patrice


-- System Information:
Debian Release: trixie/sid
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (1, 
'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.3.0-1-amd64 (SMP w/12 CPU threads; PREEMPT)
Kernel taint flags: TAINT_WARN
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff --git a/debian/watch b/debian/watch
index 83aa7f1..a6f6860 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=4
-opts="uversionmangle=s/-rc/~rc/;s/-alpha/~alpha/;s/-beta/~beta/;s/-Source//" \
-https://github.com/SuperTux/supertux/releases 
.*/SuperTux-v?@ANY_VERSION@-Source@ARCHIVE_EXT@
+opts="uversionmangle=s/-rc/~rc/;s/-alpha/~alpha/;s/-beta/~beta/, 
filenamemangle=s%(?:.*?)?v?@ANY_VERSION@(@ARCHIVE_EXT@)%@PACKAGE@-$1$2%" \
+https://github.com/SuperTux/@PACKAGE@/tags 
(?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@