From: nicolas@debian.org
Package: xdg-utils
Followup-For: Bug #990725
Hello.
I see that you have applied all suggestions but one.
Is there something wrong with the autopkgtest changes?
Or is there something else we can do to close this bug?
From 166c263384018ce8bc0cedf22570f98096018129 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez
Date: Wed, 31 Mar 2021 18:09:33 +0200
Subject: [PATCH 1/2] autopkgtests: stop requiring a writeable or clean source
tree
Let the same script run bash and dash tests in a row.
Echo progress to standard out instead of requiring BASH_XTRACEFD.
Remove the unneeded execution permission.
---
debian/tests/control | 3 +--
debian/tests/entry | 26 ++++++++++++--------------
debian/tests/with-bash | 1 -
debian/tests/with-dash | 1 -
4 files changed, 13 insertions(+), 18 deletions(-)
mode change 100755 => 100644 debian/tests/entry
delete mode 120000 debian/tests/with-bash
delete mode 120000 debian/tests/with-dash
diff --git a/debian/tests/control b/debian/tests/control
index 3b7fc58..489c87d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,2 @@
-Tests: with-bash, with-dash
+Tests: entry
Depends: bash, dash, make, xdg-utils
-Restrictions: rw-build-tree
diff --git a/debian/tests/entry b/debian/tests/entry
old mode 100755
new mode 100644
index 7ba19b7..442e327
--- a/debian/tests/entry
+++ b/debian/tests/entry
@@ -1,17 +1,15 @@
-#!/bin/bash
-set -e -u
+#!/bin/sh
+set -C -e -f -u
-if [ $# = 0 ]; then
- what=$(basename "$0")
- set -- "/bin/${what#with-}"
-fi
+srcdir=`pwd`
+cd "$AUTOPKGTEST_TMP"
-if [ -e scripts/xdg-open ]; then
- echo >&2 "Dirty source tree, you need to make clean before run autopkgtest"
-fi
+"$srcdir/configure"
-BASH_XTRACEFD=1
-set -x
-
-./configure
-make autotest SHELL="${1:-/bin/sh}"
+for shell in /bin/bash /bin/dash; do
+ echo
+ echo " Testing $shell"
+ echo
+ make clean
+ make autotest SHELL=$shell
+done
diff --git a/debian/tests/with-bash b/debian/tests/with-bash
deleted file mode 120000
index 17fb5bd..0000000
--- a/debian/tests/with-bash
+++ /dev/null
@@ -1 +0,0 @@
-entry
\ No newline at end of file
diff --git a/debian/tests/with-dash b/debian/tests/with-dash
deleted file mode 120000
index 17fb5bd..0000000
--- a/debian/tests/with-dash
+++ /dev/null
@@ -1 +0,0 @@
-entry
\ No newline at end of file
--
2.47.3
From 3960b9b203102fb1f1f7f3477e2793cece1fcdb3 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez
Date: Mon, 23 Feb 2026 19:06:37 +0100
Subject: [PATCH 2/2] Update watch file to format version 5
---
debian/watch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/watch b/debian/watch
index 2b32934..c817e11 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
-version=4
-opts="searchmode=plain,uversionmangle=s/-/~/" \
- https://gitlab.freedesktop.org/api/v4/projects/xdg%2Fxdg-utils/releases \
- https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v[0-9.
*/@PACKAGE@-v@ANY_VERSION@.tar.gz
+Version: 5
+
+Template: gitlab
+Dist: https://gitlab.freedesktop.org/xdg/xdg-utils
--
2.47.3
--- SoupGate-Win32 v1.05
* Origin: you cannot sedate... all the things you hate (1:229/2)
|
