[xml/sgml-commit] [SCM] linuxdoc-tools package for Debian. branch, experimental, updated. debian/0.9.56-3-g5e12f87

[Agustin Martin Domingo]

The following commit has been merged in the experimental branch:
commit 5e12f8776b6a7d1f8f9c6531efca43eba69543df
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Tue Jul 15 21:14:53 2008 +0200

    Move perl modules to perl5lib. Allow easier installation under /usr/share/perl5.
    
    * Reorganize perl modules by putting them under a perl5lib subdir. Improve
      installation so they are installed in the same place as before unless
      otherwise stated, but install under /usr/share/perl5 for Debian. Modify
      Makefile.in to properly deal with the above.
    * Fix LinuxDocTools.pm permissions.
    * Fix doc/Makedoc.sh to use the above location.
    * No need to play with LinuxDocTools.pm in debian/rules. We already try Debian
      sgml-data site first when looking for sgml entities.

diff --git a/Makefile.in b/Makefile.in
index 3eeacce..1d17b2f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,12 +8,14 @@ prefix      = @prefix@
 exec_prefix = @exec_prefix@
 bindir      = @bindir@
 datadir     = @datadir@
+mandir      = @mandir@
+PERL        = @PERL@
+
 pkgdatadir  = $(datadir)/linuxdoc-tools
 LINUXDOCDOC = $(prefix)/share/doc/linuxdoc-tools
-mandir      = @mandir@
 mandir1     = $(mandir)/man1
 texdir      = $(pkgdatadir)
-PERL        = @PERL@
+perl5libdir = $(pkgdatadir)
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
@@ -130,6 +132,11 @@ endif
 	find $(LINUXDOCDOC) -type d -print | xargs chmod 755
 	find $(LINUXDOCDOC) -type f -print | xargs chmod 644
 
+#    -- Install perl modules
+	mkdir -p $(perl5libdir)/LinuxDocTools
+	$(INSTALL_DATA) perl5lib/LinuxDocTools.pm   $(perl5libdir)
+	$(INSTALL_DATA) perl5lib/LinuxDocTools/*.pm $(perl5libdir)/LinuxDocTools
+
 #    -- Install tex stuff
 	mkdir -p $(texdir)
 	$(INSTALL_DATA) tex/* $(texdir)
diff --git a/debian/rules b/debian/rules
index 9b9bc37..e1ef4a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,11 +49,6 @@ build-stamp:
 	    -e "s:/usr/bin/[gm]awk:/usr/share/linuxdoc-tools/awkwhich:" \
 	   bin/linuxdoc > linuxdoc.new;
 
-# --- Rewrite to use iso-entities from debian sgml-data package
-
-	sed -e "s:prefix/share/sgml/iso-entities-8879.1986/iso-entities.cat:prefix/share/sgml/entities/sgml-iso-entities-8879.1986/catalog:" \
-           lib/LinuxDocTools.pm > LinuxDocTools.pm.new;
-
 	$(build_ldt_copyright)
 
 	for i in text latex info; do \
@@ -101,8 +96,6 @@ install: build
 	install -m 755 debian/addition/awkwhich \
 	  debian/tmp/usr/share/linuxdoc-tools/awkwhich;
 	install -m 755 linuxdoc.new debian/tmp/usr/bin/linuxdoc
-	install -m 0644 LinuxDocTools.pm.new \
-	        debian/tmp/usr/share/linuxdoc-tools/LinuxDocTools.pm
 # ---
 	cat debian/linuxdoc-tools.info-base doc/guide.info > doc/linuxdoc-sgml.info
 	dh_installinfo doc/linuxdoc-sgml.info
diff --git a/doc/Makedoc.sh b/doc/Makedoc.sh
index 1f16189..b3be731 100644
--- a/doc/Makedoc.sh
+++ b/doc/Makedoc.sh
@@ -18,6 +18,7 @@ trap 'abort' 1 2 3 6 9 15
 # export DATADIR=${DATADIR}
 export PKGDATADIR=${DATADIR}/linuxdoc-tools
 export PERL5LIB=${DATADIR}/linuxdoc-tools:${TMPDIR}
+export PERL5LIB=../perl5lib:${TMPDIR}
 
 mkdir $TMPDIR/Text
 
diff --git a/lib/LinuxDocTools.pm b/perl5lib/LinuxDocTools.pm
old mode 100755
new mode 100644
similarity index 100%
rename from lib/LinuxDocTools.pm
rename to perl5lib/LinuxDocTools.pm
diff --git a/lib/LinuxDocTools/BackEnd.pm b/perl5lib/LinuxDocTools/BackEnd.pm
similarity index 100%
rename from lib/LinuxDocTools/BackEnd.pm
rename to perl5lib/LinuxDocTools/BackEnd.pm
diff --git a/lib/LinuxDocTools/CharEnts.pm b/perl5lib/LinuxDocTools/CharEnts.pm
similarity index 100%
rename from lib/LinuxDocTools/CharEnts.pm
rename to perl5lib/LinuxDocTools/CharEnts.pm
diff --git a/lib/LinuxDocTools/FixRef.pm b/perl5lib/LinuxDocTools/FixRef.pm
similarity index 100%
rename from lib/LinuxDocTools/FixRef.pm
rename to perl5lib/LinuxDocTools/FixRef.pm
diff --git a/lib/LinuxDocTools/Html2Html.pm b/perl5lib/LinuxDocTools/Html2Html.pm
similarity index 100%
rename from lib/LinuxDocTools/Html2Html.pm
rename to perl5lib/LinuxDocTools/Html2Html.pm
diff --git a/lib/LinuxDocTools/Lang.pm b/perl5lib/LinuxDocTools/Lang.pm
similarity index 100%
rename from lib/LinuxDocTools/Lang.pm
rename to perl5lib/LinuxDocTools/Lang.pm
diff --git a/lib/LinuxDocTools/Utils.pm b/perl5lib/LinuxDocTools/Utils.pm
similarity index 100%
rename from lib/LinuxDocTools/Utils.pm
rename to perl5lib/LinuxDocTools/Utils.pm
diff --git a/lib/LinuxDocTools/Vars.pm b/perl5lib/LinuxDocTools/Vars.pm
similarity index 100%
rename from lib/LinuxDocTools/Vars.pm
rename to perl5lib/LinuxDocTools/Vars.pm

-- 
linuxdoc-tools package for Debian.