retitle -1 src:volume-el: disable d/watch and sync to latest head version tag -1 patch severity -1 minor thanks
Nicholas D Steeves <s...@debian.org> writes: > Xiyue Deng <manp...@gmail.com> writes: > >> Source: volume-el >> Severity: wishlist >> X-Debbugs-Cc: none, Xiyue Deng <manp...@gmail.com> >> >> Dear maintainers, >> >> I have been trying to fix uscan error of Emacs addon packages. When >> working on volume-el, I found that the repo on salsa didn't accept merge >> requests while most other packages did. If it can open up merge request >> access it would be great and I have some pending d/watch fixes. Thanks >> in advance! > > This may indicate that the Uploader wants patches rather than MRs, and > at the very least may indicate the Uploader doesn't want to monitor > Salsa for MRs. > Thanks for the explanation, Nicolas! Totally make sense. > You can use git-format-patch to prepare a patch series from your git > history, and can attach those to a bug report here. > Done. > To retitle this bug, but this as the first line in your reply (won't > work with HTML email, of course): > > Control: retitle -1 src:volume-el: Useful subject of choice > Control: tag -1 patch > > If you attach a patch, I recommend updating the metadata with that > second line. > Done. A little bit of explanation for the changes: * Upstream never had any tags, so uscan will always fail, so disable d/watch for now. This will result in an empty uscan results. * Sync to latest head version, which basically just incorporated Sean's patch upstream so that we don't need to host the patch anymore. Please see the patches attached. > Cheers, > Nicholas > -- Manphiz
>From 22464e7bee7a9ed7a18401109640a02502478fdb Mon Sep 17 00:00:00 2001 From: Sean Whitton <spwhit...@spwhitton.name> Date: Tue, 19 Jan 2021 16:05:45 -0700 Subject: [PATCH 1/4] Pass correct number of arguments to define-obsolete-...-alias Recent Emacs master branch fails to bytecompile volume.el due to this. --- volume.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/volume.el b/volume.el index 35a2614..689bd4a 100644 --- a/volume.el +++ b/volume.el @@ -452,7 +452,7 @@ This corresponds to the `-D' option of amixer." (when (fboundp 'define-obsolete-variable-alias) (define-obsolete-variable-alias 'volume-amixer-control - 'volume-amixer-default-channel)) + 'volume-amixer-default-channel "1.0")) (defvar volume-amixer-current-channel volume-amixer-default-channel "The name of the ALSA mixer channel to manipulate.") @@ -654,7 +654,7 @@ Return either the new volume or nil, depending on the backend." (when (fboundp 'define-obsolete-function-alias) (define-obsolete-function-alias 'volume-channel-name - 'volume-channel-label)) + 'volume-channel-label "1.0")) (defun volume-channels () "Return the list of available channels." -- 2.39.2
>From 6ca047fcec9e9e8aeae380c1594cac2c392ce4ac Mon Sep 17 00:00:00 2001 From: Xiyue Deng <manp...@gmail.com> Date: Sun, 23 Jul 2023 05:08:05 -0700 Subject: [PATCH 2/4] Sync to current head (050d3e6). --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index cc07223..65a4e66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +volume-el (1.0+git.20220904.050d3e6-1) UNRELEASED; urgency=medium + + * Team upload. + * Sync to current head (050d3e6). + + -- Xiyue Deng <manp...@gmail.com> Sun, 23 Jul 2023 05:06:07 -0700 + volume-el (1.0+git.20201002.afb75a5-3) unstable; urgency=medium * Pass correct number of arguments to define-obsolete-variable-alias. -- 2.39.2
>From 898fa2cdfbd3620f6a81e30f21f5f74cd21f5643 Mon Sep 17 00:00:00 2001 From: Xiyue Deng <manp...@gmail.com> Date: Sun, 23 Jul 2023 05:09:17 -0700 Subject: [PATCH 3/4] Drop debian-changes. Merged upstream. --- debian/changelog | 1 + debian/patches/debian-changes | 37 ----------------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 debian/patches/debian-changes delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 65a4e66..8cc2f70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ volume-el (1.0+git.20220904.050d3e6-1) UNRELEASED; urgency=medium * Team upload. * Sync to current head (050d3e6). + * Drop debian-changes. Merged upstream. -- Xiyue Deng <manp...@gmail.com> Sun, 23 Jul 2023 05:06:07 -0700 diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes deleted file mode 100644 index c60df9d..0000000 --- a/debian/patches/debian-changes +++ /dev/null @@ -1,37 +0,0 @@ -The Debian packaging of volume-el is maintained in git, using the merging -workflow described in dgit-maint-merge(7). There isn't a patch -queue that can be represented as a quilt series. - -A detailed breakdown of the changes is available from their -canonical representation - git commits in the packaging repository. -For example, to see the changes made by the Debian maintainer in -the first upload of upstream version 1.2.3, you could use: - - % git clone https://git.dgit.debian.org/volume-el - % cd volume-el - % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian' - -(If you have dgit, use `dgit clone volume-el`, rather than plain `git -clone`.) - -A single combined diff, containing all the changes, follows. ---- volume-el-1.0+git.20201002.afb75a5.orig/volume.el -+++ volume-el-1.0+git.20201002.afb75a5/volume.el -@@ -452,7 +452,7 @@ This corresponds to the `-D' option of a - - (when (fboundp 'define-obsolete-variable-alias) - (define-obsolete-variable-alias 'volume-amixer-control -- 'volume-amixer-default-channel)) -+ 'volume-amixer-default-channel "1.0")) - - (defvar volume-amixer-current-channel volume-amixer-default-channel - "The name of the ALSA mixer channel to manipulate.") -@@ -654,7 +654,7 @@ Return either the new volume or nil, dep - - (when (fboundp 'define-obsolete-function-alias) - (define-obsolete-function-alias 'volume-channel-name -- 'volume-channel-label)) -+ 'volume-channel-label "1.0")) - - (defun volume-channels () - "Return the list of available channels." diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 7bb8252..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -debian-changes -- 2.39.2
>From d26a7169ab5929eb29233ac0d3c305d17d16d2d8 Mon Sep 17 00:00:00 2001 From: Xiyue Deng <manp...@gmail.com> Date: Sun, 23 Jul 2023 05:13:45 -0700 Subject: [PATCH 4/4] Disable d/watch. No tag available upstream. --- debian/changelog | 1 + debian/watch | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8cc2f70..4198492 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ volume-el (1.0+git.20220904.050d3e6-1) UNRELEASED; urgency=medium * Team upload. * Sync to current head (050d3e6). * Drop debian-changes. Merged upstream. + * Disable d/watch. No tag available upstream. -- Xiyue Deng <manp...@gmail.com> Sun, 23 Jul 2023 05:06:07 -0700 diff --git a/debian/watch b/debian/watch index dab1a60..a7111cf 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,11 @@ -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 +# Please note: this watch file is included in the hopes that upstream +# will begin tagging their releases. At this time upstream does not +# provide release tarballs or tags and so uscan will "warn: In +# debian/watch no matching files for watch line". The watch line has +# been consequently been disabled to save resources polling something +# known to fail. + +# 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 -- 2.39.2
