Bug#380499: [Build-common-hackers] Bug#380499: cdbs 0.4.45 simple-patchsys.mk doesn't properly distinguish patches

2006-07-31 Thread Peter Eisentraut
Note that the freeze cutoff for cdbs is approaching, so we need an idea on 
this really quickly.

Am Sonntag, 30. Juli 2006 22:19 schrieb Peter Eisentraut:
> Christopher Martin wrote:
> > Notice how debian/patches/04_am_maintainer_mode.diff is skipped
> > because "it's already applied" even though it clearly isn't? There is
> > a similarly named but different patch,
> > debian/patches/common/04_am_maintainer_mode.diff, which is perhaps
> > confusing CDBS.
>
> We need a per-patch stamp file to fix various other misbehaviors, which
> is why this sort of setup is out of luck.  Apparently someone thought
> that the actual patch directory should be read-only, so devising a
> patch stamp naming scheme that can handle this is a bit tricky.
>
> Currently we have
>
> $(call cdbs_update_stamp,debian/stamp-patch-$$(basename $$patch))
>
> Considering that the patch directory can be chosen arbitrarily (a
> feature that you make use of), we can't just stick the directory name
> in there.
>
> Anyone got an idea?


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#380499: [Build-common-hackers] Bug#380499: cdbs 0.4.45 simple-patchsys.mk doesn't properly distinguish patches

2006-07-30 Thread Peter Eisentraut
Christopher Martin wrote:
> Notice how debian/patches/04_am_maintainer_mode.diff is skipped
> because "it's already applied" even though it clearly isn't? There is
> a similarly named but different patch,
> debian/patches/common/04_am_maintainer_mode.diff, which is perhaps
> confusing CDBS.

We need a per-patch stamp file to fix various other misbehaviors, which 
is why this sort of setup is out of luck.  Apparently someone thought 
that the actual patch directory should be read-only, so devising a 
patch stamp naming scheme that can handle this is a bit tricky.

Currently we have

$(call cdbs_update_stamp,debian/stamp-patch-$$(basename $$patch))

Considering that the patch directory can be chosen arbitrarily (a 
feature that you make use of), we can't just stick the directory name 
in there.

Anyone got an idea?


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



Bug#380499: cdbs 0.4.45 simple-patchsys.mk doesn't properly distinguish patches

2006-07-30 Thread Christopher Martin
Package: cdbs
Version: 0.4.45
Severity: critical

apt-get source kdelibs, and in the top-level source directory, try:

fakeroot debian/rules apply-patches

Notice how debian/patches/04_am_maintainer_mode.diff is skipped 
because "it's already applied" even though it clearly isn't? There is a 
similarly named but different patch, 
debian/patches/common/04_am_maintainer_mode.diff, which is perhaps 
confusing CDBS.

Then of course if you try:

fakeroot debian/rules clean

...we get an error, since it can't unapply a patch that wasn't actually 
applied.

This could mess up a number of KDE builds, so a quick fix would be 
great. CDBS 0.4.44 worked fine.

Thanks,
Christopher Martin


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]