On 1 Feb 2024 10:08:29 -0500 Jeremy Bícha <jeremy.bi...@canonical.com> wrote: > Source: xdg-utils > Version: 1.1.3-4.1 > Severity: wishlist > > There is a new release of xdg-utils. Please package it.
I saw there was already a 'pending' tag, so this may be obsolete (and therefor didn't tag it with 'patch'), but I've made an attempt to upgrade to 1.2.1 (too). Update procedure: 1) Apply patches 0001 and 0002 2) Run `gbp import-orig --uscan` 3) Apply patches 0010 and 0011 And then make a release out of it. Notes: - I completely disabled upstream's autotests when I saw it was testing for KDE 3 and 4 - There are several improvements possible to the Debian package, but getting it first to upstream's 1.2.1 seems more important. Further improvements to the packaging can follow after this. Like Standards-Version 4.7.0 and debhelper-compat=13 - The upstream commit which converted the README to README.md had this: "My hope is that this makes the xdg-utils seem less like a dead project and lowers the barrier for contributing." and I think/hope Debian having 1.2.1 could help with that. Because it's much better if upstream's autotests were run, but they should be relevant to current systems. https://salsa.debian.org/diederik/xdg-utils/-/pipelines is where you can see the Salsa CI pipeline succeeds, both for version 1.1.3-4.1 as with my updates to 1.2.1. HTH, Diederik
>From 194c0e0b10aea4721029db5e8ebd9cad72604b38 Mon Sep 17 00:00:00 2001 From: Diederik de Haas <didi.deb...@cknow.org> Date: Fri, 29 Nov 2024 09:42:06 +0100 Subject: [PATCH 1/2] d/watch: Update expression to new GitLab format In April 2024, GitLab changed the tag order, so update the expression to the new format. While at it, use (more) uscan variables to make it more generic. The first expression in the Debian wiki has 'debian' and 'uupdate' at the end, but as those are the defaults, leave them out. Link: https://wiki.debian.org/debian/watch#GitLab --- debian/watch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/watch b/debian/watch index cf35ec3..4e6f5a3 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,3 @@ version=4 -opts="uversionmangle=s/-/~/" \ - https://gitlab.freedesktop.org/xdg/xdg-utils/-/tags \ - (?:.*?/)?@PACKAGE@-v(\d[\d.]*(?:-[a-z]+\d*)?)\.tar\.gz +opts="searchmode=plain" \ + https://gitlab.freedesktop.org/xdg/@PACKAGE@/tags?sort=updated_desc -/archive/v?\d[\d.]+/@PACKAGE@-@ANY_VERSION@@ARCHIVE_EXT@ -- 2.45.2
>From ed609d2f891adcf7cfdc86bd89658a2e8239938c Mon Sep 17 00:00:00 2001
From: Diederik de Haas <didi.deb...@cknow.org>
Date: Fri, 29 Nov 2024 09:58:36 +0100
Subject: [PATCH 2/2] d/gbp.conf: Update configuration according to DEP-14
The current gbp defaults are better then what has been set in
c96c2cb3f1de ("Configure gbp utility")
So this is actually a revert, but with a useful commit message.
Link: https://dep-team.pages.debian.net/deps/dep14/
---
debian/gbp.conf | 4 ----
1 file changed, 4 deletions(-)
diff --git a/debian/gbp.conf b/debian/gbp.conf
index dff70e6..cec628c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,2 @@
[DEFAULT]
pristine-tar = True
-upstream-tag = v%(version)s
-
-[dch]
-git-log = --no-merges ^upstream
--
2.45.2
>From c7ef208056ccb440f56fe6e7d1838204c2488995 Mon Sep 17 00:00:00 2001 From: Diederik de Haas <didi.deb...@cknow.org> Date: Fri, 29 Nov 2024 10:35:37 +0100 Subject: [PATCH 10/11] d/patches: Add patch to disable autotests When a test suite wants to test KDE 3 (and 4), it's reasonable to assume those are not really relevant. The best approach would be to get them fixed upstream, but until that happens, disable them. --- debian/patches/Disable-autotests.patch | 41 ++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 debian/patches/Disable-autotests.patch create mode 100644 debian/patches/series diff --git a/debian/patches/Disable-autotests.patch b/debian/patches/Disable-autotests.patch new file mode 100644 index 0000000..8dd81a8 --- /dev/null +++ b/debian/patches/Disable-autotests.patch @@ -0,0 +1,41 @@ +From cdf3914f5242d0ad8caef05df836f6345d1e9b94 Mon Sep 17 00:00:00 2001 +From: Diederik de Haas <didi.deb...@cknow.org> +Date: Fri, 29 Nov 2024 10:24:57 +0100 +Subject: [PATCH] Disable autotests +Forwarded: no + +I'm a big fan of automatic tests and in general we should do more of +those. But those tests need to be relevant. + +The autotests wants to test against KDE3 and KDE4, both of which have +been unsupported for quite a while, so it's reasonable to conclude that +the autotests are either not run or its results ignored. + +Looking at upstream's changes to the autotests directory and after +2019-01-12 the only changes have been spelling and shellcheck fixes. +On most projects that I'm familiar with on freedesktop.org, they run a +CI suite and with several projects those are massive/enormous. +That it's not running on the xdg-utils repo, is telling. + +Thus disable the autotests until they have been updated, highly +preferably upstream so we all benefit. +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index cb9c91d..1bfaf2c 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -6,7 +6,7 @@ uninstall: $(SUBDIRS:%=%/__uninstall__) + test: dummy + cd tests && $(MAKE) test + autotest: +- cd autotests && $(MAKE) test ++# cd autotests && $(MAKE) test + clean: $(SUBDIRS:%=%/__clean__) + distclean: clean $(SUBDIRS:%=%/__distclean__) + rm -f config.* Makefile +-- +2.45.2 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..80df648 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +Disable-autotests.patch -- 2.45.2
>From af8ceee282dd47445145796010390a8d06f592ee Mon Sep 17 00:00:00 2001
From: Diederik de Haas <didi.deb...@cknow.org>
Date: Fri, 29 Nov 2024 10:42:24 +0100
Subject: [PATCH 11/11] d/docs: Update for 1.2.1 changes
The README file has been converted to Markdown in upstream commit
de9e97d25931 ("Markdown and updated READMEs and gitignore")
Link: https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/90
---
debian/docs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/docs b/debian/docs
index 724e084..6f77277 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,2 @@
-README
+README.md
TODO
--
2.45.2
signature.asc
Description: This is a digitally signed message part.
