stop building source packages in a schroot; we don't need to anymore

diff --git a/debian/changelog b/debian/changelog
index 7ad1fdd..d2febb1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-dev (0.1.29) precise; urgency=low
+
+  * Remove the build-source-package-in-schroot hack now that we have a
+    modern debhelper.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Mon, 29 Jul 2013 23:52:18 -0400
+

 invirt-dev (0.1.28ubuntu1) precise; urgency=low
 
   * Build source packages with sbuild now that we _can_.
 invirt-dev (0.1.28ubuntu1) precise; urgency=low
 
   * Build source packages with sbuild now that we _can_.

diff --git a/invirtibuilder b/invirtibuilder
index 6c0776e..43f09f1 100755 (executable)
--- a/invirtibuilder
+++ b/invirtibuilder
@@ -416,8 +416,8 @@ def build():
                     # If we were, we could use debuild and get nice
                     # environment scrubbing. Since we're not, debuild
                     # complains about not having an orig.tar.gz
                     # If we were, we could use debuild and get nice
                     # environment scrubbing. Since we're not, debuild
                     # complains about not having an orig.tar.gz

-                    logAndRun('sbuild', '-s', cwd=packagedir)
-
+                    logAndRun(['dpkg-buildpackage', '-us', '-uc', '-S'],
+                              cwd=packagedir)

                     db.failed_stage = 'building binary packages'
                     sbuildAll(package, commit, b.pocketToDistro(pocket), workdir)
                     db.failed_stage = 'tagging submodule'
                     db.failed_stage = 'building binary packages'
                     sbuildAll(package, commit, b.pocketToDistro(pocket), workdir)
                     db.failed_stage = 'tagging submodule'