From 1de4d699223e7c6eedf4ba1becc3b7079cfddd99 Mon Sep 17 00:00:00 2001 From: aviau Date: Mon, 15 Oct 2018 11:49:41 -0400 Subject: [PATCH] Use Debian's uuid pacakge --- debian/changelog | 2 + debian/control | 2 + debian/patches/kjk-lzma.patch | 15 +++++++ debian/patches/pborman-uuid.patch | 70 +++++++++++++++++++++++++++++++ debian/patches/series | 2 + 5 files changed, 91 insertions(+) create mode 100644 debian/patches/kjk-lzma.patch create mode 100644 debian/patches/pborman-uuid.patch diff --git a/debian/changelog b/debian/changelog index 3fd38367..7d7a5951 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ aptly (1.3.0+ds1-1) UNRELEASED; urgency=medium * d/copyright: remove vendor/* sections. * d/copyright: MIT -> Expat. * d/control: add vendor/* build dependencies. + * Patch: Use Debian's uuid package. + * Patch: Use Debian's lzma package. -- Ondřej Nový Mon, 01 Oct 2018 10:22:55 +0200 diff --git a/debian/control b/debian/control index 3e4413a8..df4b2082 100644 --- a/debian/control +++ b/debian/control @@ -22,6 +22,8 @@ Build-Depends: debhelper (>= 11), golang-github-smira-go-aws-auth-dev, golang-github-wsxiaoys-terminal-dev, golang-github-mxk-go-flowrate-dev, + golang-github-pborman-uuid-dev, + golang-github-kjk-lzma-dev, Standards-Version: 4.1.3 Homepage: http://www.aptly.info Vcs-Git: https://salsa.debian.org/debian/aptly.git diff --git a/debian/patches/kjk-lzma.patch b/debian/patches/kjk-lzma.patch new file mode 100644 index 00000000..c383904a --- /dev/null +++ b/debian/patches/kjk-lzma.patch @@ -0,0 +1,15 @@ +Description: Use Debian's lzma package. +Author: Alexandre Viau +Applied-Upstream: https://github.com/aptly-dev/aptly/commit/7dfc12d138160e0a29d6157fb90ef1ed920064b0 + +--- a/deb/deb.go ++++ b/deb/deb.go +@@ -16,7 +16,7 @@ + + "github.com/aptly-dev/aptly/pgp" + "github.com/smira/go-xz" +- "github.com/smira/lzma" ++ "github.com/kjk/lzma" + ) + + // Source kinds diff --git a/debian/patches/pborman-uuid.patch b/debian/patches/pborman-uuid.patch new file mode 100644 index 00000000..31b44e31 --- /dev/null +++ b/debian/patches/pborman-uuid.patch @@ -0,0 +1,70 @@ +Description: Use Debian's uuid package. +Author: Alexandre Viau +Applied-Upstream: https://github.com/aptly-dev/aptly/commit/814ac6c28c5d374d16f3177af4f2eb3eaa1811f7 + +--- a/deb/contents.go ++++ b/deb/contents.go +@@ -7,7 +7,7 @@ + "io" + + "github.com/aptly-dev/aptly/database" +- "github.com/smira/go-uuid/uuid" ++ "github.com/pborman/uuid" + ) + + // ContentsIndex calculates mapping from files to packages, with sorting and aggregation +--- a/deb/local.go ++++ b/deb/local.go +@@ -7,7 +7,7 @@ + "sync" + + "github.com/aptly-dev/aptly/database" +- "github.com/smira/go-uuid/uuid" ++ "github.com/pborman/uuid" + "github.com/ugorji/go/codec" + ) + +--- a/deb/publish.go ++++ b/deb/publish.go +@@ -14,7 +14,7 @@ + "sync" + "time" + +- "github.com/smira/go-uuid/uuid" ++ "github.com/pborman/uuid" + "github.com/ugorji/go/codec" + + "github.com/aptly-dev/aptly/aptly" +--- a/deb/remote.go ++++ b/deb/remote.go +@@ -20,7 +20,7 @@ + "github.com/aptly-dev/aptly/http" + "github.com/aptly-dev/aptly/pgp" + "github.com/aptly-dev/aptly/utils" +- "github.com/smira/go-uuid/uuid" ++ "github.com/pborman/uuid" + "github.com/ugorji/go/codec" + ) + +--- a/deb/snapshot.go ++++ b/deb/snapshot.go +@@ -12,7 +12,7 @@ + + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/utils" +- "github.com/smira/go-uuid/uuid" ++ "github.com/pborman/uuid" + "github.com/ugorji/go/codec" + ) + +--- a/files/package_pool.go ++++ b/files/package_pool.go +@@ -9,7 +9,7 @@ + "sync" + "syscall" + +- "github.com/smira/go-uuid/uuid" ++ "github.com/pborman/uuid" + + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" diff --git a/debian/patches/series b/debian/patches/series index 8b137891..0751c816 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ +kjk-lzma.patch +pborman-uuid.patch