Add distix; add python-bottle to packages to install

8 files changed, 17 insertions, 7 deletions

diff --git a/liw-real.conf b/liw-real.conf
index 47ef6d8..e88e09c 100644
--- a/liw-real.conf
+++ b/liw-real.conf
@@ -228,6 +228,16 @@
             ]
 	},
 	{
+	    "name": "distix",
+            "git": "git://git.liw.fi/distix",
+            "build-depends": [
+                "cliapp"
+            ],
+            "build-commands": [
+                "python setup.py check"
+            ]
+	},
+	{
 	    "name": "copyright-statement-lint",
             "git": "git://git.liw.fi/copyright-statement-lint",
             "build-depends": [
diff --git a/vm-data/jenkins.conf b/vm-data/jenkins.conf
index 16bc159..6986c75 100644
--- a/vm-data/jenkins.conf
+++ b/vm-data/jenkins.conf
@@ -4,5 +4,5 @@ hostname = jenkins
 arch = amd64
 image = jenkins.img
 customize = vm-data/jenkins.customize
-package = acpid, acpi-support-base, bzr, git, ssh, vim, less, rsync, apache2, reprepro, sudo, graphviz, python-coverage, default-jre-headless
+package = acpid, acpi-support-base, bzr, git, ssh, vim, less, rsync, apache2, reprepro, sudo, graphviz, python-coverage, default-jre-headless, python-bottle
 
diff --git a/vm-data/sid-amd64.conf b/vm-data/sid-amd64.conf
index f742ab2..0dd39c7 100644
--- a/vm-data/sid-amd64.conf
+++ b/vm-data/sid-amd64.conf
@@ -4,5 +4,5 @@ distribution = sid
 hostname = jenkins-sid-amd64
 image = jenkins-sid-amd64.img
 customize = vm-data/worker.customize
-package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo
+package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle
 
diff --git a/vm-data/sid-i386.conf b/vm-data/sid-i386.conf
index cc0e39e..4c94ca4 100644
--- a/vm-data/sid-i386.conf
+++ b/vm-data/sid-i386.conf
@@ -4,5 +4,5 @@ distribution = sid
 hostname = jenkins-sid-i386
 image = jenkins-sid-i386.img
 customize = vm-data/worker.customize
-package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo
+package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle
 
diff --git a/vm-data/squeeze-amd64.conf b/vm-data/squeeze-amd64.conf
index ba4643b..18bedab 100644
--- a/vm-data/squeeze-amd64.conf
+++ b/vm-data/squeeze-amd64.conf
@@ -4,5 +4,5 @@ distribution = squeeze
 hostname = jenkins-squeeze-amd64
 image = jenkins-squeeze-amd64.img
 customize = vm-data/worker.customize
-package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo
+package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle
 
diff --git a/vm-data/squeeze-i386.conf b/vm-data/squeeze-i386.conf
index 1b5a9fd..9d5fde3 100644
--- a/vm-data/squeeze-i386.conf
+++ b/vm-data/squeeze-i386.conf
@@ -4,5 +4,5 @@ distribution = squeeze
 hostname = jenkins-squeeze-i386
 image = jenkins-squeeze-i386.img
 customize = vm-data/worker.customize
-package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo
+package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle
 
diff --git a/vm-data/wheezy-amd64.conf b/vm-data/wheezy-amd64.conf
index c9af3b1..9ec5ae6 100644
--- a/vm-data/wheezy-amd64.conf
+++ b/vm-data/wheezy-amd64.conf
@@ -4,5 +4,5 @@ distribution = wheezy
 hostname = jenkins-wheezy-amd64
 image = jenkins-wheezy-amd64.img
 customize = vm-data/worker.customize
-package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo
+package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle
 
diff --git a/vm-data/wheezy-i386.conf b/vm-data/wheezy-i386.conf
index fd2175e..65d0dd9 100644
--- a/vm-data/wheezy-i386.conf
+++ b/vm-data/wheezy-i386.conf
@@ -4,5 +4,5 @@ distribution = wheezy
 hostname = jenkins-wheezy-i386
 image = jenkins-wheezy-i386.img
 customize = vm-data/worker.customize
-package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo
+package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle