[xml/sgml-commit] [linuxdoc-tools] 11/16: perl: adjust default 'sgmlcatalogs' value

[Agustín Martín Domingo]

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

agmartin pushed a commit to branch upstream
in repository linuxdoc-tools.

commit 2712834113e030dc338de424506cc488dfe25c16
Author: Ilya Tumaykin <itumaykin at gmail.com>
Date:   Mon Oct 12 23:18:01 2015 +0300

    perl: adjust default 'sgmlcatalogs' value
    
    Add "$main::isoentities_prefix/share/sgml/sgml-iso-entities-8879.1986/catalog".
    
    This is basically "/usr/share/sgml/sgml-iso-entities-8879.1986/catalog".
    This path is used for SGML iso-entities at least in ArchLinux[0],
    Fedora[1] and Gentoo[2].
    
    Replace "/etc/sgml.catalog" with "/etc/sgml/catalog".
    
    This path is used for SGML Root Catalog in many distributions, including
    Debian[3]. "/etc/sgml.catalog" is probably a typo.
    
    [0]: https://www.archlinux.org/packages/community/any/sgml-common/files/
    [1]: https://apps.fedoraproject.org/packages/sgml-common/contents/
    [2]: http://www.portagefilelist.de/site/query/listPackageFiles/?category=app-text&package=sgml-common&version=0.6.3-r5&do#result
    [3]: https://debian-xml-sgml.alioth.debian.org/sgml-policy/sgml-catalogs.html#sgml-root-catalog
    
    Signed-off-by: Agustin Martin Domingo <agmartin at debian.org>
---
 perl5lib/LinuxDocTools.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/perl5lib/LinuxDocTools.pm b/perl5lib/LinuxDocTools.pm
index 06a4ce0..d642196 100644
--- a/perl5lib/LinuxDocTools.pm
+++ b/perl5lib/LinuxDocTools.pm
@@ -414,12 +414,13 @@ sub process_options {
   # Normalize language string
   $global->{language} = Any2ISO($global->{language});
 
-  # Setup the SGML environment.`iso-entites' sub directory will be removed for Debian package
-  # and entities from Debian sgml-data package used if present (first entry below).
-  my @sgmlcatalogs = ( "$main::isoentities_prefix/share/sgml/entities/sgml-iso-entities-8879.1986/catalog",
-		       "$main::isoentities_prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat",
-		       "$main::DataDir/linuxdoc-tools.catalog",
-		       "/etc/sgml.catalog");
+  # Setup the SGML environment.
+  my @sgmlcatalogs =
+    ("$main::isoentities_prefix/share/sgml/entities/sgml-iso-entities-8879.1986/catalog",
+     "$main::isoentities_prefix/share/sgml/sgml-iso-entities-8879.1986/catalog",
+     "$main::isoentities_prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat",
+     "$main::DataDir/linuxdoc-tools.catalog",
+     "/etc/sgml/catalog");
 
   @sgmlcatalogs = ($ENV{SGML_CATALOG_FILES}, @sgmlcatalogs) if defined $ENV{SGML_CATALOG_FILES};
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/linuxdoc-tools.git