drop superfluous _utils from module names

7 files changed, 10 insertions, 11 deletions

diff --git a/gbp/deb_utils.py b/gbp/deb.py
index 6a60f9b5..6a60f9b5 100644
--- a/gbp/deb_utils.py
+++ b/gbp/deb.py
diff --git a/gbp/git_utils.py b/gbp/git.py
index cf22718a..cf22718a 100644
--- a/gbp/git_utils.py
+++ b/gbp/git.py
diff --git a/git-buildpackage b/git-buildpackage
index 85ad1961..527aa838 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -23,8 +23,8 @@ import os, os.path
 import errno
 import pipes
 import time
-import gbp.deb_utils as du
-from gbp.git_utils import (GitRepositoryError, GitRepository, build_tag)
+import gbp.deb as du
+from gbp.git import (GitRepositoryError, GitRepository, build_tag)
 from gbp.command_wrappers import (GitTag, Command, RunAtCommand, CommandExecFailed,
                                   PristineTar, RemoveTree, GitAdd)
 from gbp.config import (GbpOptionParser, GbpOptionGroup)
diff --git a/git-dch b/git-dch
index dc3100b8..d9c1681a 100755
--- a/git-dch
+++ b/git-dch
@@ -24,10 +24,10 @@ import os.path
 import shutil
 import subprocess
 import gbp.command_wrappers as gbpc
-from gbp.git_utils import (GitRepositoryError, GitRepository, build_tag)
+from gbp.git import (GitRepositoryError, GitRepository, build_tag)
 from gbp.config import GbpOptionParser, GbpOptionGroup
 from gbp.errors import GbpError
-from gbp.deb_utils import parse_changelog
+from gbp.deb import parse_changelog
 from gbp.command_wrappers import (Command, CommandExecFailed)
 
 snapshot_re = re.compile("\s*\*\* SNAPSHOT build @(?P<commit>[a-z0-9]+)\s+\*\*")
diff --git a/git-import-dsc b/git-import-dsc
index 29fc1bcf..db372ac7 100755
--- a/git-import-dsc
+++ b/git-import-dsc
@@ -25,8 +25,8 @@ import glob
 import pipes
 from email.Utils import parseaddr
 import gbp.command_wrappers as gbpc
-from gbp.deb_utils import debian_version_chars, parse_changelog, unpack_orig, parse_dsc, DscFile, tar_toplevel
-from gbp.git_utils import build_tag, create_repo, GitRepository, GitRepositoryError, rfc822_date_to_git
+from gbp.deb import debian_version_chars, parse_changelog, unpack_orig, parse_dsc, DscFile, tar_toplevel
+from gbp.git import build_tag, create_repo, GitRepository, GitRepositoryError, rfc822_date_to_git
 from gbp.config import GbpOptionParser
 from gbp.errors import GbpError
 
diff --git a/git-import-dscs b/git-import-dscs
index 3d92a333..c4cbc1c0 100755
--- a/git-import-dscs
+++ b/git-import-dscs
@@ -23,12 +23,11 @@ import os
 import tempfile
 import glob
 import pipes
-import gbp.deb_utils
 import gbp.command_wrappers as gbpc
-from gbp.deb_utils import parse_dsc, DscFile
+from gbp.deb import parse_dsc, DscFile
 from gbp.config import GbpOptionParser
 from gbp.errors import GbpError
-from gbp.git_utils import GitRepository, GitRepositoryError
+from gbp.git import GitRepository, GitRepositoryError
 
 class DpkgCompareVersions(gbpc.Command):
     cmd='/usr/bin/dpkg'
diff --git a/git-import-orig b/git-import-orig
index 9e47bf84..32f7e53e 100755
--- a/git-import-orig
+++ b/git-import-orig
@@ -27,8 +27,8 @@ import subprocess
 import tarfile
 import time
 import gbp.command_wrappers as gbpc
-from gbp.deb_utils import parse_changelog, unpack_orig, repack_orig, NoChangelogError, has_epoch, tar_toplevel, guess_upstream_version
-from gbp.git_utils import (GitRepositoryError, GitRepository, build_tag)
+from gbp.deb import parse_changelog, unpack_orig, repack_orig, NoChangelogError, has_epoch, tar_toplevel, guess_upstream_version
+from gbp.git import (GitRepositoryError, GitRepository, build_tag)
 from gbp.config import GbpOptionParser
 from gbp.errors import (GbpError, GbpNothingImported)