The patch use-free-jaxp-from-system.diff is broken (was Re: backporting openoffice.org-2.0.1-2 to sarge)
Hi Rene,
Now I have fixed both problems and the build went further, however it stills fails when the patch
use-free-jaxp-from-system.diff
was rejected. I studied the apply file and apparently this patch is only applied when the build is
intended to be for sarge-backports (which must use k2sdk) Here is the screen output:
Hunk #2 succeeded at 166 (offset -2 lines).
Hunk #3 succeeded at 238 (offset -2 lines).
patching file scp2/source/ooo/file_ooo.scp
Hunk #1 succeeded at 635 (offset 9 lines).
Hunk #2 succeeded at 745 (offset 7 lines).
patching file scripting/prj/build.lst
( patch -l -p0 -d /DVD/src/openoffice.org-2.0.1/ooo-build/build/ooa680-m1 > /dev/null) < /DVD/src/openoffice.org-2.0.1 /ooo-build/patches/src680/./disable-rhino-without-system-bsh.diff
done.
copy disable-rhino-without-system-bsh.diff -> /DVD/src/openoffice.org-2.0.1/ooo-build/build/ooa680-m1/applied_patches/3 15-disable-rhino-without-system-bsh.diff
use-free-jaxp-from-system.diff: testing...( patch -l -p0 -d /DVD/src/openoffice.org-2.0.1/ooo-build/build/ooa680-m1 -- dry-run ) < /DVD/src/openoffice.org-2.0.1/ooo-build/patches/src680/./use-free-jaxp-from-system.diff
patching file external/prj/d.lst
Hunk #1 FAILED at 23.
1 out of 1 hunk FAILED -- saving rejects to file external/prj/d.lst.rej
patching file helpcontent2/settings.pmk
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file helpcontent2/settings.pmk.rej
Testing patch use-free-jaxp-from-system.diff failed. at /DVD/src/openoffice.org-2.0.1/ooo-build/
patches/apply.pl line 54.
make[1]: *** [stamp/patch.apply] Error 1
make[1]: Leaving directory `/DVD/src/openoffice.org-2.0.1/ooo-build'
make: *** [debian/stampdir/build] Error 2
abc@debian1:/DVD/src/openoffice.org-2.0.1$
So what's wrong here? Is this patch really broken?
Kai-Cheung Leung
----- Original Nachricht ----
Von: Rene Engelhard <rene@debian.org>
An: debian-openoffice@lists.debian.org
Datum: 30.01.2006 01:19
Betreff: Re: how to regenerating debian/rules? (was Aw: Re: backporting openoffice.org-2.0.1-2 to sarge)
> [ You still want to line-wrap your lines sanely... ]
>
> Kai-Cheung Leung wrote:
> > I have fixed the ooo-build/patches/src680/apply already, however after I
> toggled sarge-backport to y in debian/rulees, how can I regenerate
> debian/rules to reflect the new build-depencies?
>
> Run debian/rules control.
>
> Regards,
>
> Rene
> >
>
Machen Sie aus 14 Cent spielend bis zu 100 Euro!
Die neue Gaming-Area von Arcor - über 50 Onlinespiele im Angebot.
http://www.arcor.de/rd/emf-gaming-1
Reply to: