This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=110af0c2f25abbaa5bb2b2fe9742cd0dffae665f commit 110af0c2f25abbaa5bb2b2fe9742cd0dffae665f Author: Guillem Jover <[email protected]> AuthorDate: Fri Dec 17 05:29:22 2021 +0100 test: Rename DPKG_GEN_FILE to DPKG_GEN_CTRL_FILE This generates a control member file. --- src/at/deb-content.at | 16 ++++++++-------- src/at/local.at | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/at/deb-content.at b/src/at/deb-content.at index 9ec63de0b..f475603f9 100644 --- a/src/at/deb-content.at +++ b/src/at/deb-content.at @@ -2,7 +2,7 @@ AT_SETUP([dpkg-deb .deb conffiles]) AT_KEYWORDS([dpkg-deb deb conffiles]) DPKG_GEN_CONTROL([pkg-conff-duped]) -DPKG_GEN_FILE([pkg-conff-duped], [conffiles], [/test-conffile-1 +DPKG_GEN_CTRL_FILE([pkg-conff-duped], [conffiles], [/test-conffile-1 /test-conffile-2 /test-conffile-1]) AT_DATA([pkg-conff-duped/test-conffile-1], [test init @@ -28,7 +28,7 @@ dpkg-deb -b pkg-conff-noeol pkg-conff-noeol.deb ]) DPKG_GEN_CONTROL([pkg-conff-noabs]) -DPKG_GEN_FILE([pkg-conff-noabs], [conffiles], [test-conffile-rel]) +DPKG_GEN_CTRL_FILE([pkg-conff-noabs], [conffiles], [test-conffile-rel]) AT_DATA([pkg-conff-noabs/test-conffile-rel], [test init ]) AT_CHECK([ @@ -46,7 +46,7 @@ dpkg-deb -b pkg-conff-empty pkg-conff-empty.deb ]) DPKG_GEN_CONTROL([pkg-conff-space-prefix]) -DPKG_GEN_FILE([pkg-conff-space-prefix], [conffiles], [ /test-conffile]) +DPKG_GEN_CTRL_FILE([pkg-conff-space-prefix], [conffiles], [ /test-conffile]) AT_CHECK([ # Conffiles must not contain prefixed spaces. dpkg-deb -b pkg-conff-space-prefix pkg-conff-space-prefix.deb @@ -54,7 +54,7 @@ dpkg-deb -b pkg-conff-space-prefix pkg-conff-space-prefix.deb ]) DPKG_GEN_CONTROL([pkg-conff-unknown-flag]) -DPKG_GEN_FILE([pkg-conff-unknown-flag], [conffiles], [unknown-flag /test-conffile]) +DPKG_GEN_CTRL_FILE([pkg-conff-unknown-flag], [conffiles], [unknown-flag /test-conffile]) AT_CHECK([ # Conffiles marked with an unknown flag. dpkg-deb -b pkg-conff-unknown-flag pkg-conff-unknown-flag.deb @@ -70,14 +70,14 @@ dpkg-deb -b pkg-conff-missing-pathname pkg-conff-missing-pathname.deb ]) DPKG_GEN_CONTROL([pkg-conff-removed-missing]) -DPKG_GEN_FILE([pkg-conff-removed-missing], [conffiles], [remove-on-upgrade /test-conffile-missing]) +DPKG_GEN_CTRL_FILE([pkg-conff-removed-missing], [conffiles], [remove-on-upgrade /test-conffile-missing]) AT_CHECK([ # Conffiles marked for removal must not be present. dpkg-deb -b pkg-conff-removed-missing pkg-conff-removed-missing.deb ], [0], [ignore], []) DPKG_GEN_CONTROL([pkg-conff-removed-duped]) -DPKG_GEN_FILE([pkg-conff-removed-duped], [conffiles], [remove-on-upgrade /test-conffile-1 +DPKG_GEN_CTRL_FILE([pkg-conff-removed-duped], [conffiles], [remove-on-upgrade /test-conffile-1 remove-on-upgrade /test-conffile-2 remove-on-upgrade /test-conffile-1]) AT_CHECK([ @@ -97,7 +97,7 @@ dpkg-deb -b pkg-conff-removed-noeol pkg-conff-removed-noeol.deb ]) DPKG_GEN_CONTROL([pkg-conff-removed-noabs]) -DPKG_GEN_FILE([pkg-conff-removed-noabs], [conffiles], [remove-on-upgrade test-conffile-rel]) +DPKG_GEN_CTRL_FILE([pkg-conff-removed-noabs], [conffiles], [remove-on-upgrade test-conffile-rel]) AT_DATA([pkg-conff-removed-noabs/test-conffile-rel], [test init ]) AT_CHECK([ @@ -107,7 +107,7 @@ dpkg-deb -b pkg-conff-removed-noabs pkg-conff-removed-noabs.deb ]) DPKG_GEN_CONTROL([pkg-conff-removed-present]) -DPKG_GEN_FILE([pkg-conff-removed-present], [conffiles], [remove-on-upgrade /test-conffile-present]) +DPKG_GEN_CTRL_FILE([pkg-conff-removed-present], [conffiles], [remove-on-upgrade /test-conffile-present]) AT_DATA([pkg-conff-removed-present/test-conffile-present], [test init ]) AT_CHECK([ diff --git a/src/at/local.at b/src/at/local.at index 1c1cfff45..37c8a5a18 100644 --- a/src/at/local.at +++ b/src/at/local.at @@ -22,8 +22,8 @@ m4_define([DPKG_MOD_CONTROL], [ $SED -i -e '$2' '$1/DEBIAN/control' ]) -# DPKG_GEN_FILE([$pkgname], [$file], [$contents]) -m4_define([DPKG_GEN_FILE], [ +# DPKG_GEN_CTRL_FILE([$pkgname], [$file], [$contents]) +m4_define([DPKG_GEN_CTRL_FILE], [ mkdir -p '$1/DEBIAN' cat >'$1/DEBIAN/$2' <<CTRL_TEMPL -- Dpkg.Org's dpkg
