diff --git a/debian/control b/debian/control index 28f5cc0ce6f73c4c12ad59077901879d279ee705..9313eb993534ec8b047847efce8a18e346de332f 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 11), golang-any, golang-github-burntsushi-toml-dev, golang-github-containers-storage-dev (>= 1.11), - golang-github-coreos-bbolt-dev, + golang-github-coreos-bbolt-dev (>= 1.3.3~), golang-github-docker-docker-credential-helpers-dev, golang-github-docker-docker-dev, # golang-github-docker-distribution-dev, @@ -48,8 +48,8 @@ Testsuite: autopkgtest-pkg-go Package: golang-github-containers-image-dev Architecture: all Depends: ${misc:Depends}, - golang-github-boltdb-bolt-dev, golang-github-burntsushi-toml-dev, + golang-github-coreos-bbolt-dev (>= 1.3.3~), golang-github-docker-docker-credential-helpers-dev, golang-github-docker-docker-dev, # golang-github-docker-distribution-dev, diff --git a/debian/patches/bbolt.patch b/debian/patches/bbolt.patch deleted file mode 100644 index a7ea93d27722003f8802bc24d5f7853d5bab7afb..0000000000000000000000000000000000000000 --- a/debian/patches/bbolt.patch +++ /dev/null @@ -1,16 +0,0 @@ -From: Reinhard Tartler <siretart@debian.org> -Subject: Use older import path -Forwarded-Upstream: not-needed -Comments: Drop after debian upgrades the package to the new import namespace - ---- a/pkg/blobinfocache/boltdb/boltdb.go -+++ b/pkg/blobinfocache/boltdb/boltdb.go -@@ -9,7 +9,7 @@ import ( - - "github.com/containers/image/v4/pkg/blobinfocache/internal/prioritize" - "github.com/containers/image/v4/types" -- bolt "github.com/etcd-io/bbolt" -+ bolt "github.com/coreos/bbolt" - "github.com/opencontainers/go-digest" - "github.com/sirupsen/logrus" - ) diff --git a/debian/patches/series b/debian/patches/series index f5d2f42f34ae16e4df8dab2e5281adf893ea8252..51973e546358dfe5674f9e8e009be218930b4120 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ gpgme.patch disable-kubernetes.patch -bbolt.patch docker-libtrust.patch t-skip.patch