texinfo Makefile.am configure.ac ChangeLog Pod-...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/01/19 20:38:11

Modified files:
        .              : Makefile.am configure.ac ChangeLog 
        Pod-Simple-Texinfo: Makefile.PL pod2texi.pl 
        Pod-Simple-Texinfo/lib/Pod/Simple: Texinfo.pm 
Added files:
        Pod-Simple-Texinfo: .cvsignore Makefile.am 

Log message:
                * configure.ac, Makefile.am (SUBDIRS), Pod-Simple-Texinfo: add a
                pod to texinfo converter.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/Makefile.am?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1312&r2=1.1313
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/Makefile.PL?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/pod2texi.pl?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/.cvsignore?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/Makefile.am?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm?cvsroot=texinfo&r1=1.1&r2=1.2

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- Makefile.am 21 Oct 2011 18:42:34 -0000      1.33
+++ Makefile.am 19 Jan 2012 20:38:10 -0000      1.34
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.33 2011/10/21 18:42:34 karl Exp $
+# $Id: Makefile.am,v 1.34 2012/01/19 20:38:10 pertusus Exp $
 # Makefile.am for texinfo.
 # Process this file with automake to produce Makefile.in in all directories.
 #
@@ -34,7 +34,7 @@
   # Do doc and man last so makeinfo will be built when we get there.
   # Others are alphabetical.
   SUBDIRS = $(native_tools) gnulib/lib lib \
-            install-info info po po_document tp util \
+            install-info info po po_document tp Pod-Simple-Texinfo util \
            doc man
 endif
 

Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- configure.ac        14 Jan 2012 18:57:28 -0000      1.110
+++ configure.ac        19 Jan 2012 20:38:10 -0000      1.111
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.110 2012/01/14 18:57:28 pertusus Exp $
+# $Id: configure.ac,v 1.111 2012/01/19 20:38:10 pertusus Exp $
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -332,6 +332,7 @@
   tp/tests/encodings/Makefile
   tp/tests/layout/Makefile
   tp/tests/path_separator
+  Pod-Simple-Texinfo/Makefile
 ])
 
 AC_OUTPUT

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1312
retrieving revision 1.1313
diff -u -b -r1.1312 -r1.1313
--- ChangeLog   19 Jan 2012 01:41:17 -0000      1.1312
+++ ChangeLog   19 Jan 2012 20:38:10 -0000      1.1313
@@ -1,3 +1,8 @@
+2012-01-18  Patrice Dumas  <address@hidden>
+
+       * configure.ac, Makefile.am (SUBDIRS), Pod-Simple-Texinfo: add a
+       pod to texinfo converter.
+
 2012-01-18  Karl Berry  <address@hidden>
 
        * doc/texinfo.txi (Configuration Variables for Program Behavior):

Index: Pod-Simple-Texinfo/Makefile.PL
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/Makefile.PL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Pod-Simple-Texinfo/Makefile.PL      19 Jan 2012 20:03:12 -0000      1.1
+++ Pod-Simple-Texinfo/Makefile.PL      19 Jan 2012 20:38:11 -0000      1.2
@@ -5,7 +5,7 @@
 WriteMakefile(
     NAME              => 'Pod::Simple::Texinfo',
     VERSION_FROM      => 'lib/Pod/Simple/Texinfo.pm', # finds $VERSION
-    EXE_FILES         => [ 'pod2texi' ],
+    EXE_FILES         => [ 'pod2texi.pl' ],
     PREREQ_PM         => { "Pod::Simple::PullParser" => 0,
                            "Texinfo::Parser" => 0,
                            "Getopt::Long" => 0 }, # e.g., Module::Name => 1.1

Index: Pod-Simple-Texinfo/pod2texi.pl
===================================================================
RCS file: /sources/texinfo/texinfo/Pod-Simple-Texinfo/pod2texi.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Pod-Simple-Texinfo/pod2texi.pl      19 Jan 2012 20:09:22 -0000      1.1
+++ Pod-Simple-Texinfo/pod2texi.pl      19 Jan 2012 20:38:11 -0000      1.2
@@ -1,5 +1,24 @@
 #! /usr/bin/perl -w
 
+# pod2texi: Convert Pod to Texinfo
+#
+# Copyright 2012 Free Software Foundation, Inc.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+# Original author: Patrice Dumas <address@hidden>
+
 use strict;
 use Pod::Simple::Texinfo;
 
@@ -7,6 +26,14 @@
 
 Getopt::Long::Configure("gnu_getopt");
 
+BEGIN
+{
+  my $texinfolibdir = '@datadir@/Pod-Simple-Texinfo';
+  unshift @INC, ($texinfolibdir)
+    if ($texinfolibdir ne ''
+        and $texinfolibdir ne '@' .'datadir@/Pod-Simple-Texinfo');
+}
+
 {
 # A fake package to be able to use Pod::Simple::PullParser without generating
 # any output.
@@ -48,12 +75,10 @@
 my $result_options = Getopt::Long::GetOptions (
   'help|h' => sub { print pod2texi_help(); exit 0; },
   'version|V' => sub {print "$real_command_name 
$Pod::Simple::Texinfo::VERSION\n\n";
-    printf __("Copyright (C) %s Patrice Dumas
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
-This program is distributed in the hope that it will be useful, but
-without any warranty; without even the implied warranty of
-merchantability or fitness for a particular purpose.\n"), '2011';
+    printf __("Copyright (C) %s Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.\n"), '2012';
       exit 0;},
   'base-level=i' => \$base_level,
   'unnumbered-sections!' => \$unnumbered_sections,
@@ -210,14 +235,14 @@
 
 =head1 COPYRIGHT
 
-Copyright (C) 2011 Patrice Dumas
+Copyright (C) 2012 Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License,
+or (at your option) any later version.
 
-This program is distributed in the hope that it will be useful, but
-without any warranty; without even the implied warranty of
-merchantability or fitness for a particular purpose.
+There is NO WARRANTY, to the extent permitted by law.
 
 =head1 AUTHOR
 

Index: Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm
===================================================================
RCS file: 
/sources/texinfo/texinfo/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm        19 Jan 2012 20:03:12 
-0000      1.1
+++ Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm        19 Jan 2012 20:38:11 
-0000      1.2
@@ -1,5 +1,23 @@
-# See informations on this perl module at the end of the file, in the pod
-# section.
+# Texinfo.pm: format Pod as Texinfo.
+#
+# Copyright 2011, 2012 Free Software Foundation, Inc.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+# Original author: Patrice Dumas <address@hidden>
+# Parts from L<Pod::Simple::HTML>.
+
 
 package Pod::Simple::Texinfo;
 
@@ -606,14 +624,12 @@
 
 =head1 COPYRIGHT
 
-Copyright (C) 2011 Patrice Dumas
-
-This library is free software; you can redistribute it and/or modify it
-under the same terms as Perl itself.
+Copyright (C) 2011, 2012 Free Software Foundation, Inc.
 
-This program is distributed in the hope that it will be useful, but
-without any warranty; without even the implied warranty of
-merchantability or fitness for a particular purpose.
+This library is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License,
+or (at your option) any later version.
 
 C<_url_escape> is C<general_url_escape> from L<Pod::Simple::HTML>.
 

Index: Pod-Simple-Texinfo/.cvsignore
===================================================================
RCS file: Pod-Simple-Texinfo/.cvsignore
diff -N Pod-Simple-Texinfo/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ Pod-Simple-Texinfo/.cvsignore       19 Jan 2012 20:38:10 -0000      1.1
@@ -0,0 +1,3 @@
+Makefile.in
+Makefile
+pod2texi

Index: Pod-Simple-Texinfo/Makefile.am
===================================================================
RCS file: Pod-Simple-Texinfo/Makefile.am
diff -N Pod-Simple-Texinfo/Makefile.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ Pod-Simple-Texinfo/Makefile.am      19 Jan 2012 20:38:11 -0000      1.1
@@ -0,0 +1,16 @@
+bin_SCRIPTS = pod2texi
+
+EXTRA_DIST = Changes \
+ Makefile.PL \
+ MANIFEST \
+ t/Pod-Simple-Texinfo.t 
+
+modulesdir = $(pkgdatadir)/Pod-Simple-Texinfo/Pod/Simple/
+
+dist_modules_DATA = \
+ lib/Pod/Simple/Texinfo.pm
+
+pod2texi: pod2texi.pl
+       sed -e 's,address@hidden@],$(datadir),g' $(srcdir)/$< >$@
+       chmod a+x $@
+