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 --- .../Makefile | 23 ++++++++++++++++++++++ .../pkg-real-amd64/DEBIAN/control | 10 ++++++++++ .../pkg-real-i386/DEBIAN/control | 10 ++++++++++ .../pkg-virt-amd64/DEBIAN/control | 12 +++++++++++ .../pkg-virt-i386/DEBIAN/control | 12 +++++++++++ 5 files changed, 67 insertions(+) create mode 100644 tests/t-conflict-provide-replace-virtual-multiarch/Makefile create mode 100644 tests/t-conflict-provide-replace-virtual-multiarch/pkg-real-amd64/DEBIAN/control create mode 100644 tests/t-conflict-provide-replace-virtual-multiarch/pkg-real-i386/DEBIAN/control create mode 100644 tests/t-conflict-provide-replace-virtual-multiarch/pkg-virt-amd64/DEBIAN/control create mode 100644 tests/t-conflict-provide-replace-virtual-multiarch/pkg-virt-i386/DEBIAN/control (limited to 'tests/t-conflict-provide-replace-virtual-multiarch') diff --git a/tests/t-conflict-provide-replace-virtual-multiarch/Makefile b/tests/t-conflict-provide-replace-virtual-multiarch/Makefile new file mode 100644 index 0000000..22176a3 --- /dev/null +++ b/tests/t-conflict-provide-replace-virtual-multiarch/Makefile @@ -0,0 +1,23 @@ +TESTS_DEB := pkg-virt-i386 pkg-virt-amd64 pkg-real-i386 pkg-real-amd64 + +include ../Test.mk + +test-case: + $(DPKG) --add-architecture amd64 + $(DPKG) --add-architecture i386 + $(DPKG_INSTALL) pkg-virt-i386.deb + # Configuring pkg-real:amd64 should not be allowed + ! $(DPKG_INSTALL) pkg-real-amd64.deb + $(DPKG_INSTALL) pkg-real-i386.deb + $(DPKG_INSTALL) pkg-virt-amd64.deb + $(DPKG_INSTALL) pkg-real-i386.deb + # Purging should not be allowed + ! $(DPKG_PURGE) pkg-virt:i386 + +test-clean: + $(DPKG_PURGE) pkg-real:i386 + $(DPKG_PURGE) pkg-real:amd64 + $(DPKG_PURGE) pkg-virt:i386 + $(DPKG_PURGE) pkg-virt:amd64 + $(DPKG) --remove-architecture amd64 + $(DPKG) --remove-architecture i386 diff --git a/tests/t-conflict-provide-replace-virtual-multiarch/pkg-real-amd64/DEBIAN/control b/tests/t-conflict-provide-replace-virtual-multiarch/pkg-real-amd64/DEBIAN/control new file mode 100644 index 0000000..b0d033c --- /dev/null +++ b/tests/t-conflict-provide-replace-virtual-multiarch/pkg-real-amd64/DEBIAN/control @@ -0,0 +1,10 @@ +Package: pkg-real +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: amd64 +Multi-Arch: same +Depends: pkg-v +Description: test package - depending on virtual + diff --git a/tests/t-conflict-provide-replace-virtual-multiarch/pkg-real-i386/DEBIAN/control b/tests/t-conflict-provide-replace-virtual-multiarch/pkg-real-i386/DEBIAN/control new file mode 100644 index 0000000..e248c73 --- /dev/null +++ b/tests/t-conflict-provide-replace-virtual-multiarch/pkg-real-i386/DEBIAN/control @@ -0,0 +1,10 @@ +Package: pkg-real +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: i386 +Multi-Arch: same +Depends: pkg-v +Description: test package - depending on virtual + diff --git a/tests/t-conflict-provide-replace-virtual-multiarch/pkg-virt-amd64/DEBIAN/control b/tests/t-conflict-provide-replace-virtual-multiarch/pkg-virt-amd64/DEBIAN/control new file mode 100644 index 0000000..312fafd --- /dev/null +++ b/tests/t-conflict-provide-replace-virtual-multiarch/pkg-virt-amd64/DEBIAN/control @@ -0,0 +1,12 @@ +Package: pkg-virt +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: amd64 +Multi-Arch: same +Conflicts: pkg-v +Provides: pkg-v +Replaces: pkg-v +Description: test package - conflicting virtual + diff --git a/tests/t-conflict-provide-replace-virtual-multiarch/pkg-virt-i386/DEBIAN/control b/tests/t-conflict-provide-replace-virtual-multiarch/pkg-virt-i386/DEBIAN/control new file mode 100644 index 0000000..f1b171f --- /dev/null +++ b/tests/t-conflict-provide-replace-virtual-multiarch/pkg-virt-i386/DEBIAN/control @@ -0,0 +1,12 @@ +Package: pkg-virt +Version: 0 +Section: test +Priority: extra +Maintainer: Dpkg Developers +Architecture: i386 +Multi-Arch: same +Conflicts: pkg-v +Provides: pkg-v +Replaces: pkg-v +Description: test package - conflicting virtual + -- cgit v1.2.3