branch master updated: Move DebugTree.pm to the main Texinfo modules directory

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new b0f7456ca8 Move DebugTree.pm to the main Texinfo modules directory
b0f7456ca8 is described below

commit b0f7456ca85f61f60b6623d5cf8d756aee47d9ed
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Oct 22 20:04:25 2023 +0200

    Move DebugTree.pm to the main Texinfo modules directory
    
    * tp/Texinfo/DebugTree.pm, tp/texi2any.pl (%formats_table),
    tp/Makefile.am b/tp/Makefile.am (dist_modules_DATA): move
    DebugTexinfo/DebugTree.pm to Texinfo/.
---
 ChangeLog                                 | 8 ++++++++
 po/POTFILES.in                            | 2 +-
 tp/Makefile.am                            | 5 +----
 tp/{DebugTexinfo => Texinfo}/DebugTree.pm | 2 +-
 tp/t/index_before_item.t                  | 4 ++--
 tp/texi2any.pl                            | 2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a465a6181..68d6b108d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-10-22  Patrice Dumas  <pertusus@free.fr>
+
+       Move DebugTree.pm to the main Texinfo modules directory
+
+       * tp/Texinfo/DebugTree.pm, tp/texi2any.pl (%formats_table),
+       tp/Makefile.am b/tp/Makefile.am (dist_modules_DATA): move
+       DebugTexinfo/DebugTree.pm to Texinfo/.
+
 2023-10-22  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Makefile.tres: update.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c9f9eb9c00..759f647ccb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -32,9 +32,9 @@ info/variables.c
 info/window.c
 install-info/install-info.c
 Pod-Simple-Texinfo/pod2texi.pl
-tp/DebugTexinfo/DebugTree.pm
 tp/Texinfo/Common.pm
 tp/Texinfo/Config.pm
+tp/Texinfo/DebugTree.pm
 tp/Texinfo/Document.pm
 tp/Texinfo/Convert/Converter.pm
 tp/Texinfo/Convert/DocBook.pm
diff --git a/tp/Makefile.am b/tp/Makefile.am
index f12102161a..a294ea2b9c 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -67,6 +67,7 @@ dist_modules_DATA = \
  Texinfo/Config.pm \
  Texinfo/Common.pm \
  Texinfo/Commands.pod \
+ Texinfo/DebugTree.pm \
  Texinfo/Document.pm \
  Texinfo/Documentlanguages.pm \
  Texinfo/MiscXS.pm \
@@ -112,10 +113,6 @@ dist_converters_DATA = \
  Texinfo/Convert/Unicode.pm \
  Texinfo/Convert/Utils.pm
 
-debugmodulesdir = $(pkgdatadir)/DebugTexinfo
-dist_debugmodules_DATA = \
- DebugTexinfo/DebugTree.pm
-
 # extensions used in main program
 extensionsdir = $(datadir)/texinfo/ext
 dist_extensions_DATA = \
diff --git a/tp/DebugTexinfo/DebugTree.pm b/tp/Texinfo/DebugTree.pm
similarity index 99%
rename from tp/DebugTexinfo/DebugTree.pm
rename to tp/Texinfo/DebugTree.pm
index 9762dc394f..df50b8ef58 100644
--- a/tp/DebugTexinfo/DebugTree.pm
+++ b/tp/Texinfo/DebugTree.pm
@@ -27,7 +27,7 @@
 
 use strict;
 
-package DebugTexinfo::DebugTree;
+package Texinfo::DebugTree;
 
 # also for __(
 use Texinfo::Common;
diff --git a/tp/t/index_before_item.t b/tp/t/index_before_item.t
index 8c000e364f..5ae609cee7 100644
--- a/tp/t/index_before_item.t
+++ b/tp/t/index_before_item.t
@@ -10,7 +10,7 @@ BEGIN { plan tests => 6; }
 use Texinfo::Parser qw(parse_texi_piece);
 use Texinfo::Common qw(move_index_entries_after_items_in_tree);
 use Texinfo::Convert::Texinfo;
-use DebugTexinfo::DebugTree;
+use Texinfo::DebugTree;
 
 ok(1);
 
@@ -23,7 +23,7 @@ sub run_test($$$)
   my $document = parse_texi_piece(undef, $in);
   my $tree = $document->tree();
 
-#print STDERR DebugTexinfo::DebugTree::convert_tree(undef, $tree)."\n";
+  #print STDERR Texinfo::DebugTree::convert_tree(undef, $tree)."\n";
 
   move_index_entries_after_items_in_tree($tree);
   my $texi_result = Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index cea93e70cb..d3deaf95e1 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -665,7 +665,7 @@ my %formats_table = (
            },
   'debugtree' => {
           'split' => 1,
-          'module' => 'DebugTexinfo::DebugTree'
+          'module' => 'Texinfo::DebugTree'
          },
   'textcontent' => {
             'module' => 'Texinfo::Convert::TextContent'