[SCM] Debian packaging of texlive-nonbin) branch, master, updated. 8341e8a484f171993e8dfb2fc53f97300a8125ee
The following commit has been merged in the master branch:
commit c7023bf7496127499f30a26d4882d1d5b3f00bf7
Author: Norbert Preining <preining@debian.org>
Date: Mon Nov 12 09:23:47 2012 +0900
work on intermediate packages
diff --git a/TODO b/TODO
index acb95bb..7d4a3d9 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,9 @@
-- create format links not in links.dist files, but generate them
- automatically
+- split .cfg file (otf section, linked script section, ...) and generate
+ the parts
- create blacklist and links for otf fonts automatically or from a
list somewhere
-
+- redo doc files linking process, move all into proper texmf dirs
+ and link *into* /usr/share/doc, otherwise we are dying in the
+ mktexlsr/mtxrun run
+- links that are bin dir internal are currently generated via links.dist,
+ but should be done somehow differently, best in upstream?
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index 29b2685..18287bc 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -41,10 +41,10 @@ standards;*;3.9.3
texlive-common-version;2012.20120516
#
# last revision of the packages, necessary for texlive-full dependencies
-latest-version;texlive-base;2012.20120516
-latest-version;texlive-extra;2012.20120516
-latest-version;texlive-doc;2012.20120516
-latest-version;texlive-lang;2012.20120516
+latest-version;texlive-base;2012.20121112
+latest-version;texlive-extra;2012.20121112
+latest-version;texlive-doc;2012.20121112
+latest-version;texlive-lang;2012.20121112
#
# old versions
old-version;texlive-lang;2009-3
@@ -54,7 +54,8 @@ old-version;texlive-base;2012.20120611-4
#
# texlive-base needs newer texlive-binaries than "latest-version" because
# of the libpaper patches. No need to rebuild and update the rest
-depends;texlive-base;texlive-binaries (>= 2012.20120516)
+depends;texlive-base;texlive-binaries (>= 2012.20121112)
+replaces;texlive-base;texlive-binaries (<< 2012.20121112)
#
#
# collections -> debian package names plus source packages
@@ -406,134 +407,107 @@ mapping;texmf/web2c/fmtutil.cnf;;
# man page handling has to be fixed ... it is a pain ;-)
mapping;texmf[^/]*/doc/man/man(.*)/(.*).pdf;;
# disable man pages that are in texlive-binaries
-# etex.1 should be installed by texlive-binaries, but isn't ATM, should
-# be fixed!!
-mapping;texmf[^/]*/doc/man/man1/etex.1;;
-# already in texlive-binaries
-mapping;texmf[^/]*/doc/man/man1/cweb.1;;
-mapping;texmf[^/]*/doc/man/man1/allneeded.1;;
-mapping;texmf[^/]*/doc/man/man1/texdoctk.1;;
-mapping;texmf[^/]*/doc/man/man1/opl2ofm.1;;
-mapping;texmf[^/]*/doc/man/man1/xdvi.1;;
-mapping;texmf[^/]*/doc/man/man1/dvitodvi.1;;
-mapping;texmf[^/]*/doc/man/man1/detex.1;;
+# generated by unpacking a texlive-binaries packages and reading the
+# files there
+mapping;texmf[^/]*/doc/man/man1/afm2pl.1;;
mapping;texmf[^/]*/doc/man/man1/afm2tfm.1;;
-mapping;texmf[^/]*/doc/man/man1/dvipdfm.1;;
-mapping;texmf[^/]*/doc/man/man1/kpseaccess.1;;
-mapping;texmf[^/]*/doc/man/man1/ctie.1;;
-mapping;texmf[^/]*/doc/man/man1/pktogf.1;;
-mapping;texmf[^/]*/doc/man/man1/dvi2tty.1;;
-mapping;texmf[^/]*/doc/man/man1/kpsestat.1;;
-mapping;texmf[^/]*/doc/man/man1/ovp2ovf.1;;
mapping;texmf[^/]*/doc/man/man1/aleph.1;;
-mapping;texmf[^/]*/doc/man/man1/pk2bm.1;;
+mapping;texmf[^/]*/doc/man/man1/bibtex8.1;;
+mapping;texmf[^/]*/doc/man/man1/bibtex.1;;
+mapping;texmf[^/]*/doc/man/man1/ctangle.1;;
+mapping;texmf[^/]*/doc/man/man1/ctie.1;;
+mapping;texmf[^/]*/doc/man/man1/cweave.1;;
+mapping;texmf[^/]*/doc/man/man1/cweb.1;;
+mapping;texmf[^/]*/doc/man/man1/detex.1;;
+mapping;texmf[^/]*/doc/man/man1/devnag.1;;
+mapping;texmf[^/]*/doc/man/man1/disdvi.1;;
+mapping;texmf[^/]*/doc/man/man1/dt2dv.1;;
mapping;texmf[^/]*/doc/man/man1/dv2dt.1;;
-mapping;texmf[^/]*/doc/man/man1/pltotf.1;;
-mapping;texmf[^/]*/doc/man/man1/mktexlsr.1;;
-mapping;texmf[^/]*/doc/man/man1/dvipdft.1;;
-mapping;texmf[^/]*/doc/man/man1/gftype.1;;
+mapping;texmf[^/]*/doc/man/man1/dvi2tty.1;;
+mapping;texmf[^/]*/doc/man/man1/dvibook.1;;
mapping;texmf[^/]*/doc/man/man1/dviconcat.1;;
-mapping;texmf[^/]*/doc/man/man1/mkofm.1;;
-mapping;texmf[^/]*/doc/man/man1/mkindex.1;;
-mapping;texmf[^/]*/doc/man/man1/updmap.1;;
-mapping;texmf[^/]*/doc/man/man1/synctex.1;;
-mapping;texmf[^/]*/doc/man/man1/mktexmf.1;;
-mapping;texmf[^/]*/doc/man/man1/dviselect.1;;
-mapping;texmf[^/]*/doc/man/man1/pdfopen.1;;
-mapping;texmf[^/]*/doc/man/man1/kpsewhich.1;;
-mapping;texmf[^/]*/doc/man/man1/pdfetex.1;;
-mapping;texmf[^/]*/doc/man/man1/outocp.1;;
-mapping;texmf[^/]*/doc/man/man1/tftopl.1;;
+mapping;texmf[^/]*/doc/man/man1/dvicopy.1;;
mapping;texmf[^/]*/doc/man/man1/dvihp.1;;
-mapping;texmf[^/]*/doc/man/man1/fmtutil.1;;
-mapping;texmf[^/]*/doc/man/man1/dvisvgm.1;;
-mapping;texmf[^/]*/doc/man/man1/texlinks.1;;
-mapping;texmf[^/]*/doc/man/man1/kpsereadlink.1;;
mapping;texmf[^/]*/doc/man/man1/dvilj.1;;
-mapping;texmf[^/]*/doc/man/man1/dvibook.1;;
-mapping;texmf[^/]*/doc/man/man1/rumakeindex.1;;
+mapping;texmf[^/]*/doc/man/man1/dvilj2p.1;;
+mapping;texmf[^/]*/doc/man/man1/dvilj4.1;;
+mapping;texmf[^/]*/doc/man/man1/dvilj4l.1;;
+mapping;texmf[^/]*/doc/man/man1/dvilj6.1;;
+mapping;texmf[^/]*/doc/man/man1/dvipdfm.1;;
+mapping;texmf[^/]*/doc/man/man1/dvipdft.1;;
+mapping;texmf[^/]*/doc/man/man1/dvipos.1;;
+mapping;texmf[^/]*/doc/man/man1/dvips.1;;
+mapping;texmf[^/]*/doc/man/man1/dviselect.1;;
+mapping;texmf[^/]*/doc/man/man1/dvisvgm.1;;
+mapping;texmf[^/]*/doc/man/man1/dvitodvi.1;;
+mapping;texmf[^/]*/doc/man/man1/dvitomp.1;;
mapping;texmf[^/]*/doc/man/man1/dvitype.1;;
-mapping;texmf[^/]*/doc/man/man1/ttf2pk.1;;
-mapping;texmf[^/]*/doc/man/man1/ps2pk.1;;
+mapping;texmf[^/]*/doc/man/man1/ebb.1;;
+mapping;texmf[^/]*/doc/man/man1/etex.1;;
+mapping;texmf[^/]*/doc/man/man1/extractbb.1;;
+mapping;texmf[^/]*/doc/man/man1/gftodvi.1;;
mapping;texmf[^/]*/doc/man/man1/gftopk.1;;
-mapping;texmf[^/]*/doc/man/man1/pfb2pfa.1;;
-mapping;texmf[^/]*/doc/man/man1/tangle.1;;
+mapping;texmf[^/]*/doc/man/man1/gftype.1;;
+mapping;texmf[^/]*/doc/man/man1/gsftopk.1;;
+mapping;texmf[^/]*/doc/man/man1/kpseaccess.1;;
+mapping;texmf[^/]*/doc/man/man1/kpsereadlink.1;;
+mapping;texmf[^/]*/doc/man/man1/kpsestat.1;;
+mapping;texmf[^/]*/doc/man/man1/kpsewhich.1;;
+mapping;texmf[^/]*/doc/man/man1/mag.1;;
+mapping;texmf[^/]*/doc/man/man1/makeindex.1;;
+mapping;texmf[^/]*/doc/man/man1/mendex.1;;
+mapping;texmf[^/]*/doc/man/man1/mf.1;;
+mapping;texmf[^/]*/doc/man/man1/mf-nowin.1;;
mapping;texmf[^/]*/doc/man/man1/mft.1;;
+mapping;texmf[^/]*/doc/man/man1/mkindex.1;;
+mapping;texmf[^/]*/doc/man/man1/mkocp.1;;
+mapping;texmf[^/]*/doc/man/man1/mkofm.1;;
+mapping;texmf[^/]*/doc/man/man1/mktexlsr.1;;
+mapping;texmf[^/]*/doc/man/man1/mktexmf.1;;
+mapping;texmf[^/]*/doc/man/man1/mktexpk.1;;
+mapping;texmf[^/]*/doc/man/man1/mktextfm.1;;
mapping;texmf[^/]*/doc/man/man1/mpost.1;;
+mapping;texmf[^/]*/doc/man/man1/odvicopy.1;;
+mapping;texmf[^/]*/doc/man/man1/odvitype.1;;
+mapping;texmf[^/]*/doc/man/man1/ofm2opl.1;;
+mapping;texmf[^/]*/doc/man/man1/omfonts.1;;
+mapping;texmf[^/]*/doc/man/man1/opl2ofm.1;;
+mapping;texmf[^/]*/doc/man/man1/otangle.1;;
+mapping;texmf[^/]*/doc/man/man1/otp2ocp.1;;
+mapping;texmf[^/]*/doc/man/man1/outocp.1;;
+mapping;texmf[^/]*/doc/man/man1/ovf2ovp.1;;
+mapping;texmf[^/]*/doc/man/man1/ovp2ovf.1;;
mapping;texmf[^/]*/doc/man/man1/patgen.1;;
+mapping;texmf[^/]*/doc/man/man1/pdfclose.1;;
+mapping;texmf[^/]*/doc/man/man1/pdfetex.1;;
+mapping;texmf[^/]*/doc/man/man1/pdfopen.1;;
+mapping;texmf[^/]*/doc/man/man1/pdftex.1;;
+mapping;texmf[^/]*/doc/man/man1/pdftosrc.1;;
+mapping;texmf[^/]*/doc/man/man1/pfb2pfa.1;;
+mapping;texmf[^/]*/doc/man/man1/pk2bm.1;;
+mapping;texmf[^/]*/doc/man/man1/pktogf.1;;
+mapping;texmf[^/]*/doc/man/man1/pktype.1;;
+mapping;texmf[^/]*/doc/man/man1/pltotf.1;;
+mapping;texmf[^/]*/doc/man/man1/pooltype.1;;
+mapping;texmf[^/]*/doc/man/man1/ps2pk.1;;
+mapping;texmf[^/]*/doc/man/man1/synctex.1;;
+mapping;texmf[^/]*/doc/man/man1/tangle.1;;
mapping;texmf[^/]*/doc/man/man1/tex.1;;
+mapping;texmf[^/]*/doc/man/man1/texconfig-dialog.1;;
+mapping;texmf[^/]*/doc/man/man1/texhash.1;;
+mapping;texmf[^/]*/doc/man/man1/tftopl.1;;
+mapping;texmf[^/]*/doc/man/man1/tie.1;;
+mapping;texmf[^/]*/doc/man/man1/tpic2pdftex.1;;
mapping;texmf[^/]*/doc/man/man1/ttf2afm.1;;
-mapping;texmf[^/]*/doc/man/man1/dvicopy.1;;
-mapping;texmf[^/]*/doc/man/man1/mag.1;;
-mapping;texmf[^/]*/doc/man/man1/texconfig.1;;
-mapping;texmf[^/]*/doc/man/man1/extractbb.1;;
-mapping;texmf[^/]*/doc/man/man1/mendex.1;;
-mapping;texmf[^/]*/doc/man/man1/otp2ocp.1;;
-mapping;texmf[^/]*/doc/man/man1/pdftosrc.1;;
+mapping;texmf[^/]*/doc/man/man1/ttf2pk.1;;
mapping;texmf[^/]*/doc/man/man1/ttf2tfm.1;;
-mapping;texmf[^/]*/doc/man/man1/devnag.1;;
-mapping;texmf[^/]*/doc/man/man1/mktextfm.1;;
-mapping;texmf[^/]*/doc/man/man1/ps2frag.1;;
-mapping;texmf[^/]*/doc/man/man1/pslatex.1;;
mapping;texmf[^/]*/doc/man/man1/ttfdump.1;;
mapping;texmf[^/]*/doc/man/man1/vftovp.1;;
-mapping;texmf[^/]*/doc/man/man1/makeindex.1;;
-mapping;texmf[^/]*/doc/man/man1/allcm.1;;
-mapping;texmf[^/]*/doc/man/man1/texconfig-dialog.1;;
-mapping;texmf[^/]*/doc/man/man1/pdftex.1;;
-mapping;texmf[^/]*/doc/man/man1/vptovf.1;;
-mapping;texmf[^/]*/doc/man/man1/bibtex8.1;;
-mapping;texmf[^/]*/doc/man/man1/pktype.1;;
-mapping;texmf[^/]*/doc/man/man1/fontinst.1;;
mapping;texmf[^/]*/doc/man/man1/vlna.1;;
+mapping;texmf[^/]*/doc/man/man1/vptovf.1;;
mapping;texmf[^/]*/doc/man/man1/weave.1;;
-mapping;texmf[^/]*/doc/man/man1/dvi2fax.1;;
-mapping;texmf[^/]*/doc/man/man1/pooltype.1;;
-mapping;texmf[^/]*/doc/man/man1/afm2pl.1;;
-mapping;texmf[^/]*/doc/man/man1/bibtex.1;;
-mapping;texmf[^/]*/doc/man/man1/rubibtex.1;;
-mapping;texmf[^/]*/doc/man/man1/omfonts.1;;
-mapping;texmf[^/]*/doc/man/man1/mktexpk.1;;
-mapping;texmf[^/]*/doc/man/man1/dvitomp.1;;
-mapping;texmf[^/]*/doc/man/man1/kpsewhere.1;;
-mapping;texmf[^/]*/doc/man/man1/mf.1;;
-mapping;texmf[^/]*/doc/man/man1/ovf2ovp.1;;
-mapping;texmf[^/]*/doc/man/man1/dvired.1;;
-mapping;texmf[^/]*/doc/man/man1/ofm2opl.1;;
-mapping;texmf[^/]*/doc/man/man1/dt2dv.1;;
-mapping;texmf[^/]*/doc/man/man1/gsftopk.1;;
-mapping;texmf[^/]*/doc/man/man1/disdvi.1;;
-mapping;texmf[^/]*/doc/man/man1/tie.1;;
-mapping;texmf[^/]*/doc/man/man1/dvipos.1;;
-mapping;texmf[^/]*/doc/man/man1/dvips.1;;
-mapping;texmf[^/]*/doc/man/man1/kpsetool.1;;
-mapping;texmf[^/]*/doc/man/man1/mkocp.1;;
-mapping;texmf[^/]*/doc/man/man1/gftodvi.1;;
-mapping;texmf[^/]*/doc/man/man1/tpic2pdftex.1;;
-mapping;texmf[^/]*/doc/man/man5/updmap.cfg.5;;
+mapping;texmf[^/]*/doc/man/man1/xdvi.1;;
mapping;texmf[^/]*/doc/man/man5/synctex.5;;
-mapping;texmf[^/]*/doc/man/man5/fmtutil.cnf.5;;
-# and now for the links of man pages:
-mapping;texmf[^/]*/doc/man/man1/ebb.1;;
-mapping;texmf[^/]*/doc/man/man1/dvilj2p.1;;
-mapping;texmf[^/]*/doc/man/man1/odvitype.1;;
-mapping;texmf[^/]*/doc/man/man1/dvilj4l.1;;
-mapping;texmf[^/]*/doc/man/man1/ctangle.1;;
-mapping;texmf[^/]*/doc/man/man1/allec.1;;
-mapping;texmf[^/]*/doc/man/man1/mktexfmt.1;;
-mapping;texmf[^/]*/doc/man/man1/dvilj4.1;;
-mapping;texmf[^/]*/doc/man/man1/texhash.1;;
-mapping;texmf[^/]*/doc/man/man1/texconfig-sys.1;;
-mapping;texmf[^/]*/doc/man/man1/kpsepath.1;;
-mapping;texmf[^/]*/doc/man/man1/pdfclose.1;;
-mapping;texmf[^/]*/doc/man/man1/fmtutil-sys.1;;
-mapping;texmf[^/]*/doc/man/man1/kpsexpand.1;;
-mapping;texmf[^/]*/doc/man/man1/odvicopy.1;;
-mapping;texmf[^/]*/doc/man/man1/cweave.1;;
-mapping;texmf[^/]*/doc/man/man1/updmap-sys.1;;
-mapping;texmf[^/]*/doc/man/man1/dvilj6.1;;
-mapping;texmf[^/]*/doc/man/man1/mf-nowin.1;;
-mapping;texmf[^/]*/doc/man/man1/otangle.1;;
# map all others into /usr/share/man/...
mapping;texmf[^/]*/doc/man/man(.*)/(.*);move;/usr/share/man/man$1/$2
#mapping;texmf[^/]*/doc/man/man(.*)/(.*);;
@@ -554,12 +528,6 @@ blacklist;file;texmf/web2c/mktex.cnf
mapping;texmf[^/]*/dvipdfm/config/config;config-move;/etc/texmf/dvipdfm/config/config
mapping;texmf[^/]*/xdvi/xdvi.cfg;config-move;/etc/texmf/xdvi/xdvi.cfg
mapping;texmf[^/]*/texdoctk/texdocrc.defaults;config-move;/etc/texmf/texdoctk/texdocrc.defaults
-#
-# handled by ucf:
-#mapping;texmf[^/]*/dvips/config/config.ps;move;/usr/share/texlive-base/config.ps
-#mapping;texmf[^/]*/tex/generic/config/pdftexconfig.tex;move;/usr/share/texlive-base/pdftexconfig.tex
-#mapping;texmf[^/]*/xdvi/XDvi;move;/usr/share/texlive-base/XDvi
-#mapping;texmf[^/]*/dvipdfmx/dvipdfmx.cfg;move;/usr/share/texlive-base/dvipdfmx.cfg
# historical md5sum files for texlive-base:
mapping;debian/md5sums/([^/]*);/usr/share/texlive-base/$1
# and the libpaper dependency
diff --git a/all/debian/tpm2debcommon.pm b/all/debian/tpm2debcommon.pm
index 197f53a..b32848c 100755
--- a/all/debian/tpm2debcommon.pm
+++ b/all/debian/tpm2debcommon.pm
@@ -796,9 +796,12 @@ sub initialize_config_file_data {
exit 1;
}
close(CFGFILE);
- open(CFGFILE,"<$cfgfile") or die "Cannot open $cfgfile\n";
- print "Reading all/debian/scripts.lst ...\n";
- for (`bash all/debian/create-linked-scripts all/debian/scripts.lst`) {
+ my $spf = "";
+ if (-d "./all") {
+ $spf = "all/";
+ }
+ print "Reading ${spf}debian/scripts.lst ...\n";
+ for (`bash ${spf}debian/create-linked-scripts ${spf}debian/scripts.lst`) {
chomp;
my ($type, $a, @rest) = split ";";
if ($type eq "linkedscript") {
diff --git a/do-one b/do-one
index 24be234..297f524 100644
--- a/do-one
+++ b/do-one
@@ -2,7 +2,7 @@
pkg=$1
-perl tpm2deb-source.pl --master=/var/www/norbert/tlpretest make-orig-tar $pkg
+perl tpm2deb-source.pl --master=/var/www/norbert/tlnet make-orig-tar $pkg
# for in-system builds:
cd $pkg
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index d071774..c8d59bf 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,10 +1,11 @@
-texlive-base (2012.20120611-6) UNRELEASED; urgency=low
+texlive-base (2012.20121112-1) UNRELEASED; urgency=low
+ * new upstream checkout
* new translation for Japanese (Closes: #683127, #690697)
* provide symbolic links for some fonts (.pfb/.afm) files
(Closes: #689837, #546251)
- -- Norbert Preining <preining@debian.org> Wed, 31 Oct 2012 07:17:30 +0900
+ -- Norbert Preining <preining@debian.org> Mon, 12 Nov 2012 07:52:13 +0900
texlive-base (2012.20120611-5) unstable; urgency=low
diff --git a/texlive-base/debian/patches/debian_updmap-search-path b/texlive-base/debian/patches/debian_updmap-search-path
index 475ed6e..d01ff7a 100644
--- a/texlive-base/debian/patches/debian_updmap-search-path
+++ b/texlive-base/debian/patches/debian_updmap-search-path
@@ -1,11 +1,9 @@
---
- texmf/scripts/tetex/updmap.pl | 26 ++++++++++++++++++++++++--
- 1 file changed, 24 insertions(+), 2 deletions(-)
+ texmf-dist/scripts/tetex/updmap.pl | 22 ++++++++++++++++++++--
+ 1 file changed, 20 insertions(+), 2 deletions(-)
-Index: texlive-base-2012.20120529/texmf/scripts/tetex/updmap.pl
-===================================================================
---- texlive-base-2012.20120529.orig/texmf/scripts/tetex/updmap.pl 2012-06-10 09:45:56.206357557 +0900
-+++ texlive-base-2012.20120529/texmf/scripts/tetex/updmap.pl 2012-06-10 09:52:17.459406288 +0900
+--- texlive-base-2012.20121112.orig/texmf-dist/scripts/tetex/updmap.pl
++++ texlive-base-2012.20121112/texmf-dist/scripts/tetex/updmap.pl
@@ -29,7 +29,7 @@
exit 1;
}
@@ -15,31 +13,20 @@ Index: texlive-base-2012.20120529/texmf/scripts/tetex/updmap.pl
}
-@@ -302,8 +302,13 @@
+@@ -299,8 +299,11 @@
#
- if ($found || $old_updmap_local_found) {
+ if (@tmlused) {
my @tmp;
-+ my $local_pushed = 0;
+ chomp(my $TEXMFDEBIAN =`kpsewhich --var-value=TEXMFDEBIAN`);
for my $f (@used_files) {
- if ($f =~ m!\Q$TEXMFMAIN/\E!) {
+ # make sure that TEXMFLOCAL is also moved above TEXMFDEBIAN
+ # and do not push it two times!
+ if ($f =~ m!\Q$TEXMFMAIN/\E|\Q$TEXMFDEBIAN/\E!) {
-+ if (!$local_pushed) {
- if ($old_updmap_local_found) {
- push @tmp, "$TEXMFLOCAL/web2c/updmap-local.cfg";
- } else {
-@@ -311,6 +316,8 @@
- # we know that TEXMFLOCAL/web2c/updmap.cfg exists!
- push @tmp, "$TEXMFLOCAL/web2c/updmap.cfg";
- }
-+ $local_pushed = 1;
-+ }
+ push @tmp, @tmlused;
push @tmp, $f;
} else {
- if ($f !~ m!\Q$TEXMFLOCAL\E!) {
-@@ -393,6 +400,21 @@
+@@ -395,6 +398,21 @@
print "\t$m (in $orig)\n";
}
print "in $changes_config_file\n";
diff --git a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
index a32c776..df5e011 100644
--- a/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
+++ b/texlive-base/debian/patches/dvipdfmx-config-paper-factorization
@@ -4,10 +4,8 @@
tlpkg/texlive.tlpdb | 1 +
3 files changed, 14 insertions(+), 8 deletions(-)
-Index: texlive-base-2012.20120529/texmf/dvipdfmx/dvipdfmx-paper.cfg
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-base-2012.20120529/texmf/dvipdfmx/dvipdfmx-paper.cfg 2012-05-29 19:44:51.347359655 +0900
+--- /dev/null
++++ texlive-base-2012.20121112/texmf/dvipdfmx/dvipdfmx-paper.cfg
@@ -0,0 +1,11 @@
+%% PDF Document Settings
+%%
@@ -20,10 +18,8 @@ Index: texlive-base-2012.20120529/texmf/dvipdfmx/dvipdfmx-paper.cfg
+
+p a4
+
-Index: texlive-base-2012.20120529/texmf/dvipdfmx/dvipdfmx.cfg
-===================================================================
---- texlive-base-2012.20120529.orig/texmf/dvipdfmx/dvipdfmx.cfg 2012-05-29 19:42:58.000000000 +0900
-+++ texlive-base-2012.20120529/texmf/dvipdfmx/dvipdfmx.cfg 2012-05-29 19:45:35.399445278 +0900
+--- texlive-base-2012.20121112.orig/texmf/dvipdfmx/dvipdfmx.cfg
++++ texlive-base-2012.20121112/texmf/dvipdfmx/dvipdfmx.cfg
@@ -27,14 +27,8 @@
%% PDF Document Settings
@@ -41,11 +37,9 @@ Index: texlive-base-2012.20120529/texmf/dvipdfmx/dvipdfmx.cfg
%% Annotation Box Margin:
%%
-Index: texlive-base-2012.20120529/tlpkg/texlive.tlpdb
-===================================================================
---- texlive-base-2012.20120529.orig/tlpkg/texlive.tlpdb 2012-05-29 19:43:02.000000000 +0900
-+++ texlive-base-2012.20120529/tlpkg/texlive.tlpdb 2012-05-29 19:44:51.391359752 +0900
-@@ -51926,6 +51926,7 @@
+--- texlive-base-2012.20121112.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2012.20121112/tlpkg/texlive.tlpdb
+@@ -53412,6 +53412,7 @@
texmf/doc/man/man1/extractbb.man1.pdf
runfiles size=42
texmf/dvipdfmx/dvipdfmx.cfg
diff --git a/texlive-base/debian/patches/dvips-config-paper-factorization b/texlive-base/debian/patches/dvips-config-paper-factorization
index 043f481..a606339 100644
--- a/texlive-base/debian/patches/dvips-config-paper-factorization
+++ b/texlive-base/debian/patches/dvips-config-paper-factorization
@@ -4,10 +4,8 @@
tlpkg/texlive.tlpdb | 1
3 files changed, 532 insertions(+), 518 deletions(-)
-Index: texlive-base-2012.20120529/texmf/dvips/config/config-paper.ps
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-base-2012.20120529/texmf/dvips/config/config-paper.ps 2012-05-29 19:43:02.271040017 +0900
+--- /dev/null
++++ texlive-base-2012.20121112/texmf/dvips/config/config-paper.ps
@@ -0,0 +1,524 @@
+%
+% config-paper.ps
@@ -533,10 +531,8 @@ Index: texlive-base-2012.20120529/texmf/dvips/config/config-paper.ps
+@+ if
+@+ %%EndPaperSize
+
-Index: texlive-base-2012.20120529/texmf/dvips/config/config.ps
-===================================================================
---- texlive-base-2012.20120529.orig/texmf/dvips/config/config.ps 2011-11-03 00:13:04.000000000 +0900
-+++ texlive-base-2012.20120529/texmf/dvips/config/config.ps 2012-05-29 19:44:25.219297693 +0900
+--- texlive-base-2012.20121112.orig/texmf/dvips/config/config.ps
++++ texlive-base-2012.20121112/texmf/dvips/config/config.ps
@@ -67,524 +67,13 @@
%
% emacs-page
@@ -1069,11 +1065,9 @@ Index: texlive-base-2012.20120529/texmf/dvips/config/config.ps
% use -t unknown with a \special{papersize=...} for a nonstandard page size.
@ unknown 0in 0in
-Index: texlive-base-2012.20120529/tlpkg/texlive.tlpdb
-===================================================================
---- texlive-base-2012.20120529.orig/tlpkg/texlive.tlpdb 2012-05-29 11:41:26.000000000 +0900
-+++ texlive-base-2012.20120529/tlpkg/texlive.tlpdb 2012-05-29 19:43:02.311040165 +0900
-@@ -52653,6 +52653,7 @@
+--- texlive-base-2012.20121112.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2012.20121112/tlpkg/texlive.tlpdb
+@@ -54110,6 +54110,7 @@
texmf/dvips/config/config.mirrorprint
texmf/dvips/config/config.ot2
texmf/dvips/config/config.ps
diff --git a/texlive-base/debian/patches/pdftex-config-paper-factorization b/texlive-base/debian/patches/pdftex-config-paper-factorization
index 7198280..707f978 100644
--- a/texlive-base/debian/patches/pdftex-config-paper-factorization
+++ b/texlive-base/debian/patches/pdftex-config-paper-factorization
@@ -4,19 +4,15 @@
tlpkg/texlive.tlpdb | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
-Index: texlive-base-2012.20120529/texmf/tex/generic/config/pdftexconfig-paper.tex
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-base-2012.20120529/texmf/tex/generic/config/pdftexconfig-paper.tex 2012-05-29 19:45:46.479463280 +0900
+--- /dev/null
++++ texlive-base-2012.20121112/texmf/tex/generic/config/pdftexconfig-paper.tex
@@ -0,0 +1,4 @@
+% paper size settings, included from pdftexconfig.tex for pdftex
+\pdfpagewidth=210 true mm
+\pdfpageheight=297 true mm
+\endinput
-Index: texlive-base-2012.20120529/texmf/tex/generic/config/pdftexconfig.tex
-===================================================================
---- texlive-base-2012.20120529.orig/texmf/tex/generic/config/pdftexconfig.tex 2010-05-15 03:11:48.000000000 +0900
-+++ texlive-base-2012.20120529/texmf/tex/generic/config/pdftexconfig.tex 2012-05-29 19:45:46.479463280 +0900
+--- texlive-base-2012.20121112.orig/texmf/tex/generic/config/pdftexconfig.tex
++++ texlive-base-2012.20121112/texmf/tex/generic/config/pdftexconfig.tex
@@ -3,8 +3,8 @@
\pdfoutput=1
\pdfcompresslevel=9
@@ -28,12 +24,10 @@ Index: texlive-base-2012.20120529/texmf/tex/generic/config/pdftexconfig.tex
\pdfhorigin=1 true in
\pdfvorigin=1 true in
\pdfpkresolution=600
-Index: texlive-base-2012.20120529/tlpkg/texlive.tlpdb
-===================================================================
---- texlive-base-2012.20120529.orig/tlpkg/texlive.tlpdb 2012-05-29 19:44:51.391359752 +0900
-+++ texlive-base-2012.20120529/tlpkg/texlive.tlpdb 2012-05-29 19:45:46.519463342 +0900
-@@ -122910,6 +122910,7 @@
- texmf/scripts/simpdftex/simpdftex
+--- texlive-base-2012.20121112.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2012.20121112/tlpkg/texlive.tlpdb
+@@ -122303,6 +122303,7 @@
+ texmf/fonts/map/pdftex/updmap/pdftex_ndl14.map
texmf/tex/generic/config/pdftex-dvi.tex
texmf/tex/generic/config/pdftexconfig.tex
+ texmf/tex/generic/config/pdftexconfig-paper.tex
diff --git a/texlive-base/debian/patches/series b/texlive-base/debian/patches/series
index bb7c70a..525e4b7 100644
--- a/texlive-base/debian/patches/series
+++ b/texlive-base/debian/patches/series
@@ -22,5 +22,4 @@ debian_updmap-search-path
# debian adaption
texdoc-see-and-zip
fix-natbib-add-spaces
-upstream_updmap-ignoring-settings
upstream_fix_babel_french_days
diff --git a/texlive-base/debian/patches/xdvi-config-paper-factorization b/texlive-base/debian/patches/xdvi-config-paper-factorization
index b134b18..2e3c508 100644
--- a/texlive-base/debian/patches/xdvi-config-paper-factorization
+++ b/texlive-base/debian/patches/xdvi-config-paper-factorization
@@ -4,10 +4,8 @@
tlpkg/texlive.tlpdb | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
-Index: texlive-base-2012.20120529/texmf/xdvi/XDvi
-===================================================================
---- texlive-base-2012.20120529.orig/texmf/xdvi/XDvi 2010-05-21 03:50:17.000000000 +0900
-+++ texlive-base-2012.20120529/texmf/xdvi/XDvi 2012-05-29 19:45:52.091471887 +0900
+--- texlive-base-2012.20121112.orig/texmf/xdvi/XDvi
++++ texlive-base-2012.20121112/texmf/xdvi/XDvi
@@ -21,7 +21,7 @@
!!! and greater flexibility for shrink values. Generating MF fonts shouldn't be an
!!! issue when using T1lib.
@@ -17,17 +15,13 @@ Index: texlive-base-2012.20120529/texmf/xdvi/XDvi
!!! This should be the best choice for modern displays with large color depth.
*thorough: true
-Index: texlive-base-2012.20120529/texmf/xdvi/XDvi-paper
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ texlive-base-2012.20120529/texmf/xdvi/XDvi-paper 2012-05-29 19:45:52.091471887 +0900
+--- /dev/null
++++ texlive-base-2012.20121112/texmf/xdvi/XDvi-paper
@@ -0,0 +1 @@
+*paper: a4
-Index: texlive-base-2012.20120529/tlpkg/texlive.tlpdb
-===================================================================
---- texlive-base-2012.20120529.orig/tlpkg/texlive.tlpdb 2012-05-29 19:45:46.519463342 +0900
-+++ texlive-base-2012.20120529/tlpkg/texlive.tlpdb 2012-05-29 19:45:52.135471949 +0900
-@@ -182471,6 +182471,7 @@
+--- texlive-base-2012.20121112.orig/tlpkg/texlive.tlpdb
++++ texlive-base-2012.20121112/tlpkg/texlive.tlpdb
+@@ -184464,6 +184464,7 @@
texmf/doc/man/man1/xdvi.man1.pdf
runfiles size=9
texmf/xdvi/XDvi
diff --git a/texlive-base/debian/texlive-base.links.dist b/texlive-base/debian/texlive-base.links.dist
index 85cce2f..0c58a1d 100644
--- a/texlive-base/debian/texlive-base.links.dist
+++ b/texlive-base/debian/texlive-base.links.dist
@@ -1 +1,5 @@
usr/share/texlive/texmf/web2c/texmf.cnf usr/share/texmf/web2c/texmf.cnf
+usr/bin/allcm usr/bin/allec
+usr/bin/kpsetool usr/bin/kpsepath
+usr/bin/kpsetool usr/bin/kpsexpand
+usr/bin/fmtutil usr/bin/mktexfmt
diff --git a/texlive-doc/debian/changelog b/texlive-doc/debian/changelog
index b35669a..4d8ce2f 100644
--- a/texlive-doc/debian/changelog
+++ b/texlive-doc/debian/changelog
@@ -1,3 +1,9 @@
+texlive-doc (2012.20121112-1) UNRELEASED; urgency=low
+
+ * new upstream checkout
+
+ -- Norbert Preining <preining@debian.org> Mon, 12 Nov 2012 07:52:50 +0900
+
texlive-doc (2012.20120611-1) unstable; urgency=low
* new upstream checkout (TL2012 release)
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index d8fffd4..e54bf05 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -1,12 +1,12 @@
-texlive-extra (2012.20120611-3) UNRELEASED; urgency=low
+texlive-extra (2012.20121112-1) UNRELEASED; urgency=low
- * UNRELEASED!!!
+ * new upstream checkout
* fix ulqda using Digest::SHA1 which is not available (LP: #1045516)
* pack texlive-latex-extra-doc with extreme compression (Closes: #675537)
* texlive-extra-utils recommends texlive-latex-base and
texlive-latex-recommended (for pdfjam support) (Closes: #691690)
- -- Norbert Preining <preining@debian.org> Tue, 30 Oct 2012 07:14:02 +0900
+ -- Norbert Preining <preining@debian.org> Mon, 12 Nov 2012 07:53:03 +0900
texlive-extra (2012.20120611-2) unstable; urgency=low
diff --git a/texlive-lang/debian/changelog b/texlive-lang/debian/changelog
index 159e06d..386d408 100644
--- a/texlive-lang/debian/changelog
+++ b/texlive-lang/debian/changelog
@@ -1,3 +1,9 @@
+texlive-lang (2012.20121112-1) UNRELEASED; urgency=low
+
+ * new upstream checkout
+
+ -- Norbert Preining <preining@debian.org> Mon, 12 Nov 2012 07:53:23 +0900
+
texlive-lang (2012.20120611-2) unstable; urgency=low
* move lgrenc.dfu from doc files to run files (Closes: #678545)
--
Debian packaging of texlive-nonbin)
Reply to: