On Mon, Dec 01, 2025 at 01:32:45AM +0100, Agustin Martin wrote: > On Tue, Nov 25, 2025 at 11:37:10PM +0100, Guillem Jover wrote: > > Package: devscripts > > Version: 2.25.27 > > Severity: normal > > > > Hi! > > > > While converting some packages to use the new watch format 5, I noticed > > what seems to be a regression, or where the documentation is not clear > > or misleading. ... > > Running «uscan» does not execute uupdate. Explicitly telling uscan > > to use uupdate at the end restores the previous behavior: ... > > I proposed that wording after the one in old uscan man page and taking into > account that in uscan description one reads > > DESCRIPTION > ... > Some previous paragraphs. > ... > * uscan invokes uupdate to create the Debianized source tree: > ../<spkg>-<oversion>/* > > Previous wording in pre-watch5 uscan man page did not explititly stated that > uupdate was the default. > > Did I miss something?
Hi, Seems that I have not used uupdate for so many years that I was confused about its purpose when filing and dealing with https://bugs.debian.org/111915. uscan program is right, there should be no default for update script (e.g., I usually upgrade the Debian tree manually invoking gbp import-orig). I wonder if wording in attached patch is more clear on all this. Sorry for the misunderstanding. Regards, -- Agustin
>From 44ac761bd0be0e47e73b2f03804409e5c75e82ef Mon Sep 17 00:00:00 2001 From: Agustin Martin Domingo <[email protected]> Date: Tue, 2 Dec 2025 08:26:05 +0100 Subject: [PATCH] scripts/{debian-watch*.pod,uscan.pl}: Fix custom scripts (or uupdate) stuff. There should be no default. --- scripts/debian-watch-4.pod | 8 +++----- scripts/debian-watch.pod | 9 ++++----- scripts/uscan.pl | 28 ++++++++++++++++++---------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/scripts/debian-watch-4.pod b/scripts/debian-watch-4.pod index 0298d83f..f3072049 100644 --- a/scripts/debian-watch-4.pod +++ b/scripts/debian-watch-4.pod @@ -121,11 +121,9 @@ At least the main upstream source has to be declared as "group". =back -=item * I<script> is executed at the end of B<uscan> execution with -appropriate arguments provided by B<uscan>. -Default script is L<uupdate> and custom scripts, if created, -should behave as if L<uupdate>. -See L<uscan/"Custom script"> for more details on custom scripts and +=item * If set, I<script> is executed at the end of B<uscan> execution +with appropriate arguments provided by B<uscan> I<(default: no action)>. +See L<uscan/"Custom script"> for more details on these scripts and L<uscan/"HISTORY AND UPGRADING"> for how B<uscan> invokes the custom I<script> (or L<uupdate>). diff --git a/scripts/debian-watch.pod b/scripts/debian-watch.pod index 763af538..48299af3 100644 --- a/scripts/debian-watch.pod +++ b/scripts/debian-watch.pod @@ -186,13 +186,12 @@ component versions when B<Version-Schema> is set to "group" or "checksum". The default value is "B<+~>". This parameter must be in the first paragraph I<(just after "Version")>, else it will be ignored. -=item * B<Update-Script:> I<< <custom-script> >>: +=item * B<Update-Script:> I<< <script> >>: This optional line in F<debian/watch> means to execute -I<custom-script> with appropriate arguments provided by B<uscan>. -Default script is L<uupdate> and custom scripts, if created, -should behave as if L<uupdate>. -See L<uscan/"Custom script"> for more details on custom scripts and +I<script> with appropriate arguments provided by B<uscan> +I<(default: no action)>. +See L<uscan/"Custom script"> for more details on these scripts and L<uscan/"HISTORY AND UPGRADING"> for how B<uscan> invokes the custom I<script> (or L<uupdate>). diff --git a/scripts/uscan.pl b/scripts/uscan.pl index 8da6a857..14b0ef49 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -87,8 +87,9 @@ tarball will instead be named I<< ../<spkg>_<oversion>.orig-<component>.tar.gz > =back -=item * B<uscan> invokes B<uupdate> to create the Debianized source tree: I<< -../<spkg>-<oversion>/* >> +=item * If requested, B<uscan> invokes an update script. +This may be B<uupdate> to create the Debianized source tree +I<< ../<spkg>-<oversion>/* >> or a custom script. =back @@ -685,16 +686,23 @@ variations. =head2 Custom script -The optional I<script> parameter in F<debian/watch> means to execute I<script> -with options after processing this line if specified. +After processing other stuff B<uscan> will run I<script> if requested +in F<debian/watch>. +Otherwise there will be no extra action. -See L<HISTORY AND UPGRADING> for how B<uscan> invokes the custom I<script>. +A typical script is L<uupdate> for non-native packages, but a custom +script may be used. +For compatibility with other tools such as B<git-buildpackage>, it may +not be wise to create custom scripts with random behavior. +Custom scripts, if created, should behave as if L<uupdate>. +For possible use case, see L<http://bugs.debian.org/748474> as an example. -For compatibility with other tools such as B<git-buildpackage>, it may not be -wise to create custom scripts with random behavior. In general, B<uupdate> is -the best choice for the non-native package and custom scripts, if created, -should behave as if B<uupdate>. For possible use case, see -L<http://bugs.debian.org/748474> as an example. +For info on how to request this script, please see debian-watch(5) for +recommended version 5 format or debian-watch-4(5) for old version 4 +format. + +See L<HISTORY AND UPGRADING> for how B<uscan> invokes a custom +I<script> (or L<uupdate>). =head2 URL diversion -- 2.51.0
