diff options
author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-03-19 16:04:03 +0100 |
---|---|---|
committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-03-19 16:04:03 +0100 |
commit | 5426445ae86c87f9f7589573daaf273f2fe93c56 (patch) | |
tree | 6b511b15a5b3fc6fe909706da446a397e86ad00f | |
parent | 5dad4134da37576de12721f34165c1fe4d138b3c (diff) |
merge from mvo
-rw-r--r-- | .bzr-builddeb.moved/default.conf | 2 | ||||
-rw-r--r-- | .bzr-builddeb/default.conf | 5 | ||||
-rw-r--r-- | .bzr-builddeb/default.conf.orig | 2 | ||||
-rw-r--r-- | pre-build.sh | 3 |
4 files changed, 11 insertions, 1 deletions
diff --git a/.bzr-builddeb.moved/default.conf b/.bzr-builddeb.moved/default.conf new file mode 100644 index 000000000..3a08d6070 --- /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 3a08d6070..f2c082569 100644 --- 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 index 000000000..9c55498ce --- /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 index 000000000..2c7d28c2c --- /dev/null +++ b/pre-build.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +make -f Makefile startup doc |