On 29/01/12 17:31, Carlos R. Mafra wrote: > 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". > >
Here is ok :-? kix@osaka:~/tmp3$ git clone http://repo.or.cz/r/wmaker-crm.git Cloning into 'wmaker-crm'... kix@osaka:~/tmp3$ cp ../src/wmaker/wmaker-crm/debian/0001-debian-New-debian-version-0.95.1-1.patch . kix@osaka:~/tmp3$ mv 0001-debian-New-debian-version-0.95.1-1.patch wmaker-crm/ kix@osaka:~/tmp3$ cd wmaker-crm/ kix@osaka:~/tmp3/wmaker-crm$ git am 0001-debian-New-debian-version-0.95.1-1.patch Applying: debian: New debian version 0.95.1-1 /home/kix/tmp3/wmaker-crm/.git/rebase-apply/patch:464: trailing whitespace. * wterm package suggestion removed. /home/kix/tmp3/wmaker-crm/.git/rebase-apply/patch:11504: trailing whitespace. # directories in one run /home/kix/tmp3/wmaker-crm/.git/rebase-apply/patch:11507: trailing whitespace. # /home/kix/tmp3/wmaker-crm/.git/rebase-apply/patch:11512: trailing whitespace. # /home/kix/tmp3/wmaker-crm/.git/rebase-apply/patch:11518: trailing whitespace. # warning: squelched 15 whitespace errors warning: 20 lines add whitespace errors. kix@osaka:~/tmp3/wmaker-crm$ git log | more commit a82eb7790ee676d0d3b63a1240e7a28ac31f7ce8 Author: Rodolfo García Peñas (kix) <k...@kix.es> Date: Sun Jan 29 17:07:10 2012 +0100 debian: New debian version 0.95.1-1 This upload includes the debian changes of 0.95.0 and 0.95.1 -- ||// //\\// Rodolfo "kix" Garcia ||\\// //\\ http://www.kix.es/ -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
