Bug#1041824: src:volume-el: Enable merge request on salsa
control: reopen -1
control: retitle -1 src:volume-el: repair d/watch to track upstream head
Manphiz <manphiz@gmail.com> writes:
> Sean Whitton <spwhitton@spwhitton.name> writes:
>
>> control: tag -1 + wontfix
>>
>> Hello,
>>
>> Thank you for these submissions.
>>
>> On Sun 23 Jul 2023 at 08:48pm -07, Manphiz wrote:
>>
>>> * Sync to latest head version, which basically just incorporated Sean's
>>> patch upstream so that we don't need to host the patch anymore.
>>
>> Patches don't really work for merging new upstream releases -- in this
>> case, pushing a branch somewhere and inviting me to merge it is better.
>> For proposed new changes rather than merges, I do indeed prefer patches,
>> so thank you for preparing those.
>>
>> In this case, I would prefer not to merge the new upstream, because it
>> doesn't actually change the package. It's not a problem carrying the
>> patch, and I think it's preferable.
>>
>> As for your first patch, I don't follow -- I think I already fixed that
>> a while ago? Indeed, the patch does not apply to our team's repository.
>>
>> I would prefer not to apply the final patch until the QA team come and
>> tell us that we should disable watch files like that.
>
> Hi Sean,
>
> Thanks for the comments and I understand your reasons. Actually I am
> also unsure about how to deal with uscan errors with a watch file that
> tracks upstream tags that don't exist, and as you and Nicolas both
> suggest against disabling them, I think I may need to rethink how to
> approach this. I'll probably ask in emacsen-team@ for comments later.
Hi Nicolas, Sean,
After consulting #debian-mentors I'm more convinced that tracking
upstream head is the way to go. So I've done that and attached the
patch. PTAL. Thanks!
--
Manphiz
>From f55b026f42f2887a370b7c1eca821129bf06151b Mon Sep 17 00:00:00 2001
From: Xiyue Deng <manphiz@gmail.com>
Date: Thu, 27 Jul 2023 16:54:38 -0700
Subject: [PATCH] Repair d/watch to track HEAD as no tag is available.
---
debian/changelog | 7 +++++++
debian/watch | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cc07223..0beb9aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+volume-el (1.0+git.20201002.afb75a5-4) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Repair d/watch to track HEAD as no tag is available.
+
+ -- Xiyue Deng <manphiz@gmail.com> Thu, 27 Jul 2023 16:53:26 -0700
+
volume-el (1.0+git.20201002.afb75a5-3) unstable; urgency=medium
* Pass correct number of arguments to define-obsolete-variable-alias.
diff --git a/debian/watch b/debian/watch
index dab1a60..4e31c99 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=4
-opts="filenamemangle=s/(?:.*?)?v?(\d[\d.]*)\.tar\.gz/volume.el-$1.tar.gz/" \
- https://github.com/dbrock/volume.el/tags \
- (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
+opts="mode=git, pgpmode=none, dversionmangle=s/^1.0\+git\./0.0~git/" \
+ https://github.com/dbrock/volume.el \
+ HEAD
--
2.39.2
Reply to: