[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/all-2012.20130111-1-11-g8228371
The following commit has been merged in the master branch:
commit 82283710526cc7e91a06bb67d7359fc3829ebfb1
Author: Norbert Preining <preining@debian.org>
Date: Tue May 7 15:37:00 2013 +0900
prepare for TL2013 - texmf-dist merge
TL2013 merges all the trees into texmf-dist
diff --git a/all/debian/cfg.d/debian-replacement.cfg b/all/debian/cfg.d/debian-replacement.cfg
index 9fc8b18..82fdf5f 100644
--- a/all/debian/cfg.d/debian-replacement.cfg
+++ b/all/debian/cfg.d/debian-replacement.cfg
@@ -24,9 +24,9 @@ recommends;texlive-latex-recommended;latex-xcolor (>= 2.09)
# luatex
# blacklist docs
kill;texmf-dist/doc/luatex/base/.*
-kill;texmf/doc/man/man1/luatex\..*
-kill;texmf/doc/man/man1/texlua\..*
-kill;texmf/doc/man/man1/texluac\..*
+kill;texmf-dist/doc/man/man1/luatex\..*
+kill;texmf-dist/doc/man/man1/texlua\..*
+kill;texmf-dist/doc/man/man1/texluac\..*
#
# dvipdfmx in Debian
provides;texlive-base;dvipdfmx
diff --git a/all/debian/cfg.d/info-man-handling.cfg b/all/debian/cfg.d/info-man-handling.cfg
index 42863f9..4db9183 100644
--- a/all/debian/cfg.d/info-man-handling.cfg
+++ b/all/debian/cfg.d/info-man-handling.cfg
@@ -3,117 +3,117 @@
# ignore does not install the file normally, but runs the special actions
# kill does not even run the special action, it is the blacklist of the bin-building
#
-ignore;texmf[^/]*/doc/info/(.*)\.info;;
-special;texmf[^/]*/doc/info/([^/]*\.info);install-info;
-ignore;texmf/doc/info/dir;;
+ignore;texmf-dist/doc/info/(.*)\.info;;
+special;texmf-dist/doc/info/([^/]*\.info);install-info;
+ignore;texmf-dist/doc/info/dir;;
#
# man page handling has to be fixed ... it is a pain ;-)
-ignore;texmf[^/]*/doc/man/man(.*)/(.*).pdf
+ignore;texmf-dist/doc/man/man(.*)/(.*).pdf
# disable man pages that are in texlive-binaries
# generated by unpacking a texlive-binaries packages and reading the
# files there
-kill;texmf[^/]*/doc/man/man1/afm2pl.1
-kill;texmf[^/]*/doc/man/man1/afm2tfm.1
-kill;texmf[^/]*/doc/man/man1/aleph.1
-kill;texmf[^/]*/doc/man/man1/bibtex8.1
-kill;texmf[^/]*/doc/man/man1/bibtex.1
-kill;texmf[^/]*/doc/man/man1/ctangle.1
-kill;texmf[^/]*/doc/man/man1/ctie.1
-kill;texmf[^/]*/doc/man/man1/cweave.1
-kill;texmf[^/]*/doc/man/man1/cweb.1
-kill;texmf[^/]*/doc/man/man1/detex.1
-kill;texmf[^/]*/doc/man/man1/devnag.1
-kill;texmf[^/]*/doc/man/man1/disdvi.1
-kill;texmf[^/]*/doc/man/man1/dt2dv.1
-kill;texmf[^/]*/doc/man/man1/dv2dt.1
-kill;texmf[^/]*/doc/man/man1/dvi2tty.1
-kill;texmf[^/]*/doc/man/man1/dvibook.1
-kill;texmf[^/]*/doc/man/man1/dviconcat.1
-kill;texmf[^/]*/doc/man/man1/dvicopy.1
-kill;texmf[^/]*/doc/man/man1/dvihp.1
-kill;texmf[^/]*/doc/man/man1/dvilj.1
-kill;texmf[^/]*/doc/man/man1/dvilj2p.1
-kill;texmf[^/]*/doc/man/man1/dvilj4.1
-kill;texmf[^/]*/doc/man/man1/dvilj4l.1
-kill;texmf[^/]*/doc/man/man1/dvilj6.1
-kill;texmf[^/]*/doc/man/man1/dvipdfm.1
-kill;texmf[^/]*/doc/man/man1/dvipdft.1
-kill;texmf[^/]*/doc/man/man1/dvipos.1
-kill;texmf[^/]*/doc/man/man1/dvips.1
-kill;texmf[^/]*/doc/man/man1/dviselect.1
-kill;texmf[^/]*/doc/man/man1/dvisvgm.1
-kill;texmf[^/]*/doc/man/man1/dvitodvi.1
-kill;texmf[^/]*/doc/man/man1/dvitomp.1
-kill;texmf[^/]*/doc/man/man1/dvitype.1
-kill;texmf[^/]*/doc/man/man1/ebb.1
-kill;texmf[^/]*/doc/man/man1/etex.1
-kill;texmf[^/]*/doc/man/man1/extractbb.1
-kill;texmf[^/]*/doc/man/man1/gftodvi.1
-kill;texmf[^/]*/doc/man/man1/gftopk.1
-kill;texmf[^/]*/doc/man/man1/gftype.1
-kill;texmf[^/]*/doc/man/man1/gsftopk.1
-kill;texmf[^/]*/doc/man/man1/kpseaccess.1
-kill;texmf[^/]*/doc/man/man1/kpsereadlink.1
-kill;texmf[^/]*/doc/man/man1/kpsestat.1
-kill;texmf[^/]*/doc/man/man1/kpsewhich.1
-kill;texmf[^/]*/doc/man/man1/mag.1
-kill;texmf[^/]*/doc/man/man1/makeindex.1
-kill;texmf[^/]*/doc/man/man1/mendex.1
-kill;texmf[^/]*/doc/man/man1/mf.1
-kill;texmf[^/]*/doc/man/man1/mf-nowin.1
-kill;texmf[^/]*/doc/man/man1/mft.1
-kill;texmf[^/]*/doc/man/man1/mkindex.1
-kill;texmf[^/]*/doc/man/man1/mkocp.1
-kill;texmf[^/]*/doc/man/man1/mkofm.1
-kill;texmf[^/]*/doc/man/man1/mktexlsr.1
-kill;texmf[^/]*/doc/man/man1/mktexmf.1
-kill;texmf[^/]*/doc/man/man1/mktexpk.1
-kill;texmf[^/]*/doc/man/man1/mktextfm.1
-kill;texmf[^/]*/doc/man/man1/mpost.1
-kill;texmf[^/]*/doc/man/man1/odvicopy.1
-kill;texmf[^/]*/doc/man/man1/odvitype.1
-kill;texmf[^/]*/doc/man/man1/ofm2opl.1
-kill;texmf[^/]*/doc/man/man1/omfonts.1
-kill;texmf[^/]*/doc/man/man1/opl2ofm.1
-kill;texmf[^/]*/doc/man/man1/otangle.1
-kill;texmf[^/]*/doc/man/man1/otp2ocp.1
-kill;texmf[^/]*/doc/man/man1/outocp.1
-kill;texmf[^/]*/doc/man/man1/ovf2ovp.1
-kill;texmf[^/]*/doc/man/man1/ovp2ovf.1
-kill;texmf[^/]*/doc/man/man1/patgen.1
-kill;texmf[^/]*/doc/man/man1/pdfclose.1
-kill;texmf[^/]*/doc/man/man1/pdfetex.1
-kill;texmf[^/]*/doc/man/man1/pdfopen.1
-kill;texmf[^/]*/doc/man/man1/pdftex.1
-kill;texmf[^/]*/doc/man/man1/pdftosrc.1
-kill;texmf[^/]*/doc/man/man1/pfb2pfa.1
-kill;texmf[^/]*/doc/man/man1/pk2bm.1
-kill;texmf[^/]*/doc/man/man1/pktogf.1
-kill;texmf[^/]*/doc/man/man1/pktype.1
-kill;texmf[^/]*/doc/man/man1/pltotf.1
-kill;texmf[^/]*/doc/man/man1/pooltype.1
-kill;texmf[^/]*/doc/man/man1/ps2pk.1
-kill;texmf[^/]*/doc/man/man1/synctex.1
-kill;texmf[^/]*/doc/man/man1/tangle.1
-kill;texmf[^/]*/doc/man/man1/tex.1
-kill;texmf[^/]*/doc/man/man1/texconfig-dialog.1
-kill;texmf[^/]*/doc/man/man1/texhash.1
-kill;texmf[^/]*/doc/man/man1/tftopl.1
-kill;texmf[^/]*/doc/man/man1/tie.1
-kill;texmf[^/]*/doc/man/man1/tpic2pdftex.1
-kill;texmf[^/]*/doc/man/man1/ttf2afm.1
-kill;texmf[^/]*/doc/man/man1/ttf2pk.1
-kill;texmf[^/]*/doc/man/man1/ttf2tfm.1
-kill;texmf[^/]*/doc/man/man1/ttfdump.1
-kill;texmf[^/]*/doc/man/man1/vftovp.1
-kill;texmf[^/]*/doc/man/man1/vlna.1
-kill;texmf[^/]*/doc/man/man1/vptovf.1
-kill;texmf[^/]*/doc/man/man1/weave.1
-kill;texmf[^/]*/doc/man/man1/xdvi.1
-kill;texmf[^/]*/doc/man/man5/synctex.5
+kill;texmf-dist/doc/man/man1/afm2pl.1
+kill;texmf-dist/doc/man/man1/afm2tfm.1
+kill;texmf-dist/doc/man/man1/aleph.1
+kill;texmf-dist/doc/man/man1/bibtex8.1
+kill;texmf-dist/doc/man/man1/bibtex.1
+kill;texmf-dist/doc/man/man1/ctangle.1
+kill;texmf-dist/doc/man/man1/ctie.1
+kill;texmf-dist/doc/man/man1/cweave.1
+kill;texmf-dist/doc/man/man1/cweb.1
+kill;texmf-dist/doc/man/man1/detex.1
+kill;texmf-dist/doc/man/man1/devnag.1
+kill;texmf-dist/doc/man/man1/disdvi.1
+kill;texmf-dist/doc/man/man1/dt2dv.1
+kill;texmf-dist/doc/man/man1/dv2dt.1
+kill;texmf-dist/doc/man/man1/dvi2tty.1
+kill;texmf-dist/doc/man/man1/dvibook.1
+kill;texmf-dist/doc/man/man1/dviconcat.1
+kill;texmf-dist/doc/man/man1/dvicopy.1
+kill;texmf-dist/doc/man/man1/dvihp.1
+kill;texmf-dist/doc/man/man1/dvilj.1
+kill;texmf-dist/doc/man/man1/dvilj2p.1
+kill;texmf-dist/doc/man/man1/dvilj4.1
+kill;texmf-dist/doc/man/man1/dvilj4l.1
+kill;texmf-dist/doc/man/man1/dvilj6.1
+kill;texmf-dist/doc/man/man1/dvipdfm.1
+kill;texmf-dist/doc/man/man1/dvipdft.1
+kill;texmf-dist/doc/man/man1/dvipos.1
+kill;texmf-dist/doc/man/man1/dvips.1
+kill;texmf-dist/doc/man/man1/dviselect.1
+kill;texmf-dist/doc/man/man1/dvisvgm.1
+kill;texmf-dist/doc/man/man1/dvitodvi.1
+kill;texmf-dist/doc/man/man1/dvitomp.1
+kill;texmf-dist/doc/man/man1/dvitype.1
+kill;texmf-dist/doc/man/man1/ebb.1
+kill;texmf-dist/doc/man/man1/etex.1
+kill;texmf-dist/doc/man/man1/extractbb.1
+kill;texmf-dist/doc/man/man1/gftodvi.1
+kill;texmf-dist/doc/man/man1/gftopk.1
+kill;texmf-dist/doc/man/man1/gftype.1
+kill;texmf-dist/doc/man/man1/gsftopk.1
+kill;texmf-dist/doc/man/man1/kpseaccess.1
+kill;texmf-dist/doc/man/man1/kpsereadlink.1
+kill;texmf-dist/doc/man/man1/kpsestat.1
+kill;texmf-dist/doc/man/man1/kpsewhich.1
+kill;texmf-dist/doc/man/man1/mag.1
+kill;texmf-dist/doc/man/man1/makeindex.1
+kill;texmf-dist/doc/man/man1/mendex.1
+kill;texmf-dist/doc/man/man1/mf.1
+kill;texmf-dist/doc/man/man1/mf-nowin.1
+kill;texmf-dist/doc/man/man1/mft.1
+kill;texmf-dist/doc/man/man1/mkindex.1
+kill;texmf-dist/doc/man/man1/mkocp.1
+kill;texmf-dist/doc/man/man1/mkofm.1
+kill;texmf-dist/doc/man/man1/mktexlsr.1
+kill;texmf-dist/doc/man/man1/mktexmf.1
+kill;texmf-dist/doc/man/man1/mktexpk.1
+kill;texmf-dist/doc/man/man1/mktextfm.1
+kill;texmf-dist/doc/man/man1/mpost.1
+kill;texmf-dist/doc/man/man1/odvicopy.1
+kill;texmf-dist/doc/man/man1/odvitype.1
+kill;texmf-dist/doc/man/man1/ofm2opl.1
+kill;texmf-dist/doc/man/man1/omfonts.1
+kill;texmf-dist/doc/man/man1/opl2ofm.1
+kill;texmf-dist/doc/man/man1/otangle.1
+kill;texmf-dist/doc/man/man1/otp2ocp.1
+kill;texmf-dist/doc/man/man1/outocp.1
+kill;texmf-dist/doc/man/man1/ovf2ovp.1
+kill;texmf-dist/doc/man/man1/ovp2ovf.1
+kill;texmf-dist/doc/man/man1/patgen.1
+kill;texmf-dist/doc/man/man1/pdfclose.1
+kill;texmf-dist/doc/man/man1/pdfetex.1
+kill;texmf-dist/doc/man/man1/pdfopen.1
+kill;texmf-dist/doc/man/man1/pdftex.1
+kill;texmf-dist/doc/man/man1/pdftosrc.1
+kill;texmf-dist/doc/man/man1/pfb2pfa.1
+kill;texmf-dist/doc/man/man1/pk2bm.1
+kill;texmf-dist/doc/man/man1/pktogf.1
+kill;texmf-dist/doc/man/man1/pktype.1
+kill;texmf-dist/doc/man/man1/pltotf.1
+kill;texmf-dist/doc/man/man1/pooltype.1
+kill;texmf-dist/doc/man/man1/ps2pk.1
+kill;texmf-dist/doc/man/man1/synctex.1
+kill;texmf-dist/doc/man/man1/tangle.1
+kill;texmf-dist/doc/man/man1/tex.1
+kill;texmf-dist/doc/man/man1/texconfig-dialog.1
+kill;texmf-dist/doc/man/man1/texhash.1
+kill;texmf-dist/doc/man/man1/tftopl.1
+kill;texmf-dist/doc/man/man1/tie.1
+kill;texmf-dist/doc/man/man1/tpic2pdftex.1
+kill;texmf-dist/doc/man/man1/ttf2afm.1
+kill;texmf-dist/doc/man/man1/ttf2pk.1
+kill;texmf-dist/doc/man/man1/ttf2tfm.1
+kill;texmf-dist/doc/man/man1/ttfdump.1
+kill;texmf-dist/doc/man/man1/vftovp.1
+kill;texmf-dist/doc/man/man1/vlna.1
+kill;texmf-dist/doc/man/man1/vptovf.1
+kill;texmf-dist/doc/man/man1/weave.1
+kill;texmf-dist/doc/man/man1/xdvi.1
+kill;texmf-dist/doc/man/man5/synctex.5
# map all others into /usr/share/man/...
-ignore;texmf[^/]*/doc/man.*/(.*)
-special;texmf[^/]*/doc/man.*/(.*\.[0-9]);install-man;
+ignore;texmf-dist/doc/man.*/(.*)
+special;texmf-dist/doc/man.*/(.*\.[0-9]);install-man;
#
# vim:set fileencoding=utf-8: #
# Local Variables:
diff --git a/all/debian/cfg.d/remove-conffile.cfg b/all/debian/cfg.d/remove-conffile.cfg
index 21251fc..27ddaa1 100644
--- a/all/debian/cfg.d/remove-conffile.cfg
+++ b/all/debian/cfg.d/remove-conffile.cfg
@@ -1,3 +1,4 @@
+removeconffile;texlive-base;/etc/texmf/xdvi/xdvi.cfg
removeconffile;texlive-base;/etc/texmf/dvips/config/config.ps
removeconffile;texlive-base;/etc/texmf/tex/generic/config/pdftexconfig.tex
removeconffile;texlive-base;/etc/texmf/dvipdfmx/dvipdfmx.cfg
diff --git a/all/debian/rules.in b/all/debian/rules.in
index f71ffad..4be2c10 100755
--- a/all/debian/rules.in
+++ b/all/debian/rules.in
@@ -49,16 +49,6 @@ install-stamp: build-stamp
cat debian/README.Debian >> debian/$$i.README.Debian ; \
done
<: if ($srcpackage eq "texlive-base") { _:>//
- # do some clean up, we have to move three files into different directories
- mkdir -p debian/texlive-base/etc/texmf/dvipdfm/config
- mv debian/texlive-base/usr/share/texlive/texmf/dvipdfm/config/config \
- debian/texlive-base/etc/texmf/dvipdfm/config
- rmdir --ignore-fail-on-non-empty debian/texlive-base/usr/share/texlive/texmf/dvipdfm/config
- rmdir --ignore-fail-on-non-empty debian/texlive-base/usr/share/texlive/texmf/dvipdfm
- mkdir -p debian/texlive-base/etc/texmf/xdvi
- mv debian/texlive-base/usr/share/texlive/texmf/xdvi/xdvi.cfg \
- debian/texlive-base/etc/texmf/xdvi/xdvi.cfg
- rmdir --ignore-fail-on-non-empty debian/texlive-base/usr/share/texlive/texmf/xdvi
mkdir -p debian/texlive-base/etc/texmf/texdoctk
mv debian/texlive-base/usr/share/texlive/texmf-dist/texdoctk/texdocrc.defaults \
debian/texlive-base/etc/texmf/texdoctk
@@ -81,9 +71,20 @@ binary-indep: build install
dh_installdocs -A debian/README.source
<: if ($srcpackage eq "texlive-base") { _:>//
dh_installdocs -p texlive-common README readme-txt.dir readme-html.dir debian/CHANGES.packaging
+ # nasty trick
+ # mptopdf needs a dump, but is a link to a script
+ # we have to trick dh_installtex to accept it
+ mv debian/texlive-latex-base/usr/bin/mptopdf \
+ debian/texlive-latex-base/usr/bin/mptopdf.bck
+ ln -s pdftex debian/texlive-latex-base/usr/bin/mptopdf
dh_installtex -Ntexlive-base -A --priority=10 \
$(patsubst %,-N%,$(METAPACKAGES)) \
--flavor=lsr:full,tree:texlive
+ # nasty trick undoing
+ rm debian/texlive-latex-base/usr/bin/mptopdf
+ mv debian/texlive-latex-base/usr/bin/mptopdf.bck \
+ debian/texlive-latex-base/usr/bin/mptopdf
+ # end of nasty trick
dh_installtex -ptexlive-base --priority=10 \
--flavor=format:build_all,lsr:full,tree:texlive
# /usr/bin/mf has been created by dh_installtex as symlink to mf-nowin
diff --git a/all/debian/tpm2deb-bin.pl b/all/debian/tpm2deb-bin.pl
index 63e9e83..7098019 100755
--- a/all/debian/tpm2deb-bin.pl
+++ b/all/debian/tpm2deb-bin.pl
@@ -32,61 +32,26 @@ use TeXLive::TLPOBJ;
# use Data::Dumper;
-my $debdest;
my $basedir;
-my $bindest;
-my $bincomponent = "/usr/bin";
-my $rundest;
-my $runcomponent = "/usr/share/texlive";
-my $docdest;
-my $doccomponent;
-my $etcdest;
-my $tmpdir;
+my $debdest = "./debian";
-#
-# Configuration for destination of files
-# DONT USER DOUBLE QUOTES; THESE VARIABLES HAVE TO GET REEVALUATED
-# AFTER $tmpdir IS SET!!
-#
-my $sysdebdest = '$tmpdir/debian';
-my $sysbasedir = '$debdest/$package';
-my $sysbindest = '$basedir/usr/bin';
-my $sysbincomponent = '/usr/bin';
-my $sysrundest = '$basedir/usr/share/texlive';
-my $sysruncomponent = '/usr/share/texlive';
-my $sysdocdest = '$basedir/usr/share/doc/$package';
-my $sysdoccomponent = '/usr/share/doc/$package';
-my $sysetcdest = '$basedir/etc/texmf';
-
-my $texmfdist = "texmf-dist";
my $opt_nosource=0;
-my $optdestination="";
our $opt_onlyscripts=0;
my $opt_onlycopy=0;
our $opt_debug; #global variable
-my $opt_master;
our $Master;
my $globalreclevel=1;
my $result = GetOptions ("debug!" => \$opt_debug, # debug mode
"nosource!" => \$opt_nosource, # don't include source files
- "master=s" => \$opt_master, # location of Master
- "dest=s" => \$optdestination, # where to write files
- "reclevel=i" => \$globalreclevel, # recursion level
"onlyscripts!" => \$opt_onlyscripts, # only create maintainer scripts
"onlycopy!" => \$opt_onlycopy # no maintscripts, only copy files
);
-# Norbert, is $, intended here, or should it rather be m{/.*$}?
-if (!($opt_master =~ m,/.*$,,)) {
- $Master = `pwd`;
- chomp($Master);
- $Master .= "/$opt_master";
-} else {
- $Master = $opt_master;
-}
+$Master = `pwd`;
+chomp($Master);
my $startdir=getcwd();
chdir($startdir);
@@ -123,7 +88,7 @@ sub main {
print "Working on $package\n";
# determine variables used in all subsequent functions
$opt_debug && print STDERR "Setting global vars\n";
- tl_set_global_vars($package);
+ $basedir = "./debian/$package";
#
# copy files etc.
#
@@ -131,38 +96,7 @@ sub main {
#
# create the maintainer scripts
#
- make_maintainer($package,$debdest) unless ($opt_onlycopy);
- }
-}
-
-#
-# set global variables
-#
-sub tl_set_global_vars {
- my ($package) = @_;
- my $helper;
- if ($optdestination ne "") {
- $tmpdir = $optdestination;
- } else {
- $tmpdir = ".";
- }
- $opt_debug && print STDERR "tmpdir = $tmpdir\n";
- $helper="\$debdest = \"$sysdebdest\""; eval $helper;
- $helper="\$basedir = \"$sysbasedir\""; eval $helper;
- $helper="\$bindest = \"$sysbindest\""; eval $helper;
- $helper="\$rundest = \"$sysrundest\""; eval $helper;
- $helper="\$docdest = \"$sysdocdest\""; eval $helper;
- $helper="\$doccomponent = \"$sysdoccomponent\""; eval $helper;
- $helper="\$etcdest = \"$sysetcdest\""; eval $helper;
- $opt_debug && print STDERR "\nGlobal options:\n";
- if ($opt_debug) {
- print STDERR "debdest = $debdest\n";
- print STDERR "basedir = $basedir\n";
- print STDERR "bindest = $bindest\n";
- print STDERR "rundest = $rundest\n";
- print STDERR "docdest = $docdest\n";
- print STDERR "doccomponent = $doccomponent\n";
- print STDERR "etcdest = $etcdest\n";
+ make_maintainer($package) unless ($opt_onlycopy);
}
}
@@ -195,19 +129,24 @@ sub tl_is_ignored {
#
# make_deb_copy_to_righplace
#
-# depends on global var $rundest
sub make_deb_copy_to_rightplace {
my ($package,$listref) = @_;
my %lists = %$listref;
my @all_files;
+ my @SpecialActions;
push @all_files, @{$lists{'RunFiles'}};
push @all_files, @{$lists{'DocFiles'}};
push @all_files, @{$lists{'SourceFiles'}} if (!$opt_nosource);
foreach my $file (@all_files) {
+ # all files are now in texmf-dist
+ my $lfile = $file;
+ # SWITCH to move all files to /usr/share/texmf
+ #$lfile =~ s:^texmf-dist/::;
next if tl_is_blacklisted($file);
if (!tl_is_ignored($file)) {
- $opt_debug && print STDERR "NORMAL COPY: $basedir/usr/share/texlive/$file\n";
- my $finaldest = "$basedir/usr/share/texlive/$file";
+ my $finaldest = "$basedir/usr/share/texlive/$lfile";
+ # SWITCH my $finaldest = "$basedir/usr/share/texmf/$lfile";
+ $opt_debug && print STDERR "NORMAL COPY: $finaldest\n";
&mkpath(dirname($finaldest));
mycopy("$Master/$file", $finaldest);
}
@@ -216,20 +155,35 @@ sub make_deb_copy_to_rightplace {
# actual link
if (defined($TeXLive{'all'}{'linkedscript'}{$file})) {
unless ($opt_onlyscripts == 1) {
+ my $bindest = "$basedir/usr/bin";
&mkpath($bindest);
my @foo = split ",", $TeXLive{'all'}{'linkedscript'}{$file};
for my $i (@foo) {
- symlink("../share/texlive/$file", "$bindest/$i") or
- die "Cannot symlink $bindest/$i -> ../share/texlive/$file: $!\n"
+ # SWITCH symlink("../share/texmf/$lfile", "$bindest/$i") or
+ symlink("../share/texlive/$lfile", "$bindest/$i") or
+ die "Cannot symlink $bindest/$i -> ../share/texlive/$lfile: $!\n"
}
};
}
- do_special($file,"/usr/share/texlive/$file");
+ SPECIALS: foreach my $special (@{$TeXLive{'all'}{'special_actions_config'}}) {
+ my ($pat, $act) = ($special =~ m/(.*):(.*)/);
+ if ($file =~ m|$pat$|) {
+ if ($act eq "install-info") {
+ push @SpecialActions, "install-info:$file";
+ } elsif ( $act eq "install-man") {
+ push @SpecialActions, "install-man:$file";
+ } else {
+ print STDERR "Unknown special action $act, terminating!\n";
+ exit 1;
+ }
+ }
+ }
}
if ($package eq 'texlive-common') {
&mkpath("$debdest/texlive-common/usr/share/texlive/tlpkg");
mycopy("$Master/tlpkg/TeXLive","$debdest/texlive-common/usr/share/texlive/tlpkg/");
}
+ return(@SpecialActions);
}
#
@@ -315,24 +269,6 @@ sub make_deb {
#
# Do special actions as specified in the config file, like install info
# etc
- our @SpecialActions = ();
- sub do_special {
- my ($origfn, $finalfn) = @_;
- our @SpecialActions;
- SPECIALS: foreach my $special (@{$TeXLive{'all'}{'special_actions_config'}}) {
- my ($pat, $act) = ($special =~ m/(.*):(.*)/);
- if ($origfn =~ m|$pat$|) {
- if ($act eq "install-info") {
- push @SpecialActions, "install-info:$origfn";
- } elsif ( $act eq "install-man") {
- push @SpecialActions, "install-man:$origfn";
- } else {
- print STDERR "Unknown special action $act, terminating!\n";
- exit 1;
- }
- }
- }
- }
# real start
my ($package) = @_;
my $type_of_package = 'binary';
@@ -343,7 +279,7 @@ sub make_deb {
my %lists = %{&get_all_files($package, $globalreclevel)};
my $title = $TeXLive{$type_of_package}{$package}{'title'};
my $description = $TeXLive{$type_of_package}{$package}{'description'};
- eval { mkpath($rundest) };
+ #eval { mkpath($rundest) };
if ($@) {
die "Couldn't create dir: $@";
}
@@ -353,11 +289,11 @@ sub make_deb {
print STDERR "DOCFILES: ", @{$lists{'DocFiles'}}, "\n";
print STDERR "BINFILES: ", @{$lists{'BinFiles'}}, "\n";
}
- &mkpath($docdest);
+ #&mkpath($docdest);
#
# DO REMAPPINGS and COPY FILES TO DEST
#
- make_deb_copy_to_rightplace($package,\%lists);
+ my @SpecialActions = make_deb_copy_to_rightplace($package,\%lists);
#
# EXECUTE ACTIONS
#
@@ -396,7 +332,7 @@ sub make_deb {
#}
#close(MANLIST);
for my $f (@manfiles) {
- if ($f =~ m!texmf[^/]*/doc/man/man(.*)/(.*)$!) {
+ if ($f =~ m!texmf-dist/doc/man/man(.*)/(.*)$!) {
mycopy($f, "$debdest/$package/usr/share/man/man$1/$2");
} else {
printf STDERR "Unhandled man page: $f\n";
@@ -421,7 +357,7 @@ sub make_maintainer {
close(SOURCE);
}
}
- my ($package,$debdest) = @_;
+ my ($package) = @_;
print "Making maintainer scripts for $package in $debdest...\n";
&mkpath($debdest);
# create debian/maintscript
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index b7a80d3..b195a8c 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -1,6 +1,6 @@
#
# tpm2deb.cfg
-# (c) 2005-2012 Norbert Preining
+# (c) 2005-2013 Norbert Preining
#
# describe relations between texlive and other debian packages, but als
# which packages and files should be blacklisted
@@ -11,7 +11,7 @@
# we have to keep texlive-bin here so that we can change the dependency
# on texlive-binaries for packages:
source;texlive-bin
-latest-version;texlive-bin;2012.20130315
+latest-version;texlive-bin;2013.20130507
name;collection-foobar;texlive-binaries;texlive-bin
# sources
source;texlive-doc
@@ -35,13 +35,13 @@ bin-priority;pdfjam;extra
bin-priority;texlive-latex3;extra
standards;*;3.9.3
# last texlive-common version all packages should depend on
-texlive-common-version;2012.20130315
+texlive-common-version;2013.20130507
#
# last revision of the packages, necessary for texlive-full dependencies
-latest-version;texlive-base;2012.20130315
-latest-version;texlive-extra;2012.20130315
-latest-version;texlive-doc;2012.20130315
-latest-version;texlive-lang;2012.20130315
+latest-version;texlive-base;2013.20130507
+latest-version;texlive-extra;2013.20130507
+latest-version;texlive-doc;2013.20130507
+latest-version;texlive-lang;2013.20130507
#
# old versions
# these version numbers are used for the remove conffile directive below
@@ -174,7 +174,7 @@ shortdesc;lambda;LaTeX format based on the Omega engine.
#
# this one we need for installation but not installed, so map it into nowhere
# and do not blacklist it
-blacklist;file;texmf/dvipdfm/config/config-win32
+blacklist;file;texmf-dist/dvipdfm/config/config-win32
blacklist;file;texmf-dist/doc/latex/latex-course/Graphics/Thumbs.db
blacklist;file;texmf-dist/doc/latex/pdfwin/Thumbs.db
#
@@ -209,12 +209,12 @@ ignore;texmf-dist/doc/fonts/gnu-freefont/tools/generate/buildutils.pyc;;
#
# ignore config files for maps, formats, hyph patterns
# handled separately
-ignore;texmf/tex/generic/config/language.dat
-ignore;texmf/tex/generic/config/language.def
-ignore;texmf/tex/generic/config/language.dat.lua
+ignore;texmf-dist/tex/generic/config/language.dat
+ignore;texmf-dist/tex/generic/config/language.def
+ignore;texmf-dist/tex/generic/config/language.dat.lua
ignore;texmf-dist/web2c/updmap.cfg;;
-ignore;texmf/web2c/fmtutil.cnf;;
-ignore;texmf/web2c/mktex.cnf
+ignore;texmf-dist/web2c/fmtutil.cnf;;
+ignore;texmf-dist/web2c/mktex.cnf
# useless files
# todo upstream
ignore;texmf-dist/doc/latex/mathpazo/mapfplm.tex
@@ -222,11 +222,11 @@ ignore;texmf-dist/doc/latex/mathpazo/mapppl.tex
ignore;texmf-dist/doc/latex/mathpazo/mapzplm.tex
#
# files that are in ps2eps are not installed
-kill;texmf/doc/man/man1/bbox.1;;
-ignore;texmf/doc/man/man1/bbox.man1.pdf;;
-kill;texmf/doc/man/man1/ps2eps.1;;
-ignore;texmf/doc/man/man1/ps2eps.man1.pdf;;
-ignore;texmf/scripts/ps2eps/ps2eps.pl;;
+kill;texmf-dist/doc/man/man1/bbox.1;;
+ignore;texmf-dist/doc/man/man1/bbox.man1.pdf;;
+kill;texmf-dist/doc/man/man1/ps2eps.1;;
+ignore;texmf-dist/doc/man/man1/ps2eps.man1.pdf;;
+ignore;texmf-dist/scripts/ps2eps/ps2eps.pl;;
#
#
include-config;cfg.d/info-man-handling.cfg
diff --git a/all/debian/tpm2debcommon.pm b/all/debian/tpm2debcommon.pm
index 5969180..210a954 100755
--- a/all/debian/tpm2debcommon.pm
+++ b/all/debian/tpm2debcommon.pm
@@ -103,7 +103,7 @@ sub build_data_hash {
}
my $tlp = $::tlpdb->get_package($bin_pkg);
die "Cannot get $bin_pkg from tlpdb!" unless defined($tlp);
- $tlp->cancel_reloc_prefix;
+ $tlp->replace_reloc_prefix;
my ($pkg) = tpm2debname($bin_pkg);
my $realtype = $tlp->category;
next if ($realtype eq "Scheme");
@@ -257,7 +257,7 @@ sub build_data_hash {
my @p = ();
my @pd = ();
foreach my $f (@{$TeXLive{'binary'}{$bin_pkg}{'docfiles'}}) {
- if ($f =~ m;texmf[^/]*/doc/man/man.*/.*;) {
+ if ($f =~ m;texmf-dist/doc/man/man.*/.*;) {
push @p, $f;
} else {
push @pd, $f;
@@ -321,7 +321,7 @@ sub build_data_hash {
($TeXLive{'all'}{'file_map_actions'}{$f} eq "move")) {
push @p, $f;
} else {
- if ($f =~ m;texmf[^/]*/doc/man/man.*/.*;) {
+ if ($f =~ m;texmf-dist/doc/man/man.*/.*;) {
push @p, $f;
} else {
push @pd, $f;
diff --git a/tpm2deb-source.pl b/tpm2deb-source.pl
index 9a7a6ea..74e2fea 100755
--- a/tpm2deb-source.pl
+++ b/tpm2deb-source.pl
@@ -29,7 +29,6 @@ if ($mydir eq $0) { $mydir = `pwd` ; chomp($mydir); }
if (!($mydir =~ m,/.*,,)) { $mmydir = `pwd`; chomp($mmydir); $mydir = "$mmydir/$mydir" ; }
-# $opt_master = "./LocalTPM";
$opt_debug = 0;
$opt_nosrcpkg = 0;
$opt_noremove = 0;
@@ -259,7 +258,7 @@ sub make_orig_tar {
`rm -rf \"$texlivedest/bin\"`;
#
# necessary for media detection!
- &mkpath("$texlivedest/texmf/web2c");
+ &mkpath("$texlivedest/texmf-dist/web2c");
#
# copy the files necessary for tpm2deb.pl from the Tools directory
#
@@ -279,10 +278,6 @@ sub make_orig_tar {
system("find $texlivedest/texmf-dist/ -type f -print0 | xargs -0 chmod -x") == 0
or die("Cannot remove unwanted execution permissions");
}
- if (-d "$texlivedest/texmf-doc") {
- system("find $texlivedest/texmf-doc/ -type f -print0 | xargs -0 chmod -x") == 0
- or die("Cannot remove unwanted execution permissions");
- }
# remove any git directories
system("find $texlivedest -name '.git' | xargs rm -rf") == 0
or die("Error while removing git directories");
@@ -309,7 +304,7 @@ sub create_license_file {
print "mydir/texlivedest = $mydir/$texlivedest\n";
for my $p (sort keys %allpacks) {
my $tlp = $::tlpdb->get_package($p);
- $tlp->cancel_reloc_prefix;
+ $tlp->replace_reloc_prefix;
my @filelist;
push @filelist, $tlp->runfiles;
push @filelist, $tlp->docfiles;
--
Debian packaging of texlive-nonbin)
Reply to: