merge from mvo

diff --git a/.bzr-builddeb.moved/default.conf b/.bzr-builddeb.moved/default.conf
new file mode 100644 (file)
index 0000000..3a08d60
--- /dev/null
+++ b/.bzr-builddeb.moved/default.conf
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True

diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
index 3a08d60707afd03692fc26528f17367f8b63149b..f2c0825697530302c073442b9a80d69c1ade9963 100644 (file)
--- a/.bzr-builddeb/default.conf
+++ b/.bzr-builddeb/default.conf
@@ -1,2 +1,5 @@
 [BUILDDEB]
-native = True
+native = true
+
+[HOOKS]
+pre-build=./pre-build.sh

diff --git a/.bzr-builddeb/default.conf.orig b/.bzr-builddeb/default.conf.orig
new file mode 100644 (file)
index 0000000..9c55498
--- /dev/null
+++ b/.bzr-builddeb/default.conf.orig
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = true

diff --git a/pre-build.sh b/pre-build.sh
new file mode 100644 (file)
index 0000000..2c7d28c
--- /dev/null
+++ b/pre-build.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make -f Makefile startup doc