trinity-devel@lists.pearsoncomputing.net

Message: previous - next
Month: August 2012

Re: [trinity-devel] cups commits to backport/test in 3513-sru/tdelibs

From: Slávek Banko <slavek.banko@...>
Date: Tue, 14 Aug 2012 17:11:03 +0200
Dne út 14. srpna 2012 David C. Rankin napsal(a):
> On 08/13/2012 09:20 AM, David C. Rankin wrote:
> > Slavek,
> >
> >   Here is an updated patch for 3513-sru with the names already
> > changed. In the R14 commits, the first hunk is off by 5 lines in
> > context. This corrects that issue as well as the tde->kde name
> > changes... If nothing else, this will provide the correct lines and
> > changes.
>
> Slavek,
>
>   I have tested this patch with both cups >= 1.6 and cups <= 1.6 and
> tdelibs builds fine. I think we can add it to 3513-sru. Please review
> the original commits 9bc0d2cd9d, 91bf63b43b (noting the need to "sed -i
> 's/tde/kde/g' <commit.diff>"), and review the patch I attached earlier
> in this thread, and push to GIT if it is OK.
>
> Me: signoff for both cups >= 1.6 and cups <= 1.6

David,

thank you for testing. Patch for v3.5.13-sru you adjust properly. Just a 
small note: I will use patches so divided, as were the original commits - 
to maintain information about the original git hashes, which was made of 
cherry-pick.

Slavek
--