[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2012.20121125-1-3-g3ce6b3b
The following commit has been merged in the master branch:
commit 330d23319260ae3b176496ef6e241cf86fa0525d
Author: Norbert Preining <preining@debian.org>
Date: Wed Nov 28 13:17:26 2012 +0900
rationalize docfiles treatment
- no special location, simply in TEXMF/doc according to tree
- no links in /u/s/d/texlive-doc
- no links in /u/s/d/$package
diff --git a/all/debian/create-doc-links b/all/debian/create-doc-links
deleted file mode 100644
index 0a39923..0000000
--- a/all/debian/create-doc-links
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# create-doc-links
-#
-# (c) 2006 Norbert Preining
-#
-# create links from every file under /usr/share/doc/$1/ to
-# /usr/share/doc/$2/
-#
-
-pref="./debian/$1"
-src="usr/share/doc/$1"
-dst="usr/share/doc/$2"
-
-mkdir -p "$dst"
-
-for f in $(cd "$pref/$src"; find . -mindepth 2 -type f) ; do
- g=$(echo $f | cut -b 3-)
- echo "$src/$g" "$dst/$g"
-done
-
-
diff --git a/all/debian/rules.in b/all/debian/rules.in
index d594a35..254c7a7 100755
--- a/all/debian/rules.in
+++ b/all/debian/rules.in
@@ -44,7 +44,6 @@ install-stamp: build-stamp
install -D --mode=644 debian/$$i.override debian/$$i/usr/share/lintian/overrides/$$i ; \
install -D --mode=755 debian/bug.script debian/$$i/usr/share/bug/$$i/script ; \
install -D --mode=644 debian/bug.control debian/$$i/usr/share/bug/$$i/control ; \
- bash debian/create-doc-links $$i texlive-doc > debian/$$i.links ; \
if [ -r debian/$$i.links.dist ] ; then cat debian/$$i.links.dist >> debian/$$i.links ; fi ; \
if [ -r debian/$$i.README ] ; then cat debian/$$i.README > debian/$$i.README.Debian ; fi ; \
cat debian/README.Debian >> debian/$$i.README.Debian ; \
diff --git a/all/debian/tpm2deb-bin.pl b/all/debian/tpm2deb-bin.pl
index 54d2187..ce25c7b 100755
--- a/all/debian/tpm2deb-bin.pl
+++ b/all/debian/tpm2deb-bin.pl
@@ -198,11 +198,9 @@ sub make_deb_copy_to_rightplace {
my $finalfn = do_remap_and_copy($package,$file,$runcomponent);
do_special($file,$finalfn);
}
-# my %DocDirHash = ();
-# my @LinkedDocDir = ();
DODFILE: foreach my $file (@{$lists{'DocFiles'}}) {
next DODFILE if tl_is_blacklisted($file);
- my $finalfn = do_remap_and_copy($package,$file,$runcomponent,'^[^/]*/doc/(.*)$','$doccomponent/$1');
+ my $finalfn = do_remap_and_copy($package,$file,$runcomponent);
do_special($file,$finalfn);
}
# simply ignore binfiles as we have to add the necessary deps
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index 4393d4a..1e6cb83 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -736,11 +736,6 @@ blacklist;file;texmf-dist/doc/latex/mathpazo/mapfplm.tex
blacklist;file;texmf-dist/doc/latex/mathpazo/mapppl.tex
blacklist;file;texmf-dist/doc/latex/mathpazo/mapzplm.tex
#
-# MUST COME AFTER OTHER mappings, ORDER IS IMPORTANT FIRST HIT FIRST SERVE!
-# would be not necessary, is done in the fallback remapping in tpm2deb.pl, but
-# indeed necessary otherwise the config remap below hits config in doc files!
-mapping;texmf[^/]*/doc/(.*);move;$doccomponent/$1
-#
#
# REMOVAL OF CONFIG FILES
#
--
Debian packaging of texlive-nonbin)
Reply to: