lib: Rename schroot-base to bin-common (2)

5 files changed, 16 insertions, 16 deletions

diff --git a/bin/csbuild/csbuild.cc b/bin/csbuild/csbuild.cc
index 6ded65d1..5b95a208 100644
--- a/bin/csbuild/csbuild.cc
+++ b/bin/csbuild/csbuild.cc
@@ -21,7 +21,7 @@
 #include "options.h"
 #include "main.h"
 
-#include <schroot-base/run.h>
+#include <bin-common/run.h>
 
 using std::endl;
 using boost::format;
@@ -42,6 +42,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  return schroot_base::run
+  return bin_common::run
     <csbuild::options, csbuild::main>(argc, argv);
 }
diff --git a/bin/csbuild/main.cc b/bin/csbuild/main.cc
index b611ec9e..972ac354 100644
--- a/bin/csbuild/main.cc
+++ b/bin/csbuild/main.cc
@@ -42,12 +42,12 @@ using sbuild::N_;
 using namespace csbuild;
 
 main::main (options::ptr& options):
-  schroot_base::main("csbuild",
-                     // TRANSLATORS: '...' is an ellipsis e.g. U+2026,
-                     // and '-' is an em-dash.
-                     _("[OPTION…] — build Debian packages from source"),
-                     options,
-                     false),
+  bin_common::main("csbuild",
+                   // TRANSLATORS: '...' is an ellipsis e.g. U+2026,
+                   // and '-' is an em-dash.
+                   _("[OPTION…] — build Debian packages from source"),
+                   options,
+                   false),
   opts(options)
 {
 }
diff --git a/bin/csbuild/main.h b/bin/csbuild/main.h
index ae052fad..8dd60395 100644
--- a/bin/csbuild/main.h
+++ b/bin/csbuild/main.h
@@ -21,7 +21,7 @@
 
 #include <csbuild/options.h>
 
-#include <schroot-base/main.h>
+#include <bin-common/main.h>
 
 namespace csbuild
 {
@@ -29,7 +29,7 @@ namespace csbuild
   /**
    * Frontend for schroot.  This class is used to "run" schroot.
    */
-  class main : public schroot_base::main
+  class main : public bin_common::main
   {
   public:
     /**
diff --git a/bin/csbuild/options.cc b/bin/csbuild/options.cc
index 289ae016..bb6f158c 100644
--- a/bin/csbuild/options.cc
+++ b/bin/csbuild/options.cc
@@ -38,7 +38,7 @@ using namespace csbuild;
 const options::action_type options::ACTION_BUILD ("build");
 
 options::options ():
-  schroot_base::options(),
+  bin_common::options(),
   packages(),
   nolog(false),
   batch_mode(false),
@@ -87,7 +87,7 @@ void
 options::add_options ()
 {
   // Chain up to add basic options.
-  schroot_base::options::add_options();
+  bin_common::options::add_options();
 
   action.add(ACTION_BUILD);
   action.set_default(ACTION_BUILD);
@@ -172,7 +172,7 @@ void
 options::add_option_groups ()
 {
   // Chain up to add basic option groups.
-  schroot_base::options::add_option_groups();
+  bin_common::options::add_option_groups();
 
   visible.add(build);
   global.add(build);
@@ -197,7 +197,7 @@ void
 options::check_options ()
 {
   // Chain up to check basic options.
-  schroot_base::options::check_options();
+  bin_common::options::check_options();
 
   if (vm.count("build"))
     this->action = ACTION_BUILD;
diff --git a/bin/csbuild/options.h b/bin/csbuild/options.h
index 4f7218da..da8ae578 100644
--- a/bin/csbuild/options.h
+++ b/bin/csbuild/options.h
@@ -19,7 +19,7 @@
 #ifndef CSBUILD_OPTIONS_H
 #define CSBUILD_OPTIONS_H
 
-#include <schroot-base/options.h>
+#include <bin-common/options.h>
 
 #include <sbuild/types.h>
 
@@ -31,7 +31,7 @@ namespace csbuild
   /**
    * csbuild command-line options.
    */
-  class options : public schroot_base::options
+  class options : public bin_common::options
   {
   public:
     /// A shared_ptr to an options object.