vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-07-15 11:57:59 +00:00
Code Issues Projects Releases Wiki Activity

Use Debian's uuid pacakge

Browse Source
This commit is contained in:
aviau
2018-10-15 11:49:41 -04:00
parent dbc5ba9458
commit 1de4d69922
5 changed files with 91 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/patches/kjk-lzma.patch
Vendored
+15
View File
@@ -0,0 +1,15 @@
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
Vendored
+70
View File
@@ -0,0 +1,70 @@
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
Vendored
+2
View File
@@ -1 +1,3 @@
kjk-lzma.patch
pborman-uuid.patch