Merge changes from apertis/v2024-updates into apertis/v2024

debian/apertis/copyright

@@ -49,6 +49,11 @@ Files: vendor/github.com/containers/*
 Copyright: 2018, 2019, github.com/containers authors
 License: Apache-2.0
 
+Files: contrib/podmanimage/* contrib/podmanimage/upstream/* pkg/* test/* test/e2e/testdata/*
+Copyright:
+ 2016-2019 Red Hat, Inc.
+License: Apache-2.0
+
 Files: vendor/github.com/digitalocean/go-libvirt/const.gen.go
  vendor/github.com/digitalocean/go-libvirt/doc.go
  vendor/github.com/digitalocean/go-libvirt/libvirt.go
@@ -80,7 +85,7 @@ Files: vendor/github.com/uber/*
 Copyright: 2017,2018 Uber Technologies, Inc.
 License: Apache-2.0
 
-Files: CONTRIBUTING.md contrib/podmanimage/* contrib/podmanimage/upstream/* pkg/* test/* test/e2e/testdata/* test/e2e/testdata/docker-two-images.tar.xz test/e2e/testdata/oci-non-docker-name.tar.gz test/e2e/testdata/oci-registry-name.tar.gz
+Files: CONTRIBUTING.md test/e2e/testdata/docker-two-images.tar.xz test/e2e/testdata/oci-non-docker-name.tar.gz test/e2e/testdata/oci-registry-name.tar.gz
 Copyright:
  2016-2019 Red Hat, Inc.
 License: Apache-2.0