diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-03-20 06:23:52 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-03-20 06:23:52 +0000 |
| commit | 59bf0fe4238ee5c18cf7dd7a8598b64445b8457f (patch) | |
| tree | 25076e6160e6efc1a3a3a35cbad1a0870154fc78 /packages/packagekit.merge/files | |
| parent | 308aa739417f1e3b11000e2268da69f3e3db3828 (diff) | |
| parent | 1008c8c2925767928b47d87b1e4b64004ea3d51b (diff) | |
merge of '0b604857bbf871639fdb43ee8380222e8ef64bb7'
and 'f2611b9289af3945942b74edcc7ef91fb0a597bd'
Diffstat (limited to 'packages/packagekit.merge/files')
| -rw-r--r-- | packages/packagekit.merge/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/packagekit.merge/files/disable-docbook2man.patch | 12 |
2 files changed, 12 insertions, 0 deletions
diff --git a/packages/packagekit.merge/files/.mtn2git_empty b/packages/packagekit.merge/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/packagekit.merge/files/.mtn2git_empty diff --git a/packages/packagekit.merge/files/disable-docbook2man.patch b/packages/packagekit.merge/files/disable-docbook2man.patch new file mode 100644 index 0000000000..0c7d4239d4 --- /dev/null +++ b/packages/packagekit.merge/files/disable-docbook2man.patch @@ -0,0 +1,12 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2008-02-20 17:57:44.000000000 +0800 ++++ git/configure.ac 2008-02-20 17:58:30.000000000 +0800 +@@ -115,6 +115,7 @@ + if test "$DOCBOOK2MAN" = "no" ; then + AC_MSG_WARN([docbook2man not found, will not be able to build man documentation]) + fi ++DOCBOOK2MAN="no" + AM_CONDITIONAL(HAVE_DOCBOOK2MAN, [test "$DOCBOOK2MAN" != "no"]) + + dnl --------------------------------------------------------------------------- |