[gnome-ostree] Drop the extra 'ostbuild' from source tree

[Colin Walters <walters src gnome org>]

commit bf66c917ac808165b9b6a86759c178ac8ff989d9
Author: Colin Walters <walters verbum org>
Date:   Thu Feb 21 10:48:03 2013 -0500

    Drop the extra 'ostbuild' from source tree

 Makefile-ostbuild.am                             |   68 +++++++++++-----------
 src/{ostbuild => }/js/argparse.js                |    0
 src/{ostbuild => }/js/buildutil.js               |    0
 src/{ostbuild => }/js/builtin.js                 |    0
 src/{ostbuild => }/js/builtins/autobuilder.js    |    0
 src/{ostbuild => }/js/builtins/checkout.js       |    0
 src/{ostbuild => }/js/builtins/git_mirror.js     |    0
 src/{ostbuild => }/js/builtins/make.js           |    0
 src/{ostbuild => }/js/builtins/qa_make_disk.js   |    0
 src/{ostbuild => }/js/builtins/qa_pull_deploy.js |    0
 src/{ostbuild => }/js/builtins/run_task.js       |    0
 src/{ostbuild => }/js/builtins/shell.js          |    0
 src/{ostbuild => }/js/fileutil.js                |    0
 src/{ostbuild => }/js/guestfish.js               |    0
 src/{ostbuild => }/js/jsondb.js                  |    0
 src/{ostbuild => }/js/jsonutil.js                |    0
 src/{ostbuild => }/js/jsutil.js                  |    0
 src/{ostbuild => }/js/libqa.js                   |    0
 src/{ostbuild => }/js/main.js                    |    0
 src/{ostbuild => }/js/params.js                  |    0
 src/{ostbuild => }/js/procutil.js                |    0
 src/{ostbuild => }/js/snapshot.js                |    0
 src/{ostbuild => }/js/streamutil.js              |    0
 src/{ostbuild => }/js/task.js                    |    0
 src/{ostbuild => }/js/tasks/task-bdiff.js        |    0
 src/{ostbuild => }/js/tasks/task-build.js        |    0
 src/{ostbuild => }/js/tasks/task-builddisks.js   |    0
 src/{ostbuild => }/js/tasks/task-resolve.js      |    0
 src/{ostbuild => }/js/tasks/task-smoketest.js    |    0
 src/{ostbuild => }/js/vcs.js                     |    0
 src/{ostbuild => }/ostbuild-qemu-pull-deploy     |    0
 src/{ostbuild => }/ostbuild.in                   |    0
 src/{ostbuild => }/ostree-build-compile-one      |    0
 src/{ostbuild => }/ostree-build-yocto            |    0
 34 files changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/Makefile-ostbuild.am b/Makefile-ostbuild.am
index bd98a08..51a613f 100644
--- a/Makefile-ostbuild.am
+++ b/Makefile-ostbuild.am
@@ -22,60 +22,60 @@ substitutions= \
        -e s,@pkgdatadir\@,$(pkgdatadir), \
        $(NULL)
 
-ostbuild: src/ostbuild/ostbuild.in Makefile
+ostbuild: src/ostbuild.in Makefile
        sed $(substitutions) $< > $  tmp && mv $  tmp $@
-EXTRA_DIST += ostbuild/ostbuild.in
+EXTRA_DIST += src/ostbuild.in
 
 if BUILDSYSTEM
 bin_SCRIPTS += ostbuild \
-       $(srcdir)/src/ostbuild/ostbuild-qemu-pull-deploy \
+       $(srcdir)/src/ostbuild-qemu-pull-deploy \
        $(NULL)
 
 utils_SCRIPTS = \
-       src/ostbuild/ostree-build-compile-one \
-       src/ostbuild/ostree-build-yocto \
+       src/ostree-build-compile-one \
+       src/ostree-build-yocto \
        $(NULL)
 utilsdir = $(pkglibdir)
 
 jsostbuilddir=$(pkgdatadir)/js
 jsostbuild_DATA= \
-       src/ostbuild/js/argparse.js \
-       src/ostbuild/js/buildutil.js \
-       src/ostbuild/js/builtin.js \
-       src/ostbuild/js/fileutil.js \
-       src/ostbuild/js/task.js \
-       src/ostbuild/js/jsondb.js \
-       src/ostbuild/js/jsonutil.js \
-       src/ostbuild/js/jsutil.js \
-       src/ostbuild/js/main.js \
-       src/ostbuild/js/libqa.js \
-       src/ostbuild/js/guestfish.js \
-       src/ostbuild/js/params.js \
-       src/ostbuild/js/procutil.js \
-       src/ostbuild/js/snapshot.js \
-       src/ostbuild/js/streamutil.js \
-       src/ostbuild/js/vcs.js \
+       src/js/argparse.js \
+       src/js/buildutil.js \
+       src/js/builtin.js \
+       src/js/fileutil.js \
+       src/js/task.js \
+       src/js/jsondb.js \
+       src/js/jsonutil.js \
+       src/js/jsutil.js \
+       src/js/main.js \
+       src/js/libqa.js \
+       src/js/guestfish.js \
+       src/js/params.js \
+       src/js/procutil.js \
+       src/js/snapshot.js \
+       src/js/streamutil.js \
+       src/js/vcs.js \
        $(NULL)
 
 jsostbuiltinsdir=$(jsostbuilddir)/builtins
 jsostbuiltins_DATA= \
-       src/ostbuild/js/builtins/autobuilder.js \
-       src/ostbuild/js/builtins/checkout.js \
-       src/ostbuild/js/builtins/git_mirror.js \
-       src/ostbuild/js/builtins/make.js \
-       src/ostbuild/js/builtins/qa_make_disk.js \
-       src/ostbuild/js/builtins/qa_pull_deploy.js \
-       src/ostbuild/js/builtins/run_task.js \
-       src/ostbuild/js/builtins/shell.js \
+       src/js/builtins/autobuilder.js \
+       src/js/builtins/checkout.js \
+       src/js/builtins/git_mirror.js \
+       src/js/builtins/make.js \
+       src/js/builtins/qa_make_disk.js \
+       src/js/builtins/qa_pull_deploy.js \
+       src/js/builtins/run_task.js \
+       src/js/builtins/shell.js \
        $(NULL)
 
 jsosttasksdir=$(jsostbuilddir)/tasks
 jsosttasks_DATA= \
-       src/ostbuild/js/tasks/task-build.js \
-       src/ostbuild/js/tasks/task-resolve.js \
-       src/ostbuild/js/tasks/task-bdiff.js \
-       src/ostbuild/js/tasks/task-builddisks.js \
-       src/ostbuild/js/tasks/task-smoketest.js \
+       src/js/tasks/task-build.js \
+       src/js/tasks/task-resolve.js \
+       src/js/tasks/task-bdiff.js \
+       src/js/tasks/task-builddisks.js \
+       src/js/tasks/task-smoketest.js \
        $(NULL)
 
 endif
diff --git a/src/ostbuild/js/argparse.js b/src/js/argparse.js
similarity index 100%
rename from src/ostbuild/js/argparse.js
rename to src/js/argparse.js
diff --git a/src/ostbuild/js/buildutil.js b/src/js/buildutil.js
similarity index 100%
rename from src/ostbuild/js/buildutil.js
rename to src/js/buildutil.js
diff --git a/src/ostbuild/js/builtin.js b/src/js/builtin.js
similarity index 100%
rename from src/ostbuild/js/builtin.js
rename to src/js/builtin.js
diff --git a/src/ostbuild/js/builtins/autobuilder.js b/src/js/builtins/autobuilder.js
similarity index 100%
rename from src/ostbuild/js/builtins/autobuilder.js
rename to src/js/builtins/autobuilder.js
diff --git a/src/ostbuild/js/builtins/checkout.js b/src/js/builtins/checkout.js
similarity index 100%
rename from src/ostbuild/js/builtins/checkout.js
rename to src/js/builtins/checkout.js
diff --git a/src/ostbuild/js/builtins/git_mirror.js b/src/js/builtins/git_mirror.js
similarity index 100%
rename from src/ostbuild/js/builtins/git_mirror.js
rename to src/js/builtins/git_mirror.js
diff --git a/src/ostbuild/js/builtins/make.js b/src/js/builtins/make.js
similarity index 100%
rename from src/ostbuild/js/builtins/make.js
rename to src/js/builtins/make.js
diff --git a/src/ostbuild/js/builtins/qa_make_disk.js b/src/js/builtins/qa_make_disk.js
similarity index 100%
rename from src/ostbuild/js/builtins/qa_make_disk.js
rename to src/js/builtins/qa_make_disk.js
diff --git a/src/ostbuild/js/builtins/qa_pull_deploy.js b/src/js/builtins/qa_pull_deploy.js
similarity index 100%
rename from src/ostbuild/js/builtins/qa_pull_deploy.js
rename to src/js/builtins/qa_pull_deploy.js
diff --git a/src/ostbuild/js/builtins/run_task.js b/src/js/builtins/run_task.js
similarity index 100%
rename from src/ostbuild/js/builtins/run_task.js
rename to src/js/builtins/run_task.js
diff --git a/src/ostbuild/js/builtins/shell.js b/src/js/builtins/shell.js
similarity index 100%
rename from src/ostbuild/js/builtins/shell.js
rename to src/js/builtins/shell.js
diff --git a/src/ostbuild/js/fileutil.js b/src/js/fileutil.js
similarity index 100%
rename from src/ostbuild/js/fileutil.js
rename to src/js/fileutil.js
diff --git a/src/ostbuild/js/guestfish.js b/src/js/guestfish.js
similarity index 100%
rename from src/ostbuild/js/guestfish.js
rename to src/js/guestfish.js
diff --git a/src/ostbuild/js/jsondb.js b/src/js/jsondb.js
similarity index 100%
rename from src/ostbuild/js/jsondb.js
rename to src/js/jsondb.js
diff --git a/src/ostbuild/js/jsonutil.js b/src/js/jsonutil.js
similarity index 100%
rename from src/ostbuild/js/jsonutil.js
rename to src/js/jsonutil.js
diff --git a/src/ostbuild/js/jsutil.js b/src/js/jsutil.js
similarity index 100%
rename from src/ostbuild/js/jsutil.js
rename to src/js/jsutil.js
diff --git a/src/ostbuild/js/libqa.js b/src/js/libqa.js
similarity index 100%
rename from src/ostbuild/js/libqa.js
rename to src/js/libqa.js
diff --git a/src/ostbuild/js/main.js b/src/js/main.js
similarity index 100%
rename from src/ostbuild/js/main.js
rename to src/js/main.js
diff --git a/src/ostbuild/js/params.js b/src/js/params.js
similarity index 100%
rename from src/ostbuild/js/params.js
rename to src/js/params.js
diff --git a/src/ostbuild/js/procutil.js b/src/js/procutil.js
similarity index 100%
rename from src/ostbuild/js/procutil.js
rename to src/js/procutil.js
diff --git a/src/ostbuild/js/snapshot.js b/src/js/snapshot.js
similarity index 100%
rename from src/ostbuild/js/snapshot.js
rename to src/js/snapshot.js
diff --git a/src/ostbuild/js/streamutil.js b/src/js/streamutil.js
similarity index 100%
rename from src/ostbuild/js/streamutil.js
rename to src/js/streamutil.js
diff --git a/src/ostbuild/js/task.js b/src/js/task.js
similarity index 100%
rename from src/ostbuild/js/task.js
rename to src/js/task.js
diff --git a/src/ostbuild/js/tasks/task-bdiff.js b/src/js/tasks/task-bdiff.js
similarity index 100%
rename from src/ostbuild/js/tasks/task-bdiff.js
rename to src/js/tasks/task-bdiff.js
diff --git a/src/ostbuild/js/tasks/task-build.js b/src/js/tasks/task-build.js
similarity index 100%
rename from src/ostbuild/js/tasks/task-build.js
rename to src/js/tasks/task-build.js
diff --git a/src/ostbuild/js/tasks/task-builddisks.js b/src/js/tasks/task-builddisks.js
similarity index 100%
rename from src/ostbuild/js/tasks/task-builddisks.js
rename to src/js/tasks/task-builddisks.js
diff --git a/src/ostbuild/js/tasks/task-resolve.js b/src/js/tasks/task-resolve.js
similarity index 100%
rename from src/ostbuild/js/tasks/task-resolve.js
rename to src/js/tasks/task-resolve.js
diff --git a/src/ostbuild/js/tasks/task-smoketest.js b/src/js/tasks/task-smoketest.js
similarity index 100%
rename from src/ostbuild/js/tasks/task-smoketest.js
rename to src/js/tasks/task-smoketest.js
diff --git a/src/ostbuild/js/vcs.js b/src/js/vcs.js
similarity index 100%
rename from src/ostbuild/js/vcs.js
rename to src/js/vcs.js
diff --git a/src/ostbuild/ostbuild-qemu-pull-deploy b/src/ostbuild-qemu-pull-deploy
similarity index 100%
rename from src/ostbuild/ostbuild-qemu-pull-deploy
rename to src/ostbuild-qemu-pull-deploy
diff --git a/src/ostbuild/ostbuild.in b/src/ostbuild.in
similarity index 100%
rename from src/ostbuild/ostbuild.in
rename to src/ostbuild.in
diff --git a/src/ostbuild/ostree-build-compile-one b/src/ostree-build-compile-one
similarity index 100%
rename from src/ostbuild/ostree-build-compile-one
rename to src/ostree-build-compile-one
diff --git a/src/ostbuild/ostree-build-yocto b/src/ostree-build-yocto
similarity index 100%
rename from src/ostbuild/ostree-build-yocto
rename to src/ostree-build-yocto