[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: adapting a dpatch to changed source: how?

On Sun, 2009-02-15 at 20:07 +0000, Jonathan Wiltshire wrote:

> > So am I really supposed to create that patch file by hand in this case?
> If you can reconstruct the patched source, then:
> - apply the patch series as far as possible

The patch in question is the first in the series. Maybe later patches
need also be adapted, but I cannot say that at this point.

> - take a copy of this original source, and on the copy reconstruct the patched
> source
> - take a diff of this against its original, and you get a patch

I got a diff. I also got the final file how it should look.

> - use dpatch-edit-patch to create a new patch against the original,
> apply the difference, and capture it

This is the problem. dpatch-edit-patch does not let me do anything as
long as the out-of-sync patch is in place.

(01_build_xml is the out-of-sync patch, 01_build_xml_2 is the new patch
I want to create as a replacement; I am using the debianonly layout)

$ dpatch-edit-patch
--debianonly=/home/aschildbach/src/tarballs/libspring-2.5-java_2.5.6.orig.tar.gz 01_build_xml_2
* /home/aschildbach/src/libspring-2.5-java/debian/patches/01_build_xml_2.dpatch does not exist, it will be created as a new dpatch.
dpatch-edit-patch: * debian/-only layout selected
dpatch-edit-patch: *
unpacking /home/aschildbach/src/tarballs/libspring-2.5-java_2.5.6.orig.tar.gz
dpatch-edit-patch: * Copying /home/aschildbach/src/libspring-2.5-java to
reference directory.
dpatch-edit-patch: * Cleaning /tmp/dpep-ref.sezSKY/libspring-2.5-java
test -d debian/patched || install -d debian/patched
dpatch  apply-all  
applying patch 01_build_xml to ./ ... failed.
make: *** [patch-stamp] Error 1

Besides, if I created a new patch, how would I get rid of the old one?

Best regards,


Reply to: