Merge ~liushuyu-011/ubuntu/+source/ocaml-re:ubuntu/devel into ubuntu/+source/ocaml-re:ubuntu/devel

[Zixing Liu]

This merge proposal fixes the broken test script that patches the test runner script incorrectly.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16491897/+listing-archive-extra

[Graham Inggs (ginggs)]

It seems ocaml-re was reverted:
https://launchpad.net/ubuntu/+source/ocaml-re/1.12.0+really1.11.0-1

Does this patch need to be re-based?

review: Needs Fixing

Unmerged commits

017ab4f... by Zixing Liu on 2024-09-16

changelog

787d47a... by Zixing Liu on 2024-09-16

update-maintainer

4a1bdc4... by Zixing Liu on 2024-09-16

d/tests/tests: fix mismatching parenthesis after removing the copy rule

diff --git a/debian/changelog b/debian/changelog
index 1deb3b8..4fe6e4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-re (1.12.0-1ubuntu1) oracular; urgency=medium
+
+  * d/tests/tests: fix mismatching parenthesis after removing the copy rule
+
+ -- Zixing Liu <[e-mail]>  Mon, 16 Sep 2024 13:44:15 -0600
+
 ocaml-re (1.12.0-1) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/control b/debian/control
index d49a89f..eb74739 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ocaml-re
 Section: ocaml
 Priority: optional
-Maintainer: Debian OCaml Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian OCaml Maintainers <[e-mail]>
 Uploaders:
  Mehdi Dogguy <[e-mail]>
 Build-Depends:
diff --git a/debian/tests/tests b/debian/tests/tests
index 1b9cf6b..2679db1 100755
--- a/debian/tests/tests
+++ b/debian/tests/tests
@@ -9,7 +9,7 @@ cp -a lib_test ${outdir}
 cp debian/tests/dune-project ${outdir}/lib_test/
 cp lib/fmt.ml ${outdir}/lib_test/fort_unit/
 cd ${outdir}/lib_test
-sed -i '/fmt\.ml/d' fort_unit/dune
+sed -i -e '/fmt\.ml/d' -e 's|^(rule$||g' fort_unit/dune
 
 echo "* Run tests"
 dune runtest 2>&1