no->nb transition complete, how do I make "diff" pick up the new filenames?
I now have a working lyx-1.4cvs which uses nb instead of no. I get translated text with LANG=nb_NO, and I get the freshly renamed nb_Intro.lyx from the help menu. This was less work than expected. Just a few renames, makefile changes, and changelog updates. How to I submit a patch with renamed files? I tried cvs diff -N -u but that did not work. It merely complained about the missing no.po, and wondered about the unexpected nb.po Should I send a diff for the changed files and let one of you do the rename in cvs, or is there a way of making a patch that removes the "no" files and add the "nb" files? Helge Hafting
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Helge Hafting wrote: > Should I send a diff for the changed files and let one of you > do the rename in cvs, or is there a way of making a patch > that removes the "no" files and add the "nb" files? rename is not possible in cvs. You need to do cvs remove no.po cvs add nb.po and the the diff would be complete, but for that you need cvs write access. What you can do is to send two patches: One from cvs with the changed files and for each pair of renamed files a manual one (e.g. no.po -> nb.po). Georg
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Helge Hafting <[EMAIL PROTECTED]> writes: | I now have a working lyx-1.4cvs which uses nb instead of no. | I get translated text with LANG=nb_NO, and I get the | freshly renamed nb_Intro.lyx from the help menu. | | This was less work than expected. Just a few renames, | makefile changes, and changelog updates. Nice. I think this is what we should do. | How to I submit a patch with renamed files? | I tried | cvs diff -N -u | but that did not work. It merely complained about the | missing no.po, and wondered about the unexpected nb.po you have to do a cvs add to make that work (and to do cvs add you need cvs write access) | Should I send a diff for the changed files and let one of you | do the rename in cvs, or is there a way of making a patch | that removes the "no" files and add the "nb" files? Send it to me with a list of what needs to be renamed. -- Lgb
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Lars Gullik Bjønnes wrote: Helge Hafting <[EMAIL PROTECTED]> writes: [...] | Should I send a diff for the changed files and let one of you | do the rename in cvs, or is there a way of making a patch | that removes the "no" files and add the "nb" files? Send it to me with a list of what needs to be renamed. I noticed that "cvs diff" skipped three files: * po/Makefile Is this one autogenerated with languages from po/LINGUAS? * lib/doc/Makefile * lib/doc/Makefile.in Autogenerated from lib/doc/Makefile.am ? File to rename in po: no.po to nb.po File to rename in lib/doc: no_Intro.lyx to nb_Intro.lyx no_TOC.lyx to no_Intro.lyx Assuming the above mentioned files get autogenerated, this is all you need to get a working nb_NO locale for lyx. no_NO is lost, unless "make uninstall" leaves the old file behind. I noticed that make uninstall leaves lots of files and directories in /usr/local/lyx-1.4cvs Helge Hafting ? all.pot ? nb.po Index: ChangeLog === RCS file: /var/cvs/lyx/lyx-devel/po/ChangeLog,v retrieving revision 1.231 diff -u -p -u -r1.231 ChangeLog --- ChangeLog 15 Sep 2005 15:15:52 - 1.231 +++ ChangeLog 16 Sep 2005 09:17:47 - @@ -1,3 +1,9 @@ +2005-09-16 Helge Hafting <[EMAIL PROTECTED]> + * Transition from no.po to nb.po due to language code change. + Renamed no.po nb.po + Updated LINGUAS + Updated Makefile + 2005-09-15 Jean-Marc Lasgouttes <[EMAIL PROTECTED]> * *.po: remerge. Index: LINGUAS === RCS file: /var/cvs/lyx/lyx-devel/po/LINGUAS,v retrieving revision 1.1 diff -u -p -u -r1.1 LINGUAS --- LINGUAS 11 Mar 2005 10:49:09 - 1.1 +++ LINGUAS 16 Sep 2005 09:17:47 - @@ -1,3 +1,3 @@ # The list of languages known to LyX -bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa +bg ca cs da de es eu fi fr he hu it nb nl nn pl pt ro ru sk sl sv tr wa ? UserGuide.lyx.emergency ? doc-no2nb.diff ? nb_Intro.lyx ? nb_TOC.lyx Index: ChangeLog === RCS file: /var/cvs/lyx/lyx-devel/lib/doc/ChangeLog,v retrieving revision 1.33 diff -u -p -u -r1.33 ChangeLog --- ChangeLog 8 Sep 2005 09:20:12 - 1.33 +++ ChangeLog 16 Sep 2005 09:18:53 - @@ -1,3 +1,10 @@ +2005-09-16 Helge Hafting <[EMAIL PROTECTED]> + * no->nb transition due to language code change. + renamed no_Intro.lyx to nb_Intro.lyx + renamed no_TOC.lyx to nb_TOC.lyx + updated Makefile, Makefile.in, Makefile.am accordingly + + 2005-09-08 Angus Leeming <[EMAIL PROTECTED]> * UserGuide.lyx: correct grammar describing invocation of the Index: Makefile.am === RCS file: /var/cvs/lyx/lyx-devel/lib/doc/Makefile.am,v retrieving revision 1.6 diff -u -p -u -r1.6 Makefile.am --- Makefile.am 17 Oct 2004 19:12:32 - 1.6 +++ Makefile.am 16 Sep 2005 09:18:53 - @@ -49,11 +49,11 @@ docfiles = \ it_Tutorial.lyx \ it_UserGuide.lyx \ LaTeXConfig.lyx.in \ + nb_Intro.lyx \ + nb_TOC.lyx \ nl_Intro.lyx \ nl_TOC.lyx \ nl_Tutorial.lyx \ - no_Intro.lyx \ - no_TOC.lyx \ pl_Extended.lyx \ pl_Intro.lyx \ pl_TOC.lyx \
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
> "Helge" == Helge Hafting <[EMAIL PROTECTED]> writes: Helge> I noticed that "cvs diff" skipped three files: * po/Makefile Is Helge> this one autogenerated with languages from po/LINGUAS? Helge> * lib/doc/Makefile * lib/doc/Makefile.in Autogenerated from Helge> lib/doc/Makefile.am ? These files are indeed generated. Do we want to do the same for 1.3.7? JMarc
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Helge Hafting <[EMAIL PROTECTED]> writes: | Lars Gullik Bjønnes wrote: | | >Helge Hafting <[EMAIL PROTECTED]> writes: | >[...] | >| Should I send a diff for the changed files and let one of you | >| do the rename in cvs, or is there a way of making a patch | >| that removes the "no" files and add the "nb" files? | > | >Send it to me with a list of what needs to be renamed. | > | I noticed that "cvs diff" skipped three files: | * po/Makefile |Is this one autogenerated with languages from po/LINGUAS? yes. auto | | * lib/doc/Makefile | * lib/doc/Makefile.in |Autogenerated from lib/doc/Makefile.am ? yes | File to rename in po: | no.po to nb.po | | File to rename in lib/doc: | no_Intro.lyx to nb_Intro.lyx | no_TOC.lyx to no_Intro.lyx ok | Assuming the above mentioned files get autogenerated, this is all | you need to get a working nb_NO locale for lyx. no_NO is lost, unless | "make uninstall" leaves the old file behind. I noticed that | make uninstall leaves lots of files and directories in /usr/local/lyx-1.4cvs it shouldn't ... and I thought make distcheck checked for that... you are including the patch "inline" and not as attachment. -- Lgb
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes: | > "Helge" == Helge Hafting <[EMAIL PROTECTED]> writes: | | Helge> I noticed that "cvs diff" skipped three files: * po/Makefile Is | Helge> this one autogenerated with languages from po/LINGUAS? | | Helge> * lib/doc/Makefile * lib/doc/Makefile.in Autogenerated from | Helge> lib/doc/Makefile.am ? | | These files are indeed generated. | | Do we want to do the same for 1.3.7? I'd say no. but your call. -- Lgb
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes: Lars> you are including the patch "inline" and not as attachment. "K b" is your friend in GNUS in such cases. JMarc
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes: | Do we want to do the same for 1.3.7? Lars> I'd say no. but your call. Well, I'll do what Norwegian guys tell me to do. So I have one "no" vote. JMarc
Re: no->nb transition complete, how do I make "diff" pick up the new filenames?
Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes: | > "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes: | | Lars> you are including the patch "inline" and not as attachment. | | "K b" is your friend in GNUS in such cases. nice to know -- Lgb
