diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-11-09 17:33:35 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-11-09 17:33:35 +0100 |
| commit | 067300254ce60c00f38a3456b24dc89d17ee4bc5 (patch) | |
| tree | 37654bdd7ad90596d74a1de0a24c46b2933e1840 /debian | |
| parent | 94410f82787864436d9bced38ad860ddf760b421 (diff) | |
refresh patches
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/05-dont_use_net_for_docs.diff | 19 | ||||
| -rw-r--r-- | debian/patches/06-gcc_4.4_fixes.diff | 7 |
2 files changed, 12 insertions, 14 deletions
diff --git a/debian/patches/05-dont_use_net_for_docs.diff b/debian/patches/05-dont_use_net_for_docs.diff index d3045093..71cb6c25 100644 --- a/debian/patches/05-dont_use_net_for_docs.diff +++ b/debian/patches/05-dont_use_net_for_docs.diff @@ -1,13 +1,12 @@ === modified file 'docs/Makefile' ---- old/docs/Makefile 2009-04-02 11:58:11 +0000 -+++ new/docs/Makefile 2009-05-05 05:30:18 +0000 -@@ -2,7 +2,7 @@ +--- a/docs/Makefile ++++ b/docs/Makefile +@@ -10,7 +10,7 @@ - # Process DocBook to HTML + all: docs --DBPROC=xsltproc -+DBPROC = xsltproc --nonet - - DOCBOOK_DIR = docbook - HTML_DIR = htmlguide - +-DBPROC_COMMAND = xsltproc ++DBPROC_COMMAND = xsltproc --nonet + MKDIR_COMMAND = mkdir + CP_COMMAND = cp + PERL_COMMAND = perl diff --git a/debian/patches/06-gcc_4.4_fixes.diff b/debian/patches/06-gcc_4.4_fixes.diff index adf74301..46ec64cf 100644 --- a/debian/patches/06-gcc_4.4_fixes.diff +++ b/debian/patches/06-gcc_4.4_fixes.diff @@ -6,13 +6,12 @@ https://bugs.launchpad.net/bugs/371809 Impact: FTBFS with gcc 4.4 === modified file 'lib/server/ServerControl.cpp' ---- old/lib/server/ServerControl.cpp 2009-04-02 11:58:11 +0000 -+++ new/lib/server/ServerControl.cpp 2009-05-05 05:38:05 +0000 +--- a/lib/server/ServerControl.cpp ++++ b/lib/server/ServerControl.cpp @@ -1,5 +1,6 @@ #include "Box.h" +#include <stdio.h> #include <errno.h> + #include <stdio.h> - #ifdef HAVE_SYS_TYPES_H - |