Rediff patches

Drop : <REASON>
Drop pborman-uuid.patch: <REASON>
Drop kjk-lzma.patch: <REASON>

debian/patches/Fix-UUID-struct-field-not-encoded-in-msgpack.patch

@@ -1,9 +1,7 @@
 From: Shengjing Zhu <zhsj@debian.org>
 Date: Tue, 26 Mar 2019 15:49:40 +0800
 Subject: Fix UUID struct field not encoded in msgpack
-Description: golang-github-ugorji-go-codec-dev 1.1.1 takes the json field tag
+
- by default, thus the field which has `json:"-"` is ignored when
- marshal into msgpack.
 Upstream uses the old codec library, so there's no problem.
 Bug-Debian: https://bugs.debian.org/923866
 Forwarded: no
@@ -13,10 +11,10 @@ Forwarded: no
  2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/deb/local.go b/deb/local.go
-index e9fa17c..fb3e404 100644
+index 229f6e1..5b8eb2a 100644
 --- a/deb/local.go
 +++ b/deb/local.go
-@@ -14,7 +14,7 @@ import (
+@@ -15,7 +15,7 @@ import (
  // LocalRepo is a collection of packages created locally
  type LocalRepo struct {
  	// Permanent internal ID
@@ -25,7 +23,7 @@ index e9fa17c..fb3e404 100644
  	// User-assigned name
  	Name string
  	// Comment
-@@ -24,7 +24,7 @@ type LocalRepo struct {
+@@ -25,7 +25,7 @@ type LocalRepo struct {
  	// DefaultComponent
  	DefaultComponent string `codec:",omitempty"`
  	// Uploaders configuration
@@ -35,7 +33,7 @@ index e9fa17c..fb3e404 100644
  	packageRefs *PackageRefList
  }
 diff --git a/deb/snapshot.go b/deb/snapshot.go
-index fc7689c..1aca3e3 100644
+index 307433a..aef19ae 100644
 --- a/deb/snapshot.go
 +++ b/deb/snapshot.go
 @@ -19,15 +19,15 @@ import (

debian/patches/Fix-time.Time-msgpack-decoding-backwards-compatibili.patch

@@ -11,10 +11,10 @@ Forwarded: https://github.com/aptly-dev/aptly/pull/830
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/deb/remote.go b/deb/remote.go
-index 167d45f..71eb984 100644
+index 72165ba..316636d 100644
 --- a/deb/remote.go
 +++ b/deb/remote.go
-@@ -600,7 +600,8 @@ func (repo *RemoteRepo) Decode(input []byte) error {
+@@ -662,7 +662,8 @@ func (repo *RemoteRepo) Decode(input []byte) error {
  	decoder := codec.NewDecoderBytes(input, &codec.MsgpackHandle{})
  	err := decoder.Decode(repo)
  	if err != nil {
@@ -25,7 +25,7 @@ index 167d45f..71eb984 100644
  			var repo11 struct { // nolint: maligned
  				UUID             string
 diff --git a/deb/snapshot.go b/deb/snapshot.go
-index fc7689c..feef44a 100644
+index aef19ae..cefe82e 100644
 --- a/deb/snapshot.go
 +++ b/deb/snapshot.go
 @@ -140,7 +140,8 @@ func (s *Snapshot) Decode(input []byte) error {

debian/patches/kjk-lzma.patch

@@ -1,15 +0,0 @@
-Description: Use Debian's lzma package.
-Author: Alexandre Viau <aviau@debian.org>
-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

debian/patches/pborman-uuid.patch

@@ -1,70 +0,0 @@
-Description: Use Debian's uuid package.
-Author: Alexandre Viau <aviau@debian.org>
-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"

debian/patches/series

@@ -1,5 +1,2 @@
-
-kjk-lzma.patch
-pborman-uuid.patch
 Fix-UUID-struct-field-not-encoded-in-msgpack.patch
 Fix-time.Time-msgpack-decoding-backwards-compatibili.patch