From cbffab246997fb5a06211dfb706b54e5ae5bb59f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:58:51 +0200 Subject: Adding upstream version 1.21.22. Signed-off-by: Daniel Baumann --- tests/t-conffile-root-option/pkg-conff-b-2/DEBIAN/conffiles | 1 + tests/t-conffile-root-option/pkg-conff-b-2/DEBIAN/control | 7 +++++++ tests/t-conffile-root-option/pkg-conff-b-2/test-conffile | 1 + 3 files changed, 9 insertions(+) create mode 100644 tests/t-conffile-root-option/pkg-conff-b-2/DEBIAN/conffiles create mode 100644 tests/t-conffile-root-option/pkg-conff-b-2/DEBIAN/control create mode 100644 tests/t-conffile-root-option/pkg-conff-b-2/test-conffile (limited to 'tests/t-conffile-root-option/pkg-conff-b-2') diff --git a/tests/t-conffile-root-option/pkg-conff-b-2/DEBIAN/conffiles b/tests/t-conffile-root-option/pkg-conff-b-2/DEBIAN/conffiles new file mode 100644 index 0000000..4fad7e9 --- /dev/null +++ b/tests/t-conffile-root-option/pkg-conff-b-2/DEBIAN/conffiles @@ -0,0 +1 @@ +/test-conffile diff --git a/tests/t-conffile-root-option/pkg-conff-b-2/DEBIAN/control b/tests/t-conffile-root-option/pkg-conff-b-2/DEBIAN/control new file mode 100644 index 0000000..57b18ee --- /dev/null +++ b/tests/t-conffile-root-option/pkg-conff-b-2/DEBIAN/control @@ -0,0 +1,7 @@ +Package: pkg-conff-b +Version: 2 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: all +Description: test package - conflicting conffile diff --git a/tests/t-conffile-root-option/pkg-conff-b-2/test-conffile b/tests/t-conffile-root-option/pkg-conff-b-2/test-conffile new file mode 100644 index 0000000..006fbc7 --- /dev/null +++ b/tests/t-conffile-root-option/pkg-conff-b-2/test-conffile @@ -0,0 +1 @@ +pkg-conff-b -- cgit v1.2.3