On 07 Jun 2014, at 15:29, Dirk Hohndel <[email protected]> wrote: > On Sat, Jun 07, 2014 at 09:39:29AM +0200, Joakim Bygdell wrote: >> Typo in subsurface.pro prevents clean build on Mac. > > Thanks for catching this. BTW: how did you create this patch? > git doesn't do patches with identical filenames - instead it adds one > level of directory to it. > git diff —no-prefix > filename.patch Simple but ugly way to create a patch.
> For my workflow it's easier if you send patches that were created with > git format-patch > > This one is trivial enough that I just fixed it by hand, though. > > But there's a second problem: it misses a Signed-off-by: line. > > Can you look at http://subsurface.hohndel.org/documentation/contributing/ > for more on all this? > > You could do a "practice run" if you want and redo the patch, or you could > respond to this email with something like "please add my SOB" and I'll do > it manually. > > Thanks again
0001-Typo-in-subsurface.pro-prevents-a-clean-build-on-Mac.patch
Description: Binary data
> > /D > > >> diff --git subsurface.pro subsurface.pro >> index 445d7b7..d50679e 100644 >> --- subsurface.pro >> +++ subsurface.pro >> @@ -259,7 +259,7 @@ MANPAGE = subsurface.1 >> XSLT_FILES = xslt >> ICONS_FILES = icons >> DOC_FILES = Documentation/images >> -for(MANUAL,USERMANUALS) DOC_FILES += $$OUT_PWD/Docuementation/$$MANUAL >> +for(MANUAL,USERMANUALS) DOC_FILES += $$OUT_PWD/Documentation/$$MANUAL >> THEME_FILES = theme >> MARBLEDIR = marbledata/maps marbledata/bitmaps >> >> >> >> //Jocke >>
_______________________________________________ subsurface mailing list [email protected] http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface
