From b8c5303fdb8c7635a13b90c50138fb5a08b8eb82 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 18 Apr 2018 21:19:43 +0300 Subject: [PATCH] Fix paths after repository transfer to aptly-dev --- .travis.yml | 2 +- CONTRIBUTING.md | 12 ++++++------ README.rst | 20 ++++++++++---------- _man/gen.go | 2 +- api/api.go | 6 +++--- api/graph.go | 2 +- api/publish.go | 6 +++--- api/repos.go | 8 ++++---- api/router.go | 2 +- api/snapshot.go | 4 ++-- aptly/interfaces.go | 2 +- cmd/api_serve.go | 6 +++--- cmd/cmd.go | 4 ++-- cmd/context.go | 2 +- cmd/db_cleanup.go | 4 ++-- cmd/db_recover.go | 2 +- cmd/graph.go | 4 ++-- cmd/mirror.go | 2 +- cmd/mirror_create.go | 4 ++-- cmd/mirror_edit.go | 4 ++-- cmd/mirror_list.go | 2 +- cmd/mirror_rename.go | 2 +- cmd/mirror_show.go | 4 ++-- cmd/mirror_update.go | 8 ++++---- cmd/package_search.go | 4 ++-- cmd/package_show.go | 6 +++--- cmd/publish.go | 2 +- cmd/publish_drop.go | 2 +- cmd/publish_list.go | 2 +- cmd/publish_show.go | 2 +- cmd/publish_snapshot.go | 6 +++--- cmd/publish_switch.go | 4 ++-- cmd/publish_update.go | 2 +- cmd/repo_add.go | 6 +++--- cmd/repo_create.go | 2 +- cmd/repo_edit.go | 2 +- cmd/repo_include.go | 8 ++++---- cmd/repo_list.go | 2 +- cmd/repo_move.go | 4 ++-- cmd/repo_remove.go | 4 ++-- cmd/repo_rename.go | 2 +- cmd/run.go | 2 +- cmd/serve.go | 6 +++--- cmd/snapshot_create.go | 2 +- cmd/snapshot_filter.go | 4 ++-- cmd/snapshot_list.go | 2 +- cmd/snapshot_merge.go | 2 +- cmd/snapshot_pull.go | 4 ++-- cmd/snapshot_rename.go | 2 +- cmd/snapshot_search.go | 4 ++-- cmd/snapshot_show.go | 2 +- cmd/snapshot_verify.go | 2 +- cmd/version.go | 2 +- console/progress.go | 2 +- context/context.go | 20 ++++++++++---------- context/context_test.go | 2 +- deb/changes.go | 6 +++--- deb/checksum_collection.go | 6 +++--- deb/checksum_collection_test.go | 4 ++-- deb/collections.go | 2 +- deb/contents.go | 2 +- deb/deb.go | 2 +- deb/deb_test.go | 2 +- deb/import.go | 6 +++--- deb/index_files.go | 6 +++--- deb/list.go | 4 ++-- deb/local.go | 2 +- deb/local_test.go | 2 +- deb/package.go | 4 ++-- deb/package_collection.go | 4 ++-- deb/package_collection_test.go | 4 ++-- deb/package_files.go | 4 ++-- deb/package_files_test.go | 6 +++--- deb/package_test.go | 2 +- deb/ppa.go | 2 +- deb/ppa_test.go | 2 +- deb/publish.go | 8 ++++---- deb/publish_test.go | 6 +++--- deb/reflist_test.go | 2 +- deb/remote.go | 10 +++++----- deb/remote_test.go | 14 +++++++------- deb/snapshot.go | 4 ++-- deb/snapshot_test.go | 2 +- deb/uploaders.go | 4 ++-- deb/uploaders_test.go | 2 +- files/mocks.go | 4 ++-- files/package_pool.go | 4 ++-- files/package_pool_test.go | 4 ++-- files/public.go | 4 ++-- files/public_test.go | 4 ++-- http/compression.go | 4 ++-- http/compression_test.go | 2 +- http/download.go | 4 ++-- http/download_test.go | 6 +++--- http/fake.go | 4 ++-- http/temp.go | 4 ++-- http/temp_test.go | 2 +- main.go | 4 ++-- query/query.go | 2 +- query/syntax.go | 2 +- query/syntax_test.go | 2 +- s3/public.go | 4 ++-- s3/public_test.go | 4 ++-- swift/public.go | 4 ++-- swift/public_test.go | 4 ++-- 105 files changed, 214 insertions(+), 214 deletions(-) diff --git a/.travis.yml b/.travis.yml index 47ef3147..4c0c3ac9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ sudo: required language: go -go_import_path: github.com/smira/aptly +go_import_path: github.com/aptly-dev/aptly addons: apt: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f4783170..d63e0f89 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ Please report unacceptable behavior to [team@aptly.info](mailto:team@aptly.info) ### List of Repositories -* [smira/aptly](https://github.com/smira/aptly) - aptly source code, functional tests, man page +* [aptly-dev/aptly](https://github.com/aptly-dev/aptly) - aptly source code, functional tests, man page * [apty-dev/aptly-dev.github.io](https://github.com/aptly-dev/aptly-dev.github.io) - aptly website (https://www.aptly.info/) * [aptly-dev/aptly-fixture-db](https://github.com/aptly-dev/aptly-fixture-db) & [aptly-dev/aptly-fixture-pool](https://github.com/aptly-dev/aptly-fixture-pool) provide fixtures for aptly functional tests @@ -24,15 +24,15 @@ Please report unacceptable behavior to [team@aptly.info](mailto:team@aptly.info) ### Reporting Bugs -1. Please search for similar bug report in [issue tracker](https://github.com/smira/aptly/issues) +1. Please search for similar bug report in [issue tracker](https://github.com/aptly-dev/aptly/issues) 2. Please verify that bug is not fixed in latest aptly nightly ([download information](https://www.aptly.info/download/)) 3. Steps to reproduce increases chances for bug to be fixed quickly. If possible, submit PR with new functional test which fails. 4. If bug is reproducible with specific package, please provide link to package file. -5. Open issue at [GitHub](https://github.com/smira/aptly/issues) +5. Open issue at [GitHub](https://github.com/aptly-dev/aptly/issues) ### Suggesting Enhancements -1. Please search [issue tracker](https://github.com/smira/aptly/issues) for similar feature requests. +1. Please search [issue tracker](https://github.com/aptly-dev/aptly/issues) for similar feature requests. 2. Describe why enhancement is important to you. 3. Include any additional details or implementation details. @@ -45,7 +45,7 @@ There are two kinds of documentation: Core content is mostly the same, but website contains more information, tutorials, examples. -If you want to update `man` page, please open PR to [main aptly repo](https://github.com/smira/aptly), +If you want to update `man` page, please open PR to [main aptly repo](https://github.com/aptly-dev/aptly), details in [man page](#man-page) section. If you want to update website, please follow steps below: @@ -88,7 +88,7 @@ As Go is using repository path in import paths, it's better to clone aptly repo mkdir -p ~/go/src/github.com/smira cd ~/go/src/github.com/smira - git clone git@github.com:smira/aptly.git + git clone git@github.com:aptly-dev/aptly.git cd aptly For main repo under your GitHub user and add it as another Git remote: diff --git a/README.rst b/README.rst index 6d2a8be5..c30f332d 100644 --- a/README.rst +++ b/README.rst @@ -2,17 +2,17 @@ aptly ===== -.. image:: https://api.travis-ci.org/smira/aptly.svg?branch=master - :target: https://travis-ci.org/smira/aptly +.. image:: https://api.travis-ci.org/aptly-dev/aptly.svg?branch=master + :target: https://travis-ci.org/aptly-dev/aptly -.. image:: https://codecov.io/gh/smira/aptly/branch/master/graph/badge.svg - :target: https://codecov.io/gh/smira/aptly +.. image:: https://codecov.io/gh/aptly-dev/aptly/branch/master/graph/badge.svg + :target: https://codecov.io/gh/aptly-dev/aptly .. image:: https://badges.gitter.im/Join Chat.svg - :target: https://gitter.im/smira/aptly?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge + :target: https://gitter.im/aptly-dev/aptly?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge -.. image:: http://goreportcard.com/badge/smira/aptly - :target: http://goreportcard.com/report/smira/aptly +.. image:: http://goreportcard.com/badge/aptly-dev/aptly + :target: http://goreportcard.com/report/aptly-dev/aptly Aptly is a swiss army knife for Debian repository management. @@ -66,9 +66,9 @@ Binary executables (depends almost only on libc) are available for download from If you have Go environment set up, you can build aptly from source by running (go 1.8+ required):: - mkdir -p $GOPATH/src/github.com/smira/aptly - git clone https://github.com/smira/aptly $GOPATH/src/github.com/smira/aptly - cd $GOPATH/src/github.com/smira/aptly + mkdir -p $GOPATH/src/github.com/aptly-dev/aptly + git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-dev/aptly + cd $GOPATH/src/github.com/aptly-dev/aptly make install Binary would be installed to ```$GOPATH/bin/aptly``. diff --git a/_man/gen.go b/_man/gen.go index c7f6a8d0..e0f0da07 100644 --- a/_man/gen.go +++ b/_man/gen.go @@ -10,7 +10,7 @@ import ( "strings" "text/template" - "github.com/smira/aptly/cmd" + "github.com/aptly-dev/aptly/cmd" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/api/api.go b/api/api.go index 21545da6..e7e3fd67 100644 --- a/api/api.go +++ b/api/api.go @@ -6,10 +6,10 @@ import ( "sort" "time" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" "github.com/gin-gonic/gin" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" ) // Lock order acquisition (canonical): diff --git a/api/graph.go b/api/graph.go index 192974f2..93d69086 100644 --- a/api/graph.go +++ b/api/graph.go @@ -8,8 +8,8 @@ import ( "os" "os/exec" + "github.com/aptly-dev/aptly/deb" "github.com/gin-gonic/gin" - "github.com/smira/aptly/deb" ) // GET /api/graph.:ext?layout=[vertical|horizontal(default)] diff --git a/api/publish.go b/api/publish.go index 10aa4b81..3de3f294 100644 --- a/api/publish.go +++ b/api/publish.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/pgp" + "github.com/aptly-dev/aptly/utils" "github.com/gin-gonic/gin" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/pgp" - "github.com/smira/aptly/utils" ) // SigningOptions is a shared between publish API GPG options structure diff --git a/api/repos.go b/api/repos.go index 8a8ab55f..57d1ed01 100644 --- a/api/repos.go +++ b/api/repos.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/utils" "github.com/gin-gonic/gin" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/database" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/utils" ) // GET /api/repos diff --git a/api/router.go b/api/router.go index 51342d71..854f0414 100644 --- a/api/router.go +++ b/api/router.go @@ -3,8 +3,8 @@ package api import ( "net/http" + ctx "github.com/aptly-dev/aptly/context" "github.com/gin-gonic/gin" - ctx "github.com/smira/aptly/context" ) var context *ctx.AptlyContext diff --git a/api/snapshot.go b/api/snapshot.go index 23a3f61b..f510f385 100644 --- a/api/snapshot.go +++ b/api/snapshot.go @@ -3,9 +3,9 @@ package api import ( "fmt" + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/deb" "github.com/gin-gonic/gin" - "github.com/smira/aptly/database" - "github.com/smira/aptly/deb" ) // GET /api/snapshots diff --git a/aptly/interfaces.go b/aptly/interfaces.go index 03f8a01d..53e27e04 100644 --- a/aptly/interfaces.go +++ b/aptly/interfaces.go @@ -7,7 +7,7 @@ import ( "io" "os" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/utils" ) // ReadSeekerCloser = ReadSeeker + Closer diff --git a/cmd/api_serve.go b/cmd/api_serve.go index 2b0d3cdc..7c19d2ef 100644 --- a/cmd/api_serve.go +++ b/cmd/api_serve.go @@ -7,9 +7,9 @@ import ( "net/url" "os" - "github.com/smira/aptly/api" - "github.com/smira/aptly/systemd/activation" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/api" + "github.com/aptly-dev/aptly/systemd/activation" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/cmd.go b/cmd/cmd.go index c4d76213..e0066801 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -8,8 +8,8 @@ import ( "text/template" "time" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/context.go b/cmd/context.go index 0e6989f8..15a98265 100644 --- a/cmd/context.go +++ b/cmd/context.go @@ -1,7 +1,7 @@ package cmd import ( - ctx "github.com/smira/aptly/context" + ctx "github.com/aptly-dev/aptly/context" "github.com/smira/flag" ) diff --git a/cmd/db_cleanup.go b/cmd/db_cleanup.go index 9708641d..4a1b0535 100644 --- a/cmd/db_cleanup.go +++ b/cmd/db_cleanup.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" ) diff --git a/cmd/db_recover.go b/cmd/db_recover.go index 127f775e..a2cfa0d7 100644 --- a/cmd/db_recover.go +++ b/cmd/db_recover.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/smira/aptly/database" + "github.com/aptly-dev/aptly/database" "github.com/smira/commander" ) diff --git a/cmd/graph.go b/cmd/graph.go index f7575b3b..fd0098e2 100644 --- a/cmd/graph.go +++ b/cmd/graph.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" ) diff --git a/cmd/mirror.go b/cmd/mirror.go index 5daadce8..8681173e 100644 --- a/cmd/mirror.go +++ b/cmd/mirror.go @@ -3,7 +3,7 @@ package cmd import ( "strings" - "github.com/smira/aptly/pgp" + "github.com/aptly-dev/aptly/pgp" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/mirror_create.go b/cmd/mirror_create.go index 9db0970f..a45cbf82 100644 --- a/cmd/mirror_create.go +++ b/cmd/mirror_create.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/mirror_edit.go b/cmd/mirror_edit.go index 8b896ec0..f5ffc4ba 100644 --- a/cmd/mirror_edit.go +++ b/cmd/mirror_edit.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" - "github.com/smira/aptly/pgp" - "github.com/smira/aptly/query" + "github.com/aptly-dev/aptly/pgp" + "github.com/aptly-dev/aptly/query" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/mirror_list.go b/cmd/mirror_list.go index 3c1a40f1..d3a6daaf 100644 --- a/cmd/mirror_list.go +++ b/cmd/mirror_list.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/mirror_rename.go b/cmd/mirror_rename.go index 2a3d362c..9ed5cb4c 100644 --- a/cmd/mirror_rename.go +++ b/cmd/mirror_rename.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/mirror_show.go b/cmd/mirror_show.go index 73b829be..31b2b636 100644 --- a/cmd/mirror_show.go +++ b/cmd/mirror_show.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/mirror_update.go b/cmd/mirror_update.go index 00392607..c087aeed 100644 --- a/cmd/mirror_update.go +++ b/cmd/mirror_update.go @@ -5,10 +5,10 @@ import ( "strings" "sync" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/package_search.go b/cmd/package_search.go index 08de6809..52727a07 100644 --- a/cmd/package_search.go +++ b/cmd/package_search.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/package_show.go b/cmd/package_show.go index bfac059e..643e75fa 100644 --- a/cmd/package_show.go +++ b/cmd/package_show.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/publish.go b/cmd/publish.go index 12e9d294..d74384e0 100644 --- a/cmd/publish.go +++ b/cmd/publish.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/smira/aptly/pgp" + "github.com/aptly-dev/aptly/pgp" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/publish_drop.go b/cmd/publish_drop.go index 6fab0352..5d0c1028 100644 --- a/cmd/publish_drop.go +++ b/cmd/publish_drop.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/publish_list.go b/cmd/publish_list.go index b821cb9c..dddf3b9f 100644 --- a/cmd/publish_list.go +++ b/cmd/publish_list.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/publish_show.go b/cmd/publish_show.go index e129e04d..cb4c959e 100644 --- a/cmd/publish_show.go +++ b/cmd/publish_show.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/publish_snapshot.go b/cmd/publish_snapshot.go index a7c696d9..6e3e0952 100644 --- a/cmd/publish_snapshot.go +++ b/cmd/publish_snapshot.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/publish_switch.go b/cmd/publish_switch.go index c71b0c39..d367e996 100644 --- a/cmd/publish_switch.go +++ b/cmd/publish_switch.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/publish_update.go b/cmd/publish_update.go index 0db3cdb2..b18f767e 100644 --- a/cmd/publish_update.go +++ b/cmd/publish_update.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/repo_add.go b/cmd/repo_add.go index f241537f..0482b5a0 100644 --- a/cmd/repo_add.go +++ b/cmd/repo_add.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/repo_create.go b/cmd/repo_create.go index e63fed88..7a75e92c 100644 --- a/cmd/repo_create.go +++ b/cmd/repo_create.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/repo_edit.go b/cmd/repo_edit.go index bdd0e325..a6812680 100644 --- a/cmd/repo_edit.go +++ b/cmd/repo_edit.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/AlekSi/pointer" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/repo_include.go b/cmd/repo_include.go index 81d83a59..d5bf0f34 100644 --- a/cmd/repo_include.go +++ b/cmd/repo_include.go @@ -7,10 +7,10 @@ import ( "path/filepath" "text/template" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/repo_list.go b/cmd/repo_list.go index 14b69665..b2eea06b 100644 --- a/cmd/repo_list.go +++ b/cmd/repo_list.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/repo_move.go b/cmd/repo_move.go index 271ff039..78735ee6 100644 --- a/cmd/repo_move.go +++ b/cmd/repo_move.go @@ -4,8 +4,8 @@ import ( "fmt" "sort" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/repo_remove.go b/cmd/repo_remove.go index 92bf77dd..3dc10197 100644 --- a/cmd/repo_remove.go +++ b/cmd/repo_remove.go @@ -3,8 +3,8 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/repo_rename.go b/cmd/repo_rename.go index dbe42c68..b7c1073c 100644 --- a/cmd/repo_rename.go +++ b/cmd/repo_rename.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/run.go b/cmd/run.go index 42f34939..1357718d 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - ctx "github.com/smira/aptly/context" + ctx "github.com/aptly-dev/aptly/context" "github.com/smira/commander" ) diff --git a/cmd/serve.go b/cmd/serve.go index 109335c9..c22b1433 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -8,9 +8,9 @@ import ( "sort" "strings" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/snapshot_create.go b/cmd/snapshot_create.go index 211e1e8b..2f17f86d 100644 --- a/cmd/snapshot_create.go +++ b/cmd/snapshot_create.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/snapshot_filter.go b/cmd/snapshot_filter.go index 3b8f3c22..b861ea5e 100644 --- a/cmd/snapshot_filter.go +++ b/cmd/snapshot_filter.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/snapshot_list.go b/cmd/snapshot_list.go index bfa4a3c6..2d3fb29f 100644 --- a/cmd/snapshot_list.go +++ b/cmd/snapshot_list.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/snapshot_merge.go b/cmd/snapshot_merge.go index 7ed36a68..711dada1 100644 --- a/cmd/snapshot_merge.go +++ b/cmd/snapshot_merge.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/snapshot_pull.go b/cmd/snapshot_pull.go index 1d90c3ba..b9165b72 100644 --- a/cmd/snapshot_pull.go +++ b/cmd/snapshot_pull.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/snapshot_rename.go b/cmd/snapshot_rename.go index faaf396b..94047fcb 100644 --- a/cmd/snapshot_rename.go +++ b/cmd/snapshot_rename.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/snapshot_search.go b/cmd/snapshot_search.go index 81413e07..4904a298 100644 --- a/cmd/snapshot_search.go +++ b/cmd/snapshot_search.go @@ -4,8 +4,8 @@ import ( "fmt" "sort" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/query" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/query" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/snapshot_show.go b/cmd/snapshot_show.go index e788f155..38dfb39c 100644 --- a/cmd/snapshot_show.go +++ b/cmd/snapshot_show.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/cmd/snapshot_verify.go b/cmd/snapshot_verify.go index 91a21eab..586e96a8 100644 --- a/cmd/snapshot_verify.go +++ b/cmd/snapshot_verify.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" "github.com/smira/commander" ) diff --git a/cmd/version.go b/cmd/version.go index 5385e484..44cdf7bc 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -3,7 +3,7 @@ package cmd import ( "fmt" - "github.com/smira/aptly/aptly" + "github.com/aptly-dev/aptly/aptly" "github.com/smira/commander" ) diff --git a/console/progress.go b/console/progress.go index 5a2baeb8..56abbef8 100644 --- a/console/progress.go +++ b/console/progress.go @@ -5,8 +5,8 @@ import ( "os" "strings" + "github.com/aptly-dev/aptly/aptly" "github.com/cheggaaa/pb" - "github.com/smira/aptly/aptly" "github.com/wsxiaoys/terminal/color" ) diff --git a/context/context.go b/context/context.go index 56e5879d..11436873 100644 --- a/context/context.go +++ b/context/context.go @@ -14,16 +14,16 @@ import ( "sync" "time" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/console" - "github.com/smira/aptly/database" - "github.com/smira/aptly/deb" - "github.com/smira/aptly/files" - "github.com/smira/aptly/http" - "github.com/smira/aptly/pgp" - "github.com/smira/aptly/s3" - "github.com/smira/aptly/swift" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/console" + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/deb" + "github.com/aptly-dev/aptly/files" + "github.com/aptly-dev/aptly/http" + "github.com/aptly-dev/aptly/pgp" + "github.com/aptly-dev/aptly/s3" + "github.com/aptly-dev/aptly/swift" + "github.com/aptly-dev/aptly/utils" "github.com/smira/commander" "github.com/smira/flag" ) diff --git a/context/context_test.go b/context/context_test.go index 88ae3450..0a48f920 100644 --- a/context/context_test.go +++ b/context/context_test.go @@ -77,7 +77,7 @@ func (s *AptlyContextSuite) SetUpTest(c *C) { } func (s *AptlyContextSuite) TestGetPublishedStorageBadFS(c *C) { - // https://github.com/smira/aptly/issues/711 + // https://github.com/aptly-dev/aptly/issues/711 // This will fail on account of us not having a config, so the // storage never exists. c.Assert(func() { s.context.GetPublishedStorage("filesystem:fuji") }, diff --git a/deb/changes.go b/deb/changes.go index 6b852ea0..0d411c68 100644 --- a/deb/changes.go +++ b/deb/changes.go @@ -9,9 +9,9 @@ import ( "sort" "strings" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/pgp" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/pgp" + "github.com/aptly-dev/aptly/utils" ) // Changes is a result of .changes file parsing diff --git a/deb/checksum_collection.go b/deb/checksum_collection.go index 5c87fe4f..dfffb5ae 100644 --- a/deb/checksum_collection.go +++ b/deb/checksum_collection.go @@ -3,9 +3,9 @@ package deb import ( "bytes" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/database" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/utils" "github.com/ugorji/go/codec" ) diff --git a/deb/checksum_collection_test.go b/deb/checksum_collection_test.go index cf64e2d0..9bc8babf 100644 --- a/deb/checksum_collection_test.go +++ b/deb/checksum_collection_test.go @@ -1,8 +1,8 @@ package deb import ( - "github.com/smira/aptly/database" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/utils" . "gopkg.in/check.v1" ) diff --git a/deb/collections.go b/deb/collections.go index 4b810616..49f1e93c 100644 --- a/deb/collections.go +++ b/deb/collections.go @@ -3,7 +3,7 @@ package deb import ( "sync" - "github.com/smira/aptly/database" + "github.com/aptly-dev/aptly/database" ) // CollectionFactory is a single place to generate all desired collections diff --git a/deb/contents.go b/deb/contents.go index d8fe6956..d7dee09a 100644 --- a/deb/contents.go +++ b/deb/contents.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/smira/aptly/database" + "github.com/aptly-dev/aptly/database" "github.com/smira/go-uuid/uuid" ) diff --git a/deb/deb.go b/deb/deb.go index 929407c4..cb4d8525 100644 --- a/deb/deb.go +++ b/deb/deb.go @@ -14,7 +14,7 @@ import ( "github.com/mkrautz/goar" "github.com/pkg/errors" - "github.com/smira/aptly/pgp" + "github.com/aptly-dev/aptly/pgp" "github.com/smira/go-xz" "github.com/smira/lzma" ) diff --git a/deb/deb_test.go b/deb/deb_test.go index d2d6dd38..1892a73c 100644 --- a/deb/deb_test.go +++ b/deb/deb_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "runtime" - "github.com/smira/aptly/pgp" + "github.com/aptly-dev/aptly/pgp" . "gopkg.in/check.v1" ) diff --git a/deb/import.go b/deb/import.go index abc9f8dd..f4172a35 100644 --- a/deb/import.go +++ b/deb/import.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/pgp" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/pgp" + "github.com/aptly-dev/aptly/utils" ) // CollectPackageFiles walks filesystem collecting all candidates for package files diff --git a/deb/index_files.go b/deb/index_files.go index 31b7b461..713e6c95 100644 --- a/deb/index_files.go +++ b/deb/index_files.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/pgp" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/pgp" + "github.com/aptly-dev/aptly/utils" ) type indexFiles struct { diff --git a/deb/list.go b/deb/list.go index 5433a217..84f57864 100644 --- a/deb/list.go +++ b/deb/list.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" ) // Dependency options diff --git a/deb/local.go b/deb/local.go index 70455915..00c43d06 100644 --- a/deb/local.go +++ b/deb/local.go @@ -6,7 +6,7 @@ import ( "log" "sync" - "github.com/smira/aptly/database" + "github.com/aptly-dev/aptly/database" "github.com/smira/go-uuid/uuid" "github.com/ugorji/go/codec" ) diff --git a/deb/local_test.go b/deb/local_test.go index 76455ad6..e472463d 100644 --- a/deb/local_test.go +++ b/deb/local_test.go @@ -3,7 +3,7 @@ package deb import ( "errors" - "github.com/smira/aptly/database" + "github.com/aptly-dev/aptly/database" . "gopkg.in/check.v1" ) diff --git a/deb/package.go b/deb/package.go index 1034bdb3..801d7a2d 100644 --- a/deb/package.go +++ b/deb/package.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" ) // Package is single instance of Debian package diff --git a/deb/package_collection.go b/deb/package_collection.go index 0d5c0872..0ef923c8 100644 --- a/deb/package_collection.go +++ b/deb/package_collection.go @@ -5,8 +5,8 @@ import ( "fmt" "path/filepath" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/database" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/database" "github.com/ugorji/go/codec" ) diff --git a/deb/package_collection_test.go b/deb/package_collection_test.go index b11e3f21..1b14f80b 100644 --- a/deb/package_collection_test.go +++ b/deb/package_collection_test.go @@ -1,8 +1,8 @@ package deb import ( - "github.com/smira/aptly/database" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/utils" . "gopkg.in/check.v1" ) diff --git a/deb/package_files.go b/deb/package_files.go index 4716219c..61f07ac6 100644 --- a/deb/package_files.go +++ b/deb/package_files.go @@ -9,8 +9,8 @@ import ( "strconv" "strings" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" ) // PackageFile is a single file entry in package diff --git a/deb/package_files_test.go b/deb/package_files_test.go index 4a9fc924..89c1abc8 100644 --- a/deb/package_files_test.go +++ b/deb/package_files_test.go @@ -4,9 +4,9 @@ import ( "io/ioutil" "path/filepath" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/files" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/files" + "github.com/aptly-dev/aptly/utils" . "gopkg.in/check.v1" ) diff --git a/deb/package_test.go b/deb/package_test.go index b3d34e76..af6d4b29 100644 --- a/deb/package_test.go +++ b/deb/package_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "regexp" - "github.com/smira/aptly/files" + "github.com/aptly-dev/aptly/files" . "gopkg.in/check.v1" ) diff --git a/deb/ppa.go b/deb/ppa.go index 07cf0420..9668468c 100644 --- a/deb/ppa.go +++ b/deb/ppa.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/utils" ) var ppaRegexp = regexp.MustCompile("^ppa:([^/]+)/(.+)$") diff --git a/deb/ppa_test.go b/deb/ppa_test.go index 44bda7c2..73b32e3e 100644 --- a/deb/ppa_test.go +++ b/deb/ppa_test.go @@ -1,7 +1,7 @@ package deb import ( - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/utils" . "gopkg.in/check.v1" ) diff --git a/deb/publish.go b/deb/publish.go index 9319794e..8569b9bf 100644 --- a/deb/publish.go +++ b/deb/publish.go @@ -17,10 +17,10 @@ import ( "github.com/smira/go-uuid/uuid" "github.com/ugorji/go/codec" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/database" - "github.com/smira/aptly/pgp" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/pgp" + "github.com/aptly-dev/aptly/utils" ) type repoSourceItem struct { diff --git a/deb/publish_test.go b/deb/publish_test.go index c28d1f5f..15df26f1 100644 --- a/deb/publish_test.go +++ b/deb/publish_test.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/database" - "github.com/smira/aptly/files" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/files" "github.com/ugorji/go/codec" . "gopkg.in/check.v1" diff --git a/deb/reflist_test.go b/deb/reflist_test.go index d1824762..f987fbaa 100644 --- a/deb/reflist_test.go +++ b/deb/reflist_test.go @@ -3,7 +3,7 @@ package deb import ( "errors" - "github.com/smira/aptly/database" + "github.com/aptly-dev/aptly/database" . "gopkg.in/check.v1" ) diff --git a/deb/remote.go b/deb/remote.go index bddeba3a..85ca7394 100644 --- a/deb/remote.go +++ b/deb/remote.go @@ -15,11 +15,11 @@ import ( "syscall" "time" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/database" - "github.com/smira/aptly/http" - "github.com/smira/aptly/pgp" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/database" + "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/ugorji/go/codec" ) diff --git a/deb/remote_test.go b/deb/remote_test.go index 5fe9a72a..568ec5af 100644 --- a/deb/remote_test.go +++ b/deb/remote_test.go @@ -7,13 +7,13 @@ import ( "os" "sort" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/console" - "github.com/smira/aptly/database" - "github.com/smira/aptly/files" - "github.com/smira/aptly/http" - "github.com/smira/aptly/pgp" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/console" + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/files" + "github.com/aptly-dev/aptly/http" + "github.com/aptly-dev/aptly/pgp" + "github.com/aptly-dev/aptly/utils" . "gopkg.in/check.v1" ) diff --git a/deb/snapshot.go b/deb/snapshot.go index e571bf67..f6367272 100644 --- a/deb/snapshot.go +++ b/deb/snapshot.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/smira/aptly/database" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/database" + "github.com/aptly-dev/aptly/utils" "github.com/smira/go-uuid/uuid" "github.com/ugorji/go/codec" ) diff --git a/deb/snapshot_test.go b/deb/snapshot_test.go index ba1bb247..85bf14ca 100644 --- a/deb/snapshot_test.go +++ b/deb/snapshot_test.go @@ -3,7 +3,7 @@ package deb import ( "errors" - "github.com/smira/aptly/database" + "github.com/aptly-dev/aptly/database" . "gopkg.in/check.v1" ) diff --git a/deb/uploaders.go b/deb/uploaders.go index 6407b352..0ae3b966 100644 --- a/deb/uploaders.go +++ b/deb/uploaders.go @@ -6,8 +6,8 @@ import ( "os" "github.com/DisposaBoy/JsonConfigReader" - "github.com/smira/aptly/pgp" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/pgp" + "github.com/aptly-dev/aptly/utils" ) // UploadersRule is single rule of format: what packages can group or key upload diff --git a/deb/uploaders_test.go b/deb/uploaders_test.go index 15178da6..b175058a 100644 --- a/deb/uploaders_test.go +++ b/deb/uploaders_test.go @@ -1,7 +1,7 @@ package deb import ( - "github.com/smira/aptly/pgp" + "github.com/aptly-dev/aptly/pgp" . "gopkg.in/check.v1" ) diff --git a/files/mocks.go b/files/mocks.go index d06c9c4e..572ece28 100644 --- a/files/mocks.go +++ b/files/mocks.go @@ -1,8 +1,8 @@ package files import ( - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" ) type mockChecksumStorage struct { diff --git a/files/package_pool.go b/files/package_pool.go index bd2cd26c..e985a45e 100644 --- a/files/package_pool.go +++ b/files/package_pool.go @@ -11,8 +11,8 @@ import ( "github.com/smira/go-uuid/uuid" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" ) // PackagePool is deduplicated storage of package files on filesystem diff --git a/files/package_pool_test.go b/files/package_pool_test.go index a1210e4a..c05770ff 100644 --- a/files/package_pool_test.go +++ b/files/package_pool_test.go @@ -8,8 +8,8 @@ import ( "runtime" "syscall" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" . "gopkg.in/check.v1" ) diff --git a/files/public.go b/files/public.go index 9929d86d..5739c8a9 100644 --- a/files/public.go +++ b/files/public.go @@ -8,8 +8,8 @@ import ( "strings" "syscall" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" ) // PublishedStorage abstract file system with public dirs (published repos) diff --git a/files/public_test.go b/files/public_test.go index 38a5093e..c7f4fd84 100644 --- a/files/public_test.go +++ b/files/public_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "syscall" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" . "gopkg.in/check.v1" ) diff --git a/http/compression.go b/http/compression.go index 1a68f1c7..9ee8f865 100644 --- a/http/compression.go +++ b/http/compression.go @@ -10,8 +10,8 @@ import ( "os" "strings" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" xz "github.com/smira/go-xz" ) diff --git a/http/compression_test.go b/http/compression_test.go index 9f1135f5..9ce46f76 100644 --- a/http/compression_test.go +++ b/http/compression_test.go @@ -6,7 +6,7 @@ import ( "io" "net/url" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/utils" . "gopkg.in/check.v1" ) diff --git a/http/download.go b/http/download.go index d41dfab6..5f5e802c 100644 --- a/http/download.go +++ b/http/download.go @@ -12,10 +12,10 @@ import ( "syscall" "time" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" "github.com/mxk/go-flowrate/flowrate" "github.com/pkg/errors" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" "github.com/smira/go-ftp-protocol/protocol" ) diff --git a/http/download_test.go b/http/download_test.go index 3e616625..f7439a90 100644 --- a/http/download_test.go +++ b/http/download_test.go @@ -8,9 +8,9 @@ import ( "net/http" "os" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/console" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/console" + "github.com/aptly-dev/aptly/utils" . "gopkg.in/check.v1" ) diff --git a/http/fake.go b/http/fake.go index ec713cc6..d53c1700 100644 --- a/http/fake.go +++ b/http/fake.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" ) type expectedRequest struct { diff --git a/http/temp.go b/http/temp.go index 13aff164..3ef95199 100644 --- a/http/temp.go +++ b/http/temp.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" ) // DownloadTemp starts new download to temporary file and returns File diff --git a/http/temp_test.go b/http/temp_test.go index 20d82222..d4c3414e 100644 --- a/http/temp_test.go +++ b/http/temp_test.go @@ -3,7 +3,7 @@ package http import ( "os" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/utils" . "gopkg.in/check.v1" ) diff --git a/main.go b/main.go index e192a86e..80093443 100644 --- a/main.go +++ b/main.go @@ -5,8 +5,8 @@ import ( "os" "time" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/cmd" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/cmd" ) // Version variable, filled in at link time diff --git a/query/query.go b/query/query.go index cfcf4cef..21e9188e 100644 --- a/query/query.go +++ b/query/query.go @@ -2,7 +2,7 @@ package query import ( - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" ) /* diff --git a/query/syntax.go b/query/syntax.go index 5c6c3023..4870c3b3 100644 --- a/query/syntax.go +++ b/query/syntax.go @@ -7,7 +7,7 @@ import ( "unicode" "unicode/utf8" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" ) type parser struct { diff --git a/query/syntax_test.go b/query/syntax_test.go index 28a9c30c..0270ce0a 100644 --- a/query/syntax_test.go +++ b/query/syntax_test.go @@ -3,7 +3,7 @@ package query import ( "regexp" - "github.com/smira/aptly/deb" + "github.com/aptly-dev/aptly/deb" . "gopkg.in/check.v1" ) diff --git a/s3/public.go b/s3/public.go index 15c4fec9..2374f8f9 100644 --- a/s3/public.go +++ b/s3/public.go @@ -7,6 +7,8 @@ import ( "path/filepath" "strings" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/corehandlers" @@ -15,8 +17,6 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" "github.com/pkg/errors" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" "github.com/smira/go-aws-auth" ) diff --git a/s3/public_test.go b/s3/public_test.go index f772a15d..6a799163 100644 --- a/s3/public_test.go +++ b/s3/public_test.go @@ -10,8 +10,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/s3" - "github.com/smira/aptly/files" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/files" + "github.com/aptly-dev/aptly/utils" ) type PublishedStorageSuite struct { diff --git a/swift/public.go b/swift/public.go index 59985772..93c7f7a7 100644 --- a/swift/public.go +++ b/swift/public.go @@ -9,10 +9,10 @@ import ( "path/filepath" "time" + "github.com/aptly-dev/aptly/aptly" + "github.com/aptly-dev/aptly/utils" "github.com/ncw/swift" "github.com/pkg/errors" - "github.com/smira/aptly/aptly" - "github.com/smira/aptly/utils" ) // PublishedStorage abstract file system with published files (actually hosted on Swift) diff --git a/swift/public_test.go b/swift/public_test.go index 0f8e4b44..9a4069c6 100644 --- a/swift/public_test.go +++ b/swift/public_test.go @@ -11,8 +11,8 @@ import ( "github.com/ncw/swift/swifttest" - "github.com/smira/aptly/files" - "github.com/smira/aptly/utils" + "github.com/aptly-dev/aptly/files" + "github.com/aptly-dev/aptly/utils" ) type PublishedStorageSuite struct {