On Sun, 29 Jan 2012 at 17:18:13 +0100, Rodolfo kix Garcia wrote: > > I hope this patch helps.
Thanks Rodolfo, but it doesn't apply. [mafra@Pilar:wmaker.git]$ git am 0001-debian-New-debian-version-0.95.1-1.patch Applying: debian: New debian version 0.95.1-1 /home/mafra/git-repos/wmaker.git/.git/rebase-apply/patch:464: trailing whitespace. * wterm package suggestion removed. /home/mafra/git-repos/wmaker.git/.git/rebase-apply/patch:11504: trailing whitespace. # directories in one run /home/mafra/git-repos/wmaker.git/.git/rebase-apply/patch:11507: trailing whitespace. # /home/mafra/git-repos/wmaker.git/.git/rebase-apply/patch:11512: trailing whitespace. # /home/mafra/git-repos/wmaker.git/.git/rebase-apply/patch:11518: trailing whitespace. # error: patch failed: debian/changelog:1 error: debian/changelog: patch does not apply error: patch failed: debian/control:4 error: debian/control: patch does not apply error: patch failed: debian/copyright:7 error: debian/copyright: patch does not apply error: patch failed: debian/patches/52_libwmaker0dev.diff:1 error: debian/patches/52_libwmaker0dev.diff: patch does not apply Patch failed at 0001 debian: New debian version 0.95.1-1 When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". -- To unsubscribe, send mail to [email protected].
