**** BEGIN LOGGING AT Tue Jun 12 02:59:56 2007
Jun 12 10:02:58 <Jollino> hello all
Jun 12 11:04:43 <motte> Hello I have problems to apply the patches . on http://pastebin.ca/561132 you find the makefile , the error output of make , oxyl_box_check.php.patch , oxyl_box_check.php.rej and the original oxyl_box_chek.php. I don't know , what is wrong. Can somebody have a look and help me ? 
Jun 12 12:08:34 <motte> I have no more time yet, If you find a hint for me , please update http://pastebin.ca/561132 
Jun 12 17:16:14 <Woppe> can I install midnight commander with openslug?
Jun 12 18:25:50 <motte> Hello I have problems to apply the patches. I get an error messages like this: patching file common/oxyl_box_check.php
Jun 12 18:25:50 <motte> Hunk #1 FAILED at 68.
Jun 12 18:25:50 <motte> 1 out of 1 hunk FAILED -- saving rejects to file common/oxyl_box_check.php.rej          I have put the makefile , the error messages , the patchfile , the patch.rej and the originalfile on http://pastebin.ca/561132 Please can anybody have look and help me . 
Jun 12 19:18:56 <motte> eno : If you have a little time , please have a look
Jun 12 19:21:53 <osas> motte: do you understand what patch command does?
Jun 12 19:22:30 <motte> i am not shure , i have not so much experience with it
Jun 12 19:22:53 <osas> you have version 1 of a file
Jun 12 19:22:58 <osas> then you have version 2
Jun 12 19:23:12 <motte> yes
Jun 12 19:23:35 <osas> by doing diff -Naurp file_1 file_2 it will output the differences between the two versions
Jun 12 19:23:45 <osas> and that is your patch file
Jun 12 19:23:55 <motte> i make diff -u 
Jun 12 19:24:02 <motte> is tis wrong
Jun 12 19:24:18 <osas> now, the patch command is trying to bring the existing file (ver 1) to the desired version (ver 2)
Jun 12 19:24:40 <motte> yes
Jun 12 19:25:03 <osas> if the file that you want to patch went from ver 1 to ver 1.1, the you patch may not apply, because the diff is no longer valid
Jun 12 19:25:26 <osas> in your case, the patch was created for an different version of the original file
Jun 12 19:25:39 <osas> you need to check what the patch intended to do
Jun 12 19:25:50 <osas> create a new version by hand
Jun 12 19:26:00 <osas> and then create a new patch file
Jun 12 19:26:05 <osas> and it will work
Jun 12 19:26:07 <osas> got it?
Jun 12 19:27:02 <motte> no it was the origin file , i am shure
Jun 12 19:28:42 <osas> then your patch file is wrong
Jun 12 19:29:25 <motte> i input diff -u file1 file2 > file.patch
Jun 12 19:29:44 <motte> and then i edit path for the files with kate
Jun 12 19:30:22 <osas> do not edit the patch file
Jun 12 19:30:31 <osas> edit file2
Jun 12 19:30:42 <osas> and use: diff -Naurp file1 file2 > file.patch
Jun 12 19:31:15 <osas> if you break the patch file, it will not apply (and that just happened to you)
Jun 12 19:31:38 <motte> ok ,i try   Thank you
Jun 12 19:35:22 <osas> np
Jun 12 19:47:30 <motte> osas: the patches works now
Jun 12 19:47:45 <osas> :-)
Jun 12 23:06:29 <CIA-2> 03bzhou * r6211 10optware/trunk/make/mcabber.mk: mcabber: 0.9.1 -> 0.9.2
**** ENDING LOGGING AT Wed Jun 13 02:59:57 2007