Merge pull request #732 from aptly-dev/move-to-aptly-dev

Fix paths after repository transfer to aptly-dev

.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:

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:

README.rst

@@ -2,17 +2,17 @@
 aptly
 =====
 
-.. image:: https://api.travis-ci.org/smira/aptly.svg?branch=master
+.. image:: https://api.travis-ci.org/aptly-dev/aptly.svg?branch=master
-    :target: https://travis-ci.org/smira/aptly
+    :target: https://travis-ci.org/aptly-dev/aptly
 
-.. image:: https://codecov.io/gh/smira/aptly/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/aptly-dev/aptly/branch/master/graph/badge.svg
-  :target: https://codecov.io/gh/smira/aptly
+  :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
+.. image:: http://goreportcard.com/badge/aptly-dev/aptly
-    :target: http://goreportcard.com/report/smira/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
+    mkdir -p $GOPATH/src/github.com/aptly-dev/aptly
-    git clone https://github.com/smira/aptly $GOPATH/src/github.com/smira/aptly
+    git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-dev/aptly
-    cd $GOPATH/src/github.com/smira/aptly
+    cd $GOPATH/src/github.com/aptly-dev/aptly
     make install
 
 Binary would be installed to ```$GOPATH/bin/aptly``.

_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"
 )

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):

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)]

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

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

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

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

aptly/interfaces.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 // ReadSeekerCloser = ReadSeeker + Closer

cmd/api_serve.go

@@ -7,9 +7,9 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/smira/aptly/api"
+	"github.com/aptly-dev/aptly/api"
-	"github.com/smira/aptly/systemd/activation"
+	"github.com/aptly-dev/aptly/systemd/activation"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

cmd/cmd.go

@@ -8,8 +8,8 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )
 

cmd/db_cleanup.go

@@ -5,8 +5,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 )
 

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"
 )
 

cmd/graph.go

@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 )
 

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"
 )

cmd/mirror_create.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

cmd/mirror_edit.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/smira/aptly/pgp"
+	"github.com/aptly-dev/aptly/pgp"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )
 

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"
 )
 

cmd/mirror_show.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

cmd/mirror_update.go

@@ -5,10 +5,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

cmd/package_search.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

cmd/package_show.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )

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"
 )
 

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"
 )
 

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"
 )
 

cmd/publish_snapshot.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

cmd/publish_switch.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )

cmd/repo_add.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )

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"
 )

cmd/repo_include.go

@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 	"text/template"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )
 

cmd/repo_move.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

cmd/repo_remove.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )
 

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"
 )
 

cmd/serve.go

@@ -8,9 +8,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )
 

cmd/snapshot_filter.go

@@ -5,8 +5,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )
 

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"
 )
 

cmd/snapshot_pull.go

@@ -5,8 +5,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )
 

cmd/snapshot_search.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/query"
+	"github.com/aptly-dev/aptly/query"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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"
 )

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"
 )
 

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"
 )
 

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"
 )
 

context/context.go

@@ -14,16 +14,16 @@ import (
 	"sync"
 	"time"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/console"
+	"github.com/aptly-dev/aptly/console"
-	"github.com/smira/aptly/database"
+	"github.com/aptly-dev/aptly/database"
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
-	"github.com/smira/aptly/files"
+	"github.com/aptly-dev/aptly/files"
-	"github.com/smira/aptly/http"
+	"github.com/aptly-dev/aptly/http"
-	"github.com/smira/aptly/pgp"
+	"github.com/aptly-dev/aptly/pgp"
-	"github.com/smira/aptly/s3"
+	"github.com/aptly-dev/aptly/s3"
-	"github.com/smira/aptly/swift"
+	"github.com/aptly-dev/aptly/swift"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/commander"
 	"github.com/smira/flag"
 )

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") },

deb/changes.go

@@ -9,9 +9,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/pgp"
+	"github.com/aptly-dev/aptly/pgp"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 // Changes is a result of .changes file parsing

deb/checksum_collection.go

@@ -3,9 +3,9 @@ package deb
 import (
 	"bytes"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/database"
+	"github.com/aptly-dev/aptly/database"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/ugorji/go/codec"
 )
 

deb/checksum_collection_test.go

@@ -1,8 +1,8 @@
 package deb
 
 import (
-	"github.com/smira/aptly/database"
+	"github.com/aptly-dev/aptly/database"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 
 	. "gopkg.in/check.v1"
 )

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

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"
 )
 

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"
 )

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"
 )

deb/import.go

@@ -6,9 +6,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/pgp"
+	"github.com/aptly-dev/aptly/pgp"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 // CollectPackageFiles walks filesystem collecting all candidates for package files

deb/index_files.go

@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/pgp"
+	"github.com/aptly-dev/aptly/pgp"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 type indexFiles struct {

deb/list.go

@@ -5,8 +5,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 // Dependency options

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"
 )

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"
 )

deb/package.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 // Package is single instance of Debian package

deb/package_collection.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/database"
+	"github.com/aptly-dev/aptly/database"
 	"github.com/ugorji/go/codec"
 )
 

deb/package_collection_test.go

@@ -1,8 +1,8 @@
 package deb
 
 import (
-	"github.com/smira/aptly/database"
+	"github.com/aptly-dev/aptly/database"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 
 	. "gopkg.in/check.v1"
 )

deb/package_files.go

@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 // PackageFile is a single file entry in package

deb/package_files_test.go

@@ -4,9 +4,9 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/files"
+	"github.com/aptly-dev/aptly/files"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 
 	. "gopkg.in/check.v1"
 )

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"
 )

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:([^/]+)/(.+)$")

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"
 )

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/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/database"
+	"github.com/aptly-dev/aptly/database"
-	"github.com/smira/aptly/pgp"
+	"github.com/aptly-dev/aptly/pgp"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 type repoSourceItem struct {

deb/publish_test.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/database"
+	"github.com/aptly-dev/aptly/database"
-	"github.com/smira/aptly/files"
+	"github.com/aptly-dev/aptly/files"
 	"github.com/ugorji/go/codec"
 
 	. "gopkg.in/check.v1"

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"
 )

deb/remote.go

@@ -15,11 +15,11 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/database"
+	"github.com/aptly-dev/aptly/database"
-	"github.com/smira/aptly/http"
+	"github.com/aptly-dev/aptly/http"
-	"github.com/smira/aptly/pgp"
+	"github.com/aptly-dev/aptly/pgp"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/go-uuid/uuid"
 	"github.com/ugorji/go/codec"
 )

deb/remote_test.go

@@ -7,13 +7,13 @@ import (
 	"os"
 	"sort"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/console"
+	"github.com/aptly-dev/aptly/console"
-	"github.com/smira/aptly/database"
+	"github.com/aptly-dev/aptly/database"
-	"github.com/smira/aptly/files"
+	"github.com/aptly-dev/aptly/files"
-	"github.com/smira/aptly/http"
+	"github.com/aptly-dev/aptly/http"
-	"github.com/smira/aptly/pgp"
+	"github.com/aptly-dev/aptly/pgp"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 
 	. "gopkg.in/check.v1"
 )

deb/snapshot.go

@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/smira/aptly/database"
+	"github.com/aptly-dev/aptly/database"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	"github.com/smira/go-uuid/uuid"
 	"github.com/ugorji/go/codec"
 )

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"
 )

deb/uploaders.go

@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"github.com/DisposaBoy/JsonConfigReader"
-	"github.com/smira/aptly/pgp"
+	"github.com/aptly-dev/aptly/pgp"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 // UploadersRule is single rule of format: what packages can group or key upload

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"
 )
 

files/mocks.go

@@ -1,8 +1,8 @@
 package files
 
 import (
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 type mockChecksumStorage struct {

files/package_pool.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/smira/go-uuid/uuid"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 // PackagePool is deduplicated storage of package files on filesystem

files/package_pool_test.go

@@ -8,8 +8,8 @@ import (
 	"runtime"
 	"syscall"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 
 	. "gopkg.in/check.v1"
 )

files/public.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 // PublishedStorage abstract file system with public dirs (published repos)

files/public_test.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"syscall"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 
 	. "gopkg.in/check.v1"
 )

http/compression.go

@@ -10,8 +10,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 	xz "github.com/smira/go-xz"
 )
 

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"
 )

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"
 )
 

http/download_test.go

@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/console"
+	"github.com/aptly-dev/aptly/console"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 
 	. "gopkg.in/check.v1"
 )

http/fake.go

@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 type expectedRequest struct {

http/temp.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/utils"
+	"github.com/aptly-dev/aptly/utils"
 )
 
 // DownloadTemp starts new download to temporary file and returns File

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"
 )

main.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/smira/aptly/aptly"
+	"github.com/aptly-dev/aptly/aptly"
-	"github.com/smira/aptly/cmd"
+	"github.com/aptly-dev/aptly/cmd"
 )
 
 // Version variable, filled in at link time

query/query.go

@@ -2,7 +2,7 @@
 package query
 
 import (
-	"github.com/smira/aptly/deb"
+	"github.com/aptly-dev/aptly/deb"
 )
 
 /*

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 {