12 files changed, 90 insertions, 54 deletions
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..90af6b9
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,11 @@
+Downloading the ruamel.yaml source
+==================================
+
+ruamel.yaml is available as a Python package from PyPI.  However, this
+does not include the unit tests.  These are available in the
+SourceForge repository, but the repository does not have any tarballs
+available for download.  So the watch file calls a local script to
+clone the mercurial repository, check out the current tag, and pack it
+into a tarball in place of the downloaded PyPI version.  This script
+requires the mercurial package to be installed, but this is not a
+build-dependency.
diff --git a/debian/changelog b/debian/changelog
index 7e9cf47..e867a7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ruamel.yaml (0.18.6-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream version.
+  * Use VCS source to include package tests
+  * Bump Standards-Version to 4.7.0
+  * New version appears to work on s390x, so remove old patch
+
+ -- Julian Gilbey <jdg@debian.org>  Mon, 15 Apr 2024 07:29:08 +0100
+
 ruamel.yaml (0.18.5-1~exp1~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index bdc022b..9706a60 100644
--- a/debian/control
+++ b/debian/control
@@ -5,16 +5,15 @@ XSBC-Original-Maintainer: Debian Python Team <team+python@tracker.debian.org>
 XSBC-Original-Uploaders: Vincent Bernat <bernat@debian.org>
 Bugs: mailto:maintainers@lists.progress-linux.org
 Section: python
-Testsuite: autopkgtest-pkg-python
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               dh-python,
-               cython3,
+               dh-sequence-python3,
                python3-all:any,
-               python3-setuptools,
-               python3-pytest,
-               python3-ruamel.yaml.clib
-Standards-Version: 4.6.2
+               python3-pytest <!nocheck>,
+               python3-ruamel.yaml.clib,
+               python3-setuptools
+Testsuite: autopkgtest-pkg-pybuild
+Standards-Version: 4.7.0
 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/ruamel.yaml
 Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/ruamel.yaml
 XSBC-Original-Vcs-Browser: https://salsa.debian.org/python-team/packages/ruamel.yaml
@@ -24,14 +23,14 @@ Rules-Requires-Root: no
 
 Package: python3-ruamel.yaml
 Architecture: all
-Depends: ${misc:Depends},
-         ${python3:Depends},
-         python3-ruamel.yaml.clib
+Depends: python3-ruamel.yaml.clib,
+         ${misc:Depends},
+         ${python3:Depends}
 Recommends: ${python3:Recommends}
 Suggests: ${python3:Suggests}
-Description: roundtrip YAML parser/emitter (Python 3 module)
+Description: Roundtrip YAML parser/emitter (Python 3 module)
  ruamel.yaml is a YAML parser supporting roundtrip preservation of
  comments, seq/map flow style and map key order. It is a derivative of
- Kirill Simonov's PyYAML 3.11 which supports YAML1.1.
+ Kirill Simonov's PyYAML which supports YAML 1.2.
  .
  This package contains the Python 3 module.
diff --git a/debian/copyright b/debian/copyright
index 10bc993..f4468c9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,7 @@ License: Expat
 
 Files: debian/*
 Copyright: 2015 Vincent Bernat <bernat@debian.org>
+  2024 Julian Gilbey <jdg@debian.org>
 License: Expat
 
 License: Expat
diff --git a/debian/get-hg-version b/debian/get-hg-version
new file mode 100755
index 0000000..4e3f60e
--- /dev/null
+++ b/debian/get-hg-version
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# This script is called by uscan(1) as:
+# get-hg-version --upstream-version <version>
+
+# We create a temporary directory, clone the upstream repository into it,
+# check out the current upstream version, tar this directory, and then
+# copy it to the parent directory in place of the existing downloaded
+# .orig.tar.gz file.
+
+# set -e
+
+if [ "$1" != "--upstream-version" ]
+then
+    echo "Script called with unexpected arguments: $*" >&2
+    echo "Expected $0 --upstream-version <uversion>" >&2
+    exit 1
+fi
+
+PWD=$(pwd)
+cd ..
+PPWD=$(pwd)
+TMP=$(mktemp -d)
+trap "rm -rf '$TMP'" INT QUIT TERM EXIT
+
+uversion=$2
+cd "$TMP"
+
+hg clone http://hg.code.sf.net/p/ruamel-yaml/code ruamel.yaml-$uversion
+cd ruamel.yaml-$uversion
+hg update $uversion
+cd ..
+tar Jcpf ruamel.yaml_$uversion.orig.tar.xz --exclude=.hg ruamel.yaml-$uversion
+rm -f "$PPWD"/ruamel.yaml_$uversion.orig.tar.gz
+mv ruamel.yaml_$uversion.orig.tar.xz "$PPWD"
+cd "$PWD"
+rm -rf "$TMP"
+
+trap - INT QUIT TERM EXIT
+
diff --git a/debian/patches/big_endian b/debian/patches/big_endian
deleted file mode 100644
index 2f617f0..0000000
--- a/debian/patches/big_endian
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Michael R. Crusoe <crusoe@debian.org>
-Description: Default to pure python parsing on big endian systems
-Forwarded: not-needed
-
-As the cpython code has an endianness bug https://sourceforge.net/p/ruamel-yaml/tickets/360/
-
-Thanks to Rebecca N. Palmer for the tip about sys.byteorder!
-
-Index: ruamel.yaml/main.py
-===================================================================
---- ruamel.yaml.orig/main.py
-+++ ruamel.yaml/main.py
-@@ -58,7 +58,7 @@ class YAML:
-         self: Any,
-         *,
-         typ: Optional[Union[List[Text], Text]] = None,
--        pure: Any = False,
-+        pure: Any = None,
-         output: Any = None,
-         plug_ins: Any = None,
-     ) -> None:  # input=None,
-@@ -75,6 +75,11 @@ class YAML:
-         """
- 
-         self.typ = ['rt'] if typ is None else (typ if isinstance(typ, list) else [typ])
-+        if pure is None:
-+            if sys.byteorder == 'big':
-+                pure = True
-+            else:
-+                pure = False
-         self.pure = pure
- 
-         # self._input = input
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f79ae58..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-big_endian
diff --git a/debian/pybuild.testfiles b/debian/pybuild.testfiles
new file mode 100644
index 0000000..2339ce5
--- /dev/null
+++ b/debian/pybuild.testfiles
@@ -0,0 +1,2 @@
+_test
+tox.ini
diff --git a/debian/python3-ruamel.yaml.README.Debian b/debian/python3-ruamel.yaml.README.Debian
new file mode 100644
index 0000000..99312d8
--- /dev/null
+++ b/debian/python3-ruamel.yaml.README.Debian
@@ -0,0 +1,8 @@
+Documentation for ruamel.yaml
+=============================
+
+The documentation source for ruamel.yaml can be found in the _doc
+directory.  The online version of it can be found at
+https://yaml.readthedocs.io/
+
+ -- Julian Gilbey <jdg@debian.org>, Mon, 15 Apr 2024 07:20:53 +0100
diff --git a/debian/python3-ruamel.yaml.docs b/debian/python3-ruamel.yaml.docs
index b43bf86..cd0f3e9 100644
--- a/debian/python3-ruamel.yaml.docs
+++ b/debian/python3-ruamel.yaml.docs
@@ -1 +1,2 @@
+_doc
 README.md
diff --git a/debian/rules b/debian/rules
index b0bd3b2..ad6e9e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,11 @@
 
 export PYBUILD_NAME=ruamel.yaml
 export PYBUILD_INSTALL_ARGS=--single-version-externally-managed
-#export PYBUILD_BEFORE_BUILD_python3=cython3 ext/_ruamel_yaml.pyx
-export PYBUILD_BEFORE_TEST=ln -s {dir}/_test {build_dir}/
 export PYBUILD_TEST_ARGS=_test/test_*.py
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	echo "There is no test suite available"
-endif
+# pybuild introduces this file
+execute_after_dh_clean:
+	rm -f pyproject.toml
diff --git a/debian/watch b/debian/watch
index 82761ab..4cf0f0d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=4
-opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
-https://pypi.debian.net/ruamel.yaml/ruamel.yaml-(.+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
+https://pypi.python.org/packages/source/r/ruamel.yaml/ \
+    ruamel.yaml-@ANY_VERSION@@ARCHIVE_EXT@ \
+    debian debian/get-hg-version