pre1.0.1rc3, problem with patches now

[Andreas Reuleaux <reuleaux@web.de>]

On Fri, Jul 12, 2002 at 12:58:14PM +0200, Chris Halls wrote:
> Whoops, sorry.  And I forgot to generate the source package for -rc3.
> Uploading now.

Thank you.

The build with -rc2 (that I had started before) went fine, creating
two debs oo.org-bin_i386 and oo.org_all (could not install them though
as I had not got the l10n pkg yet)

I decided to go for the -rc3 and rebuild everything,
this is what I am experiencing now:

mousehouse:~/oo/openoffice.org-1.0.0# dpkg-buildpackage -uc -us -rfakeroot
...
debian/scripts/patch.apply
Testing patch debian/patches/000_stolen_from_1_0_1.diff.uu...OK.  applying...done.
Testing patch debian/patches/001_gcc_version_check.diff...OK.  applying...done.
Testing patch debian/patches/002_remove_stlport_from_installation_set.diff...OK.  applying...done.
Testing patch debian/patches/003_enable_dmake_clean_patch.diff...OK.  applying...done.
Testing patch debian/patches/004_zipdep_not_found.diff...OK.  applying...done.
Testing patch debian/patches/005_gcc3_misc_changes.diff...OK.  applying...done.
Testing patch debian/patches/006_exception_sprecs.diff...OK.  applying...done.
Testing patch debian/patches/008_clk_tck_gcc-3.diff...patch would fail.
See debian/stampdir/patches/008_clk_tck_gcc-3.diff.log for details.
make: *** [debian/stampdir/patchapply] Error 1
mousehouse:~/oo/openoffice.org-1.0.0#


And here is what this 008_clk_tck_gcc-3.diff.log looks like


patching file tools/source/datetime/ttime.cxx
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file tools/source/datetime/ttime.cxx.rej

Andreas


-- 
To UNSUBSCRIBE, email to debian-openoffice-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org