On 08/04/2014 04:38 PM, akhiezer wrote: >> Date: Mon, 04 Aug 2014 11:01:44 -0300 >> From: Fernando de Oliveira <[email protected]> >> To: BLFS Development List <[email protected]> >> Subject: Re: [blfs-dev] ... r13824 - in trunk/BOOK: general/graphlib >> introduction/welcome >> >> On 04-08-2014 10:26, Armin K. wrote: >>> On 08/04/2014 01:54 PM, [email protected] wrote: >>>> Author: fernando >>>> Date: Mon Aug 4 04:54:40 2014 >>>> New Revision: 13824 >>>> >>>> Log: >>>> Fix FreeType-2.5.3 for first installation without FreeType-2.5.3 that I >>>> forgot to make explicit (only talked about), when updating. Thanks >>>> Christopher G. >>>> >>>> Modified: >>>> trunk/BOOK/general/graphlib/freetype2.xml >>>> trunk/BOOK/introduction/welcome/changelog.xml >>>> >>> >>> >>> >>>> Modified: trunk/BOOK/introduction/welcome/changelog.xml >>>> ============================================================================== >>>> --- trunk/BOOK/introduction/welcome/changelog.xml Mon Aug 4 04:01:28 >>>> 2014 (r13823) >>>> +++ trunk/BOOK/introduction/welcome/changelog.xml Mon Aug 4 04:54:40 >>>> 2014 (r13824) >>>> @@ -48,6 +48,11 @@ >>>> <para>August 4th, 2014</para> >>>> <itemizedlist> >>>> <listitem> >>>> + <para>[fernando] - Fix FreeType-2.5.3 for first installation >>>> without >>>> + FreeType-2.5.3 that I forgot to make explicit (only talked >>>> about), >>>> + when updating. Thanks Christopher G.</para> >>>> + </listitem> >>> >>> I don't mean to be rude, but if you are taking something that was first >>> done in systemd branch, it would be fair to give the credit to the one >>> who fixed it (merge the correct changelog entry). You can see I do that >>> all the time. >>> >>> >>> >> >> Sorry about that. >> >> Christopher being systemd developer, I thought mentioning him was >> exactly acknowledging that. >> >> In the papers that I published in the past, we never mentioned >> Universities or Laboratories, just the authors, although these >> informations were always in the papers (referred and to be published) >> just below the authors names. >> >> Fixed at revision 13827. >> > > > Should you define some entities: > > Thanks Christopher G., from systemd branch. > > Thanks Armin K., from systemd branch. > > , from systemd branch. > > Might save some typing. > > > akh > > > >> Thanks. >> >> -- >> []s, >> Fernando >> > > > -- >
He could just merge the original changelog entry (if any) from systemd branch. May prevent conflicts for future merging. -- Note: My last name is not Krejzi.
signature.asc
Description: OpenPGP digital signature
-- http://lists.linuxfromscratch.org/listinfo/blfs-dev FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
