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

Re: Manual usage of quilt does not work any more


Dne Sun, 20 Feb 2011 23:30:33 +0100
Andreas Tille <andreas@an3as.eu> napsal(a):

> I'm currently totally clueless in the following situation:  I took
> a random package I'm maintaining (at least it is the case for three
> totally unrelated packages), say texmaker.  I obtained the source
> tarball, untarred it and copied the debian/ dir from SVN into it.
> Then I tried:
> /tmp/texmaker/texmaker-2.2.1$ quilt push
> Applying patch 10_spelling_dict.patch
> patch: unrecognized option '--unified-reject-files'
> patch: Try `patch --help' for more information.
> Patch 10_spelling_dict.patch does not apply (enforce with -f)
> I have no idea at all why the patch does not apply because
> /tmp/texmaker/texmaker-2.2.1$ patch -p1 < debian/patches/10_spelling_dict.patch 
> patching file configdialog.cpp
> works perfectly fine.  If I unpack the source via
> /tmp/texmaker$ dpkg-source -x texmaker_2.2.1-1.dsc 
> dpkg-source: info: extracting texmaker in texmaker-2.2.1
> dpkg-source: info: unpacking texmaker_2.2.1.orig.tar.bz2
> dpkg-source: info: unpacking texmaker_2.2.1-1.debian.tar.bz2
> dpkg-source: info: applying 10_spelling_dict.patch
> dpkg-source: info: applying spelling-error-in-binary.patch
> the patches are applied, however I can not unpatch:
> /tmp/texmaker/texmaker-2.2.1$ quilt applied
> 10_spelling_dict.patch
> spelling-error-in-binary.patch
> /tmp/texmaker/texmaker-2.2.1$ quilt pop -a 
> Patch spelling-error-in-binary.patch does not remove cleanly (refresh it or enforce with -f)
> The hint for refreshing or enforcing with -f is not helpful at all.
> My ~/.quiltrc is
> QUILT_DIFF_ARGS="--no-timestamps --no-index"
> QUILT_REFRESH_ARGS="--no-timestamps --no-index"
> QUILT_PATCH_OPTS="--unified-reject-files"

And you should disable this line as this is the one causing your
troubles... (for long story, read patch changelog)

	Michal Čihař | http://cihar.com | http://blog.cihar.com

Attachment: signature.asc
Description: PGP signature

Reply to: