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

Re: adapting a dpatch to changed source: how?

On Sun, Feb 15, 2009 at 09:34:47PM +0100, Andreas Schildbach wrote:
> This is the problem. dpatch-edit-patch does not let me do anything as
> long as the out-of-sync patch is in place.

So take it out of place. A dpatch is two things: the patch file, and its
entry in debian/patches/00list. Take its entry out, and
dpatch-edit-patch won't try to apply it.

> (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
> dpatch-edit-patch:
> * /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?

rm it, and remove its entry in 00list.

Jonathan Wiltshire

PGP/GPG: 0xDB800B52 / 4216 F01F DCA9 21AC F3D3  A903 CA6B EA3E DB80 0B52

Attachment: signature.asc
Description: Digital signature

Reply to: