[SCM] Debian packaging of texlive-nonbin) branch, master, updated. debian/2013.20130523-1-7-g8d3af39
The following commit has been merged in the master branch:
commit ff9ba7196ee4e2e315bc961f45771eae3574f667
Author: Norbert Preining <preining@debian.org>
Date: Fri May 24 12:14:59 2013 +0900
rm_conffile: add thailatex files, remove 2009 ones, rework
diff --git a/all/debian/cfg.d/remove-conffile.cfg b/all/debian/cfg.d/remove-conffile.cfg
deleted file mode 100644
index 27ddaa1..0000000
--- a/all/debian/cfg.d/remove-conffile.cfg
+++ /dev/null
@@ -1,91 +0,0 @@
-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
-removeconffile;texlive-base;/etc/texmf/xdvi/XDvi
-removeconffile;texlive-base;/etc/texmf/dvips/config/alt-rule.pro
-removeconffile;texlive-base;/etc/texmf/dvips/config/canonex.cfg
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.bakoma
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.canonex
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.cx
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.deskjet
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.dvired
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.epson
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.ibmvga
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.ljfour
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.luc
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.mbn
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.mga
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.mirrorprint
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.ot2
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.qms
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.toshiba
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.unms
-removeconffile;texlive-base;/etc/texmf/dvips/config/config.xyp
-removeconffile;texlive-base;/etc/texmf/dvips/config/cx.cfg
-removeconffile;texlive-base;/etc/texmf/dvips/config/deskjet.cfg
-removeconffile;texlive-base;/etc/texmf/dvips/config/dfaxhigh.cfg
-removeconffile;texlive-base;/etc/texmf/dvips/config/dvired.cfg
-removeconffile;texlive-base;/etc/texmf/dvips/config/epson.cfg
-removeconffile;texlive-base;/etc/texmf/dvips/config/ibmvga.cfg
-removeconffile;texlive-base;/etc/texmf/dvips/config/ljfour.cfg
-removeconffile;texlive-base;/etc/texmf/dvips/config/qms.cfg
-removeconffile;texlive-base;/etc/texmf/dvips/config/toshiba.cfg
-removeconffile;texlive-base;/etc/texmf/hyphen.d/09texlive-base.cnf
-removeconffile;texlive-metapost;/etc/texmf/fmt.d/10texlive-metapost.cnf
-removeconffile;texlive-lang-ukenglish;/etc/texmf/hyphen.d/10texlive-lang-ukenglish.cnf
-removeconffile;texlive-base;/etc/texmf/language.d/09texlive-base.cnf
-removeconffile;texlive-lang-croatian;/etc/texmf/language.d/10texlive-lang-croatian.cnf
-removeconffile;texlive-lang-cyrillic;/etc/texmf/language.d/10texlive-lang-cyrillic.cnf
-removeconffile;texlive-lang-czechslovak;/etc/texmf/language.d/10texlive-lang-czechslovak.cnf
-removeconffile;texlive-lang-danish;/etc/texmf/language.d/10texlive-lang-danish.cnf
-removeconffile;texlive-lang-dutch;/etc/texmf/language.d/10texlive-lang-dutch.cnf
-removeconffile;texlive-lang-finnish;/etc/texmf/language.d/10texlive-lang-finnish.cnf
-removeconffile;texlive-lang-french;/etc/texmf/language.d/10texlive-lang-french.cnf
-removeconffile;texlive-lang-german;/etc/texmf/language.d/10texlive-lang-german.cnf
-removeconffile;texlive-lang-greek;/etc/texmf/language.d/10texlive-lang-greek.cnf
-removeconffile;texlive-lang-hungarian;/etc/texmf/language.d/10texlive-lang-hungarian.cnf
-removeconffile;texlive-lang-italian;/etc/texmf/language.d/10texlive-lang-italian.cnf
-removeconffile;texlive-lang-latin;/etc/texmf/language.d/10texlive-lang-latin.cnf
-removeconffile;texlive-lang-mongolian;/etc/texmf/language.d/10texlive-lang-mongolian.cnf
-removeconffile;texlive-lang-norwegian;/etc/texmf/language.d/10texlive-lang-norwegian.cnf
-removeconffile;texlive-lang-other;/etc/texmf/language.d/10texlive-lang-other.cnf
-removeconffile;texlive-lang-polish;/etc/texmf/language.d/10texlive-lang-polish.cnf
-removeconffile;texlive-lang-portuguese;/etc/texmf/language.d/10texlive-lang-portuguese.cnf
-removeconffile;texlive-lang-spanish;/etc/texmf/language.d/10texlive-lang-spanish.cnf
-removeconffile;texlive-lang-swedish;/etc/texmf/language.d/10texlive-lang-swedish.cnf
-removeconffile;texlive-lang-ukenglish;/etc/texmf/language.d/10texlive-lang-ukenglish.cnf
-removeconffile;texlive-base;/etc/texmf/metafont/misc/modes.mf
-removeconffile;texlive-base;/etc/texmf/texdoc/texdoc.cnf
-removeconffile;texlive-latex-base;/etc/texmf/tex/latex/config/color.cfg
-removeconffile;texlive-latex-base;/etc/texmf/tex/latex/config/graphics.cfg
-removeconffile;texlive-latex-base;/etc/texmf/tex/latex/config/hyperref.cfg
-removeconffile;texlive-latex-extra;/etc/texmf/tex/latex/contour/contour.cfg
-removeconffile;texlive-pictures;/etc/texmf/tex/latex/pict2e/pict2e.cfg
-removeconffile;texlive-base;/etc/texmf/updmap.d/10texlive-base.cfg
-removeconffile;texlive-fonts-extra;/etc/texmf/updmap.d/10texlive-fonts-extra.cfg
-removeconffile;texlive-fonts-recommended;/etc/texmf/updmap.d/10texlive-fonts-recommended.cfg
-removeconffile;texlive-games;/etc/texmf/updmap.d/10texlive-games.cfg
-removeconffile;texlive-lang-african;/etc/texmf/updmap.d/10texlive-lang-african.cfg
-removeconffile;texlive-lang-arabic;/etc/texmf/updmap.d/10texlive-lang-arabic.cfg
-removeconffile;texlive-lang-cyrillic;/etc/texmf/updmap.d/10texlive-lang-cyrillic.cfg
-removeconffile;texlive-lang-czechslovak;/etc/texmf/updmap.d/10texlive-lang-czechslovak.cfg
-removeconffile;texlive-lang-french;/etc/texmf/updmap.d/10texlive-lang-french.cfg
-removeconffile;texlive-lang-greek;/etc/texmf/updmap.d/10texlive-lang-greek.cfg
-removeconffile;texlive-lang-hebrew;/etc/texmf/updmap.d/10texlive-lang-hebrew.cfg
-removeconffile;texlive-lang-indic;/etc/texmf/updmap.d/10texlive-lang-indic.cfg
-removeconffile;texlive-lang-lithuanian;/etc/texmf/updmap.d/10texlive-lang-lithuanian.cfg
-removeconffile;texlive-lang-mongolian;/etc/texmf/updmap.d/10texlive-lang-mongolian.cfg
-removeconffile;texlive-lang-polish;/etc/texmf/updmap.d/10texlive-lang-polish.cfg
-removeconffile;texlive-lang-vietnamese;/etc/texmf/updmap.d/10texlive-lang-vietnamese.cfg
-removeconffile;texlive-latex-base;/etc/texmf/updmap.d/10texlive-latex-base.cfg
-removeconffile;texlive-latex-extra;/etc/texmf/updmap.d/10texlive-latex-extra.cfg
-removeconffile;texlive-math-extra;/etc/texmf/updmap.d/10texlive-math-extra.cfg
-removeconffile;texlive-omega;/etc/texmf/updmap.d/10texlive-omega.cfg
-removeconffile;texlive-pictures;/etc/texmf/updmap.d/10texlive-pictures.cfg
-removeconffile;texlive-science;/etc/texmf/updmap.d/10texlive-science.cfg
-#
-# vim:set fileencoding=utf-8: #
-# Local Variables:
-# coding: utf-8
-# End:
diff --git a/all/debian/tpm2deb-bin.pl b/all/debian/tpm2deb-bin.pl
index 4e19b2d..b60c0a2 100755
--- a/all/debian/tpm2deb-bin.pl
+++ b/all/debian/tpm2deb-bin.pl
@@ -359,23 +359,6 @@ sub make_maintainer {
my ($package) = @_;
print "Making maintainer scripts for $package in $debdest...\n";
&mkpath($debdest);
- # create debian/maintscript
- if ((-r "$debdest/$package.maintscript.dist") ||
- ($#{$TeXLive{'binary'}{$package}{'remove_conffile'}} >= 0)) {
- open(MAINTHELP, ">$debdest/$package.maintscript")
- or die("Cannot open $debdest/$package.maintscript for writing");
- merge_into("$debdest/$package.maintscript.dist", MAINTSCRIPT);
- #
- # handling of conffile moves
- if ($#{$TeXLive{'binary'}{$package}{'remove_conffile'}} >= 0) {
- for my $conffile (@{$TeXLive{'binary'}{$package}{'remove_conffile'}}) {
- my $srcpkg = $TeXLive{'binary'}{$package}{'source_package'};
- my $oldversion = $TeXLive{'source'}{$srcpkg}{'old_version'};
- print MAINTHELP "rm_conffile $conffile $oldversion\n";
- }
- }
- close(MAINTHELP);
- }
for my $type (qw/postinst preinst postrm prerm/) {
$opt_debug && print STDERR "Handling $type ";
if ((-r "$debdest/$type.pre") ||
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index 6f6e68e..5f56b28 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -33,14 +33,6 @@ latest-version;texlive-base;2013.20130512
latest-version;texlive-extra;2013.20130512
latest-version;texlive-lang;2013.20130512
#
-# old versions
-# these version numbers are used for the remove conffile directive below
-# since we don't remove anything for 2012, we keep them at the last
-# released version on wheezy
-old-version;texlive-lang;2009-3
-old-version;texlive-extra;2009-10
-old-version;texlive-base;2009-11+squeeze1
-#
# texlive-base needs newer texlive-binaries than "latest-version" because
# of the libpaper patches. No need to rebuild and update the rest
### not needed at the moment
@@ -233,7 +225,6 @@ ignore;texmf-dist/scripts/ps2eps/ps2eps.pl;;
#
include-config;cfg.d/info-man-handling.cfg
include-config;cfg.d/debian-replacement.cfg
-include-config;cfg.d/remove-conffile.cfg
include-config;cfg.d/font-ignore.cfg
#
#
diff --git a/all/debian/tpm2debcommon.pm b/all/debian/tpm2debcommon.pm
index 47e5751..7229134 100755
--- a/all/debian/tpm2debcommon.pm
+++ b/all/debian/tpm2debcommon.pm
@@ -712,12 +712,6 @@ sub read_one_config_file {
$TeXLive{'all'}{'tl_common_version'} = "$a";
next;
}
- if ($type eq "old-version") {
- my ($b) = @rest;
- $opt_debug && print STDERR "b=$b.\n";
- $TeXLive{'source'}{$a}{'old_version'} = "$b";
- next;
- }
if ($type eq "latest-version") {
my ($b) = @rest;
$opt_debug && print STDERR "b=$b.\n";
@@ -801,12 +795,6 @@ sub read_one_config_file {
$TeXLive{'all'}{'linkedscript'}{$a} = $b;
next;
}
- # removeconffile;texlive-lang-french;etc/texmf/language.d/10texlive-lang-french.cnf
- if ($type eq "removeconffile") {
- my ($b) = @rest;
- push @{$TeXLive{'binary'}{$a}{'remove_conffile'}}, $b;
- next;
- }
if ($type eq "include-config") {
read_one_config_file($dn,$a);
next;
diff --git a/texlive-lang/debian/texlive-lang-other.maintscript b/texlive-lang/debian/texlive-lang-other.maintscript
new file mode 100644
index 0000000..8cb3952
--- /dev/null
+++ b/texlive-lang/debian/texlive-lang-other.maintscript
@@ -0,0 +1,2 @@
+rm_conffile /etc/texmf/hyphen.d/20thailatex.cnf 2013.20130523-2~ thailatex
+rm_conffile /etc/emacs/site-start.d/50thailatex.el 2013.20130523-2~ thailatex
--
Debian packaging of texlive-nonbin)
Reply to: