diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/emulated-g-ir-tool.in (renamed from debian/cross-g-ir-tool.in) | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 |
3 files changed, 14 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d82afaaad..94bdeba75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +glib2.0 (2.80.0-4) experimental; urgency=medium + + * d/emulated-g-ir-tool.in: Rename from cross-g-ir-tool.in. + This makes it consistent with the template of the same name in + gobject-introspection. + * d/emulated-g-ir-tool.in: Fix qemu-user invocation. + Previously, the gi- tools generated from this template only worked on + systems that could run the tool directly via binfmt_misc. Now they invoke + qemu-user explicitly, as intended. + + -- Simon McVittie <smcv@debian.org> Mon, 18 Mar 2024 18:56:39 +0000 + glib2.0 (2.80.0-3) experimental; urgency=medium * Merge packaging from unstable diff --git a/debian/cross-g-ir-tool.in b/debian/emulated-g-ir-tool.in index 1c8a5e9d9..d91aab01f 100644 --- a/debian/cross-g-ir-tool.in +++ b/debian/emulated-g-ir-tool.in @@ -74,7 +74,7 @@ class CrossGirTool: argv = exe_wrapper + [TOOL_PATH] + sys.argv[1:] try: - os.execvp(TOOL_PATH, argv) + os.execvp(argv[0], argv) except OSError: print(f'{ME}: Unable to run: {argv}') raise diff --git a/debian/rules b/debian/rules index 729c398bd..d9c2d9fcd 100755 --- a/debian/rules +++ b/debian/rules @@ -74,7 +74,7 @@ cross_tools = \ gi-decompile-typelib \ gi-inspect-typelib \ $(NULL) -cross-tools: debian/cross-g-ir-tool.in debian/rules +cross-tools: debian/emulated-g-ir-tool.in debian/rules mkdir -p debian/cross-tools set -e; for tool in $(cross_tools); do \ sed \ |