[jhbuild/jhdebuild: 531/536] [jhdebuild] Work without the do_deb codepath

[John Carr <johncarr src gnome org>]

commit 57eaf228ad1e01b09f5a47a6f2c8eaddcb5b9810
Author: John Carr <john carr unrouted co uk>
Date:   Sun May 17 17:46:49 2009 +0100

    [jhdebuild] Work without the do_deb codepath
---
 jhbuild/commands/debuild.py  |    4 ++--
 jhbuild/modtypes/__init__.py |    4 ++--
 jhbuild/modtypes/debian.py   |   10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jhbuild/commands/debuild.py b/jhbuild/commands/debuild.py
index c60fe5c..4674ccd 100644
--- a/jhbuild/commands/debuild.py
+++ b/jhbuild/commands/debuild.py
@@ -264,7 +264,7 @@ class cmd_debuild(Command):
 
         build = jhbuild.frontends.get_buildscript(config, module_list)
         debuild_init(config, build)
-        build.build(phases=['build_package'])
+        build.build(phases=['deb_build_package'])
 
 register_command(cmd_debuild)
 
@@ -310,7 +310,7 @@ class cmd_debuildone(Command):
 
         build = jhbuild.frontends.get_buildscript(config, module_list)
         debuild_init(config, build)
-        build.build(phases=['build_package'])
+        build.build(phases=['deb_build_package'])
 
 register_command(cmd_debuildone)
 
diff --git a/jhbuild/modtypes/__init__.py b/jhbuild/modtypes/__init__.py
index e382a87..57fda86 100644
--- a/jhbuild/modtypes/__init__.py
+++ b/jhbuild/modtypes/__init__.py
@@ -133,8 +133,8 @@ def get_branch(node, repositories, default_repo, config):
 class Package:
     type = 'base'
     PHASE_START = 'start'
-    PHASE_APT_GET_UPDATE = 'apt_get_update'
-    PHASE_BUILD_DEPS     = 'build_deps'
+    PHASE_APT_GET_UPDATE = 'deb_apt_get_update'
+    PHASE_BUILD_DEPS     = 'deb_build_deps'
     PHASE_DONE  = 'done'
     def __init__(self, name, dependencies = [], after = [], suggests = []):
         self.name = name
diff --git a/jhbuild/modtypes/debian.py b/jhbuild/modtypes/debian.py
index fa7386e..7067022 100644
--- a/jhbuild/modtypes/debian.py
+++ b/jhbuild/modtypes/debian.py
@@ -10,11 +10,11 @@ from jhbuild.utils import debian
 
 class DebianBasePackage:
 
-    PHASE_TAR_X          = 'tar_x'
-    PHASE_DEBIAN_DIR     = 'debian_dir'
-    PHASE_BUILD_PACKAGE  = 'build_package'
-    PHASE_DINSTALL       = 'dinstall'
-    PHASE_UPGRADE        = 'upgrade'
+    PHASE_TAR_X          = 'deb_tar_x'
+    PHASE_DEBIAN_DIR     = 'deb_debian_dir'
+    PHASE_BUILD_PACKAGE  = 'deb_build_package'
+    PHASE_DINSTALL       = 'deb_dinstall'
+    PHASE_UPGRADE        = 'deb_upgrade'
 
     def skip_deb_tar_x(self, buildscript, last_state):
         if os.path.exists(self.get_tarball_dir(buildscript)):