debian/patches/17-xfree86-saner-conf-search-paths.diff | 18 ++++------------- 1 file changed, 5 insertions(+), 13 deletions(-)
New commits: commit c1c06bfa555ee75d7e1b627c4296f00262a4baf7 Author: Timo Aaltonen <[email protected]> Date: Thu Apr 15 10:55:41 2010 +0300 Edit patch 17 to make clear that it includes four commits. diff --git a/debian/patches/17-xfree86-saner-conf-search-paths.diff b/debian/patches/17-xfree86-saner-conf-search-paths.diff index 4bc8ac0..c76c943 100644 --- a/debian/patches/17-xfree86-saner-conf-search-paths.diff +++ b/debian/patches/17-xfree86-saner-conf-search-paths.diff @@ -1,17 +1,9 @@ -commit eb07b8606f9a1349baf8114bb36dc2712e5d3419 -Author: Dan Nicholson <[email protected]> -Date: Sat Apr 3 09:33:47 2010 -0700 +Merged patches: - xfree86: Allow adding sysconfdir and datadir to config search paths - - We could just use $projectroot/etc and $projectroot/share, but the user - might have other plans for them. - - Signed-off-by: Dan Nicholson <[email protected]> - Signed-off-by: Peter Hutterer <[email protected]> - (cherry picked from commit 2460e921d18fd264e6f6374be0908f4100442650) - - Signed-off-by: Peter Hutterer <[email protected]> +eb07b8606f9a1349baf8114bb36dc2712e5d3419 +a4516965de447332794ee0afb9503c351fff6fe8 +59f96734633fce3c2bee62bce860aed33033ce3e +0c4a358eae0e77f389380bbbf39d4419f2dd6dcd --- a/hw/xfree86/parser/Makefile.am +++ b/hw/xfree86/parser/Makefile.am -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
