info.info conflict between emacs and texinfo

info.info conflict between emacs and texinfo

[Andreas Schwab]

Both emacs and texinfo install the info.info info file.  This needs to
be resolved.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: info.info conflict between emacs and texinfo

[Karl Berry]

    Both emacs and texinfo install the info.info info file.  This needs to
    be resolved.

Fine, I'll remove it from Texinfo, since in practice info.texi has been
maintained in Emacs for many years.  (I've been copying it from the
latest Emacs distribution before making a Texinfo release.)

k

bug#13965: info.info conflict between emacs and texinfo

[Glenn Morris]

Karl Berry wrote:

>     Both emacs and texinfo install the info.info info file.  This needs to
>     be resolved.

Why does it matter? It is the same file, just provided by two packages.

> Fine, I'll remove it from Texinfo, since in practice info.texi has been
> maintained in Emacs for many years.

Oh, it has? :)

It seems slightly weird for me if the canonical home for info.texi
becomes Emacs rather than Texinfo...
Not that it changes very often, but AFAIK no-one here at Emacs was
paying particular attention to it wrt accuracy, bugs, etc.

>  (I've been copying it from the latest Emacs distribution before
> making a Texinfo release.)

:)

bug#13965: info.info conflict between emacs and texinfo

[Glenn Morris]

PS AFAIK, the only reason it is in Emacs is because of MS Windows users.
I doubt anyone on POSIX platforms uses info pages without having texinfo
installed.

bug#13965: info.info conflict between emacs and texinfo

[Eli Zaretskii]

> From: Glenn Morris <rgm@gnu.org>
> Date: Fri, 29 Mar 2013 21:07:11 -0400
> Cc: 13965@debbugs.gnu.org, bug-texinfo@gnu.org
> 
> 
> PS AFAIK, the only reason it is in Emacs is because of MS Windows users.
> I doubt anyone on POSIX platforms uses info pages without having texinfo
> installed.

I think it's for anyone who doesn't have Texinfo installed.  I agree
that Windows users are more likely to not have it, though.

bug#13965: info.info conflict between emacs and texinfo

[Karl Berry]

Hi Glenn,

    Why does it matter? It is the same file, just provided by two packages.

I know.  I keep them synced.  It's Andreas's request, not mine.

The current situation is totally not a problem in my own life, but I can
imagine it creating a discrepancy when there is version skew and a new
version of texinfo|emacs is released and has a different version of
info.texi than the existing installed emacs|texinfo on the system.

    Oh, it has? :)

Yes, it has.  The few changes that have been made in the past N years
have been made in Emacs.  If I had anything to change, I would change it
in Emacs too.

karl

bug#13965: info.info conflict between emacs and texinfo

[Andreas Schwab]

karl@freefriends.org (Karl Berry) writes:

> I know.  I keep them synced.

No, you don't.

--- texinfo-5.1/doc/info.texi	2013-02-19 23:25:28.000000000 +0100
+++ emacs-24.3/doc/misc/info.texi	2013-01-01 21:37:17.000000000 +0100
@@ -14,25 +14,18 @@
 This file describes how to use Info, the on-line, menu-driven GNU
 documentation system.
 
-Copyright @copyright{} 1989, 1992, 1996-2012 Free Software Foundation, Inc.
+Copyright @copyright{} 1989, 1992, 1996--2013 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with no
-Invariant Sections, with the Front-Cover texts being ``A GNU
-Manual,'' and with the Back-Cover Texts as in (a) below.  A copy of the
-license is included in the section entitled ``GNU Free Documentation
-License'' in the Emacs manual.
+Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
+and with the Back-Cover Texts as in (a) below.  A copy of the license
+is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
-modify this GNU manual.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -78,12 +71,13 @@
 @end ifinfo
 @end ifnottex
 
-@insertcopying 
+@insertcopying
 
 @menu
 * Getting Started::             Getting started using an Info reader.
 * Advanced::                    Advanced Info commands.
 * Expert Info::                 Info commands for experts.
+* GNU Free Documentation License::  The license for this documentation.
 * Index::                       An index of topics, commands, and variables.
 @end menu
 
@@ -264,7 +258,7 @@
 
 @format
 >> If you are in Emacs and have a mouse, and if you already practiced
-   typing @kbd{n} to get to the next node, click now with the left 
+   typing @kbd{n} to get to the next node, click now with the left
    mouse button on the @samp{Next} link to do the same ``the mouse way''.
 @end format
 
@@ -324,7 +318,7 @@
 we call ``Backspace or DEL'' in this manual is labeled differently on
 different keyboards.  Look for a key which is a little ways above the
 @key{ENTER} or @key{RET} key and which you normally use outside Emacs
-to erase the character before the cursor, i.e.@: the character you
+to erase the character before the cursor, i.e., the character you
 typed last.  It might be labeled @samp{Backspace} or @samp{<-} or
 @samp{DEL}, or sometimes @samp{Delete}.} and @kbd{b} commands exist to
 allow you to ``move around'' in a node that does not all fit on the
@@ -1504,6 +1498,10 @@
 To check an Info file, do @kbd{M-x Info-validate} while looking at any
 node of the file with Emacs Info mode.
 
+@node GNU Free Documentation License
+@appendix GNU Free Documentation License
+@include doclicense.texi
+
 @node Index
 @unnumbered Index
 

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

bug#13965: info.info conflict between emacs and texinfo

[Karl Berry]

    No, you don't.

Evidently I messed up for texinfo 5.1.  Sorry.  Shoot me.

    +@include doclicense.texi

How about naming the file fdl.texi, like virtually every other package does?

k

bug#13965: info.info conflict between emacs and texinfo

[Petr Hracek]

thank you for that patch.
Does it mean that info.texi will be delivered by Emacs instead of texlive?
At the begging of that "bug" was mentioned that info.texi should be part 
of texlive.

I am little bit confused what is final solution.

 From last messages of that thread is seen that info.texi will be part 
of emacs package definitelly, right?

S pozdravem / Best regards

Petr Hracek

On 04/01/2013 09:11 AM, Andreas Schwab wrote:
> karl@freefriends.org (Karl Berry) writes:
>
>> I know.  I keep them synced.
> No, you don't.
>
> --- texinfo-5.1/doc/info.texi	2013-02-19 23:25:28.000000000 +0100
> +++ emacs-24.3/doc/misc/info.texi	2013-01-01 21:37:17.000000000 +0100
> @@ -14,25 +14,18 @@
>   This file describes how to use Info, the on-line, menu-driven GNU
>   documentation system.
>   
> -Copyright @copyright{} 1989, 1992, 1996-2012 Free Software Foundation, Inc.
> +Copyright @copyright{} 1989, 1992, 1996--2013 Free Software Foundation, Inc.
>   
>   @quotation
>   Permission is granted to copy, distribute and/or modify this document
>   under the terms of the GNU Free Documentation License, Version 1.3 or
>   any later version published by the Free Software Foundation; with no
> -Invariant Sections, with the Front-Cover texts being ``A GNU
> -Manual,'' and with the Back-Cover Texts as in (a) below.  A copy of the
> -license is included in the section entitled ``GNU Free Documentation
> -License'' in the Emacs manual.
> +Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
> +and with the Back-Cover Texts as in (a) below.  A copy of the license
> +is included in the section entitled ``GNU Free Documentation License''.
>   
>   (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
> -modify this GNU manual.  Buying copies from the FSF supports it in
> -developing GNU and promoting software freedom.''
> -
> -This document is part of a collection distributed under the GNU Free
> -Documentation License.  If you want to distribute this document
> -separately from the collection, you can do so by adding a copy of the
> -license to the document, as described in section 6 of the license.
> +modify this GNU manual.''
>   @end quotation
>   @end copying
>   
> @@ -78,12 +71,13 @@
>   @end ifinfo
>   @end ifnottex
>   
> -@insertcopying
> +@insertcopying
>   
>   @menu
>   * Getting Started::             Getting started using an Info reader.
>   * Advanced::                    Advanced Info commands.
>   * Expert Info::                 Info commands for experts.
> +* GNU Free Documentation License::  The license for this documentation.
>   * Index::                       An index of topics, commands, and variables.
>   @end menu
>   
> @@ -264,7 +258,7 @@
>   
>   @format
>   >> If you are in Emacs and have a mouse, and if you already practiced
> -   typing @kbd{n} to get to the next node, click now with the left
> +   typing @kbd{n} to get to the next node, click now with the left
>      mouse button on the @samp{Next} link to do the same ``the mouse way''.
>   @end format
>   
> @@ -324,7 +318,7 @@
>   we call ``Backspace or DEL'' in this manual is labeled differently on
>   different keyboards.  Look for a key which is a little ways above the
>   @key{ENTER} or @key{RET} key and which you normally use outside Emacs
> -to erase the character before the cursor, i.e.@: the character you
> +to erase the character before the cursor, i.e., the character you
>   typed last.  It might be labeled @samp{Backspace} or @samp{<-} or
>   @samp{DEL}, or sometimes @samp{Delete}.} and @kbd{b} commands exist to
>   allow you to ``move around'' in a node that does not all fit on the
> @@ -1504,6 +1498,10 @@
>   To check an Info file, do @kbd{M-x Info-validate} while looking at any
>   node of the file with Emacs Info mode.
>   
> +@node GNU Free Documentation License
> +@appendix GNU Free Documentation License
> +@include doclicense.texi
> +
>   @node Index
>   @unnumbered Index
>   
>
> Andreas.
>

bug#13965: info.info conflict between emacs and texinfo

[Glenn Morris]

Petr Hracek wrote:

> Does it mean that info.texi will be delivered by Emacs instead of texlive?
> At the begging of that "bug" was mentioned that info.texi should be
> part of texlive.

Texinfo, not texlive.

> I am little bit confused what is final solution.
>
> From last messages of that thread is seen that info.texi will be part
> of emacs package definitelly, right?

My suggestion is that you just unconditionally remove info.info from the
files that the Emacs rpm installs. It makes sense for both upstreams to
have it, but if that causes problems for you, I think the better home
for it is the Texinfo rpm. Maybe make the Emacs rpm suggest Texinfo?
(Probably not worth bothering.)

bug#13965: info.info conflict between emacs and texinfo

[Petr Hracek]

you are right, texinfo.

emacs rpm package depends on texinfo and therefore info.info.gz page
will be removed from emacs package.

What about patch which delivered Andreas?
info.texi was removed from texinfo-5.1?

--- texinfo-5.1/doc/info.texi	2013-02-19 23:25:28.000000000 +0100
+++ emacs-24.3/doc/misc/info.texi	2013-01-01 21:37:17.000000000 +0100

I think that there will be inconsistency.
I think that info.texi should be part of texinfo, right?
@Andreas: did you apply that patch on emacs trunk?
Cool and thanks:)

S pozdravem / Best regards

Petr Hracek

On 04/02/2013 06:16 PM, Glenn Morris wrote:
> Petr Hracek wrote:
>
>> Does it mean that info.texi will be delivered by Emacs instead of texlive?
>> At the begging of that "bug" was mentioned that info.texi should be
>> part of texlive.
> Texinfo, not texlive.
>
>> I am little bit confused what is final solution.
>>
>>  From last messages of that thread is seen that info.texi will be part
>> of emacs package definitelly, right?
> My suggestion is that you just unconditionally remove info.info from the
> files that the Emacs rpm installs. It makes sense for both upstreams to
> have it, but if that causes problems for you, I think the better home
> for it is the Texinfo rpm. Maybe make the Emacs rpm suggest Texinfo?
> (Probably not worth bothering.)

bug#13965: info.info conflict between emacs and texinfo

[Karl Berry]

    If it really helps you, we could rename it. 

Well, obviously it is not a stopper.  I can edit the file when I import
it and ignore that difference.

    We'll have to change 58 files, several of which also live in other
    repositories.

The point is that nearly every other package in GNU uses fdl.texi (as
far as I have seen).  Why should Emacs use a different name for the
file?  It just seems wrong.

    It won't make any difference to this issue (I assume), 

Indeed.

k