Merge ~racb/git-ubuntu:team-change into git-ubuntu:master

[Robie Basak]

Make Jenkins happy

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:b117bb2b8b6b2066b59b0f82cd5765af37dbdbc3
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/61/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: VM Reset
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/61//rebuild

review: Approve (continuous-integration)

[Bryce Harrington (bryce)]

LGTM, straightforward search and replace. I did not spot other instances of the team name, but expect if there are any others they can be corrected if/when they reveal themselves.

review: Approve

[Robie Basak (racb)]

Thank you!

diff --git a/doc/README.md b/doc/README.md
index 59eab48..c2918c3 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -49,7 +49,7 @@ or
         $ PKG=uvtool
         $ git ubuntu import -v --no-push --directory=${HOME}/Imports/$PKG $PKG
 
- * As member of [usd-import-team](https://launchpad.net/~usd-import-team) for official publishing.
+ * As member of [git-ubuntu-import](https://launchpad.net/~git-ubuntu-import) for official publishing.
 
         $ PKG=uvtool
         $ LP_USER=smoser  # your launchpad user name if different from $USER
@@ -96,12 +96,13 @@ If you did a local checkout with `--directory=./$PKG` then you'll have a git rep
     ubuntu/xenial
     ubuntu/yakkety
 
-If you did `--lp-owner=usd-import-team`, then your repo should be listed in web view at [https://code.launchpad.net/~usd-import-team/+git].  And it should be able to be cloned with:
+If you did `--lp-owner=git-ubuntu-import`, then your repo should be
+listed in web view at [https://code.launchpad.net/~git-ubuntu-import/+git].  And it should be able to be cloned with:
 
-    $ git clone https://git.launchpad.net/~usd-import-team/ubuntu/+source/$PKG
+    $ git clone https://git.launchpad.net/~git-ubuntu-import/ubuntu/+source/$PKG
 or
 
-    $ git clone lp:~usd-import-team/ubuntu/+source/$PKG
+    $ git clone lp:~git-ubuntu-import/ubuntu/+source/$PKG
 or
 
     $ git ubuntu clone $PKG
diff --git a/doc/SPECIFICATION b/doc/SPECIFICATION
index f2a5e59..430ce30 100644
--- a/doc/SPECIFICATION
+++ b/doc/SPECIFICATION
@@ -31,7 +31,7 @@ from: lpusip:<package>; ask a sponsor if missing):
   * The tree is identical to corresponding source package version in the
     archive.
   * For T import/<version>: imported from the archive and pushed to
-    ~usd-import-team as an authoritative source.
+    ~git-ubuntu-import as an authoritative source.
   * For T upload/<version>: pushed to ~ubuntu-server-dev by an uploader
     to record exactly what was uploaded.
   * Pushing to ~ubuntu-server-dev is restricted to uploaders.
diff --git a/gitubuntu/importer.py b/gitubuntu/importer.py
index 4616620..9c6c2ba 100644
--- a/gitubuntu/importer.py
+++ b/gitubuntu/importer.py
@@ -1,7 +1,7 @@
 # Requirements from Barcelona sprint with Ubuntu Server Team:
 # Run with "importer-command <package>"
 # Needs access to:
-# 	Launchpad git push to ~usd-import-team, unless --no-push is
+# 	Launchpad git push to ~git-ubuntu-import, unless --no-push is
 # 	specified
 #	Local git cache (maybe optional for a prototype).
 # Must be idempotent.
@@ -174,7 +174,7 @@ def _main_with_repo(
     Returns 0 on successful import (which includes non-fatal failures);
     1 otherwise.
     """
-    if owner == 'usd-import-team':
+    if owner == 'git-ubuntu-import':
         namespace = 'importer'
     else:
         namespace = owner
@@ -2622,7 +2622,7 @@ def parse_args(subparsers=None, base_subparsers=None):
                         help='Which package to update in the git tree')
     parser.add_argument('-o', '--lp-owner', type=str,
                         help=argparse.SUPPRESS,
-                        default='usd-import-team')
+                        default='git-ubuntu-import')
     parser.add_argument('-l', '--lp-user', type=str,
                         help=argparse.SUPPRESS)
     parser.add_argument('--dl-cache', type=str,
diff --git a/gitubuntu/submit.py b/gitubuntu/submit.py
index aba426f..ff7d9d7 100644
--- a/gitubuntu/submit.py
+++ b/gitubuntu/submit.py
@@ -52,7 +52,7 @@ def parse_args(subparsers=None, base_subparsers=None):
     )
     parser.add_argument('--target-user', type=str,
         help='Target user\'s repository to merge into',
-        default='usd-import-team'
+        default='git-ubuntu-import'
     )
     parser.add_argument('--branch', type=str,
         help='The branch to merge. Defaults to branch pointed to by HEAD.'
@@ -142,7 +142,7 @@ def main(
     if target_branch and target_user:
         target_head_string = target_branch
     else:
-        if target_user == 'usd-import-team':
+        if target_user == 'git-ubuntu-import':
             namespace = 'pkg'
         else:
             namespace = target_user
diff --git a/wip/auto-upload-tag.py b/wip/auto-upload-tag.py
index 889d83b..5d33ea2 100644
--- a/wip/auto-upload-tag.py
+++ b/wip/auto-upload-tag.py
@@ -4,8 +4,8 @@
 # https://code.launchpad.net/~paelzer/ubuntu/+source/open-vm-tools/+git/open-vm-tools/+merge/352237)
 # this script clones the proposer's branch, upload tags it, and pushes the
 # upload tag to the official repository. This can be used by members of
-# ~usd-import-team to easily push an upload tag for contributors, until we have
-# a mechanism to do this better.
+# ~git-ubuntu-import to easily push an upload tag for contributors, until we
+# have a mechanism to do this better.
 #
 # This does minimal checking. The target repository must be correct; otherwise
 # the upload tag will be pushed to the wrong place. There are races (for
@@ -18,7 +18,7 @@
 #
 # Prerequisites:
 #   python3-launchpadlib installed
-#   You have a Launchpad login that # belongs to ~usd-import-team
+#   You have a Launchpad login that # belongs to ~git-ubuntu-import
 
 import os
 import subprocess