[SCM] Debian packaging of texlive-nonbin) branch, master, updated. 4d43b9d336538a00a72fa291165c90cd6714f227
The following commit has been merged in the master branch:
commit 33076ebd5242698f0583642edbaf74ac22bc52c6
Author: Norbert Preining <preining@debian.org>
Date: Mon Nov 19 15:43:13 2012 +0900
remove old conflicts/replaces, add necessary for testing/unstable
updates to current
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index e37a40d..a7a050a 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -55,7 +55,6 @@ 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.20121112)
-replaces;texlive-base;texlive-binaries (<< 2012.20121112)
#
#
# collections -> debian package names plus source packages
@@ -64,8 +63,6 @@ replaces;texlive-base;texlive-binaries (<< 2012.20121112)
name;collection-basic;texlive-base;texlive-base
# contains texdoc
depends;texlive-base;luatex (>= 0.70.1)
-replaces;texlive-base;luatex (<< 0.45.0)
-conflicts;texlive-base;luatex (<< 0.46.0-5)
name;collection-genericrecommended;texlive-generic-recommended;texlive-base
name;collection-latex;texlive-latex-base;texlive-base
name;collection-latexrecommended;texlive-latex-recommended;texlive-base
@@ -134,9 +131,6 @@ name;collection-documentation-vietnamese;texlive-doc-vi;texlive-doc
# texlive-lang
name;collection-langafrican;texlive-lang-african;texlive-lang
name;collection-langarabic;texlive-lang-arabic;texlive-lang
-replaces;texlive-lang-arabic;arabtex, texlive-lang-arab
-conflicts;texlive-lang-arabic;arabtex, texlive-lang-arab
-provides;texlive-lang-arabic;arabtex, texlive-lang-arab
name;collection-langarmenian;texlive-lang-armenian;texlive-lang
name;collection-langcjk;texlive-lang-cjk;texlive-lang
name;collection-langcroatian;texlive-lang-croatian;texlive-lang
@@ -220,29 +214,22 @@ title;ptex-bin;transitional dummy package
description;ptex-bin;This is a transitional package for ptex-bin to ensure proper
description;ptex-bin;upgrade to texlive-lang-cjk. It can be safely removed after the installation is complete.
depends;ptex-bin;texlive-lang-cjk (>= 2011)
-conflicts;texlive-lang-cjk;ptex-bin (<< 2011)
conflicts;texlive-lang-cjk;ptex-base
conflicts;ptex-bin;ptex-base
title;texpower;transitional dummy package
description;texpower;This is a transitional package for texpower to ensure proper
description;texpower;upgrade to texlive-latex-extra. It can be safely removed after the installation is complete.
depends;texpower;texlive-latex-extra (>= 2011), texlive-fonts-extra (>= 2011)
-conflicts;texlive-latex-extra;texpower (<< 2011)
-conflicts;texlive-fonts-extra;texpower (<< 2011)
title;pdfjam;transitional dummy package
description;pdfjam;This is a transitional package for pdfjam to ensure proper
description;pdfjam;upgrade to texlive-extra-utils. It can be safely removed after the installation is complete.
depends;pdfjam;texlive-extra-utils (>= 2011)
-conflicts;texlive-extra-utils;pdfjam (<< 2011)
provides;texlive-extra-utils;pdfjam
-replaces;texlive-extra-utils;pdfjam
title;texlive-latex3;transitional dummy package
description;texlive-latex3;This is a transitional package for texlive-latex3 to ensure proper
description;texlive-latex3;upgrade to texlive-latex-recommended. It can be safely removed after the installation is complete.
depends;texlive-latex3;texlive-latex-recommended (>= 2011)
-conflicts;texlive-latex-recommended;texlive-latex3 (<< 2011)
provides;texlive-latex-recommended;texlive-latex3
-replaces;texlive-latex-recommended;texlive-latex3
#
# build dependencies
#
@@ -259,18 +246,10 @@ build-dep-indep;texlive-lang;sharutils, tex-common (>= 3), eperl, findutils (>=4
build-dep;texlive-extra;debhelper (>= 7.0.50~)
build-dep-indep;texlive-extra;sharutils, tex-common (>= 3), eperl, findutils (>=4.2.0)
#
-# replaces for the transition from 2009 -> 2012
-replaces;texlive-base;tex-common (<< 3)
-replaces;texlive-base;texlive-binaries (<< 2011)
-replaces;texlive-math-extra;texlive-latex-extra-doc (<< 2011)
-replaces;texlive-latex-extra-doc;texlive-math-extra (<< 2011)
-replaces;texlive-publishers-doc;texlive-latex-extra-doc (<< 2011)
-replaces;texlive-generic-recommended;texlive-latex-extra-doc (<< 2010)
-replaces;texlive-latex-recommended-doc;texlive-latex3 (<< 2010)
-replaces;texlive-latex-recommended-doc;texlive-latex-extra-doc (<< 2010)
-replaces;texlive-math-extra;texlive-latex-extra-doc (<< 2010)
-replaces;texlive-pictures-doc;texlive-latex-extra-doc (<< 2010)
-replaces;texlive-publishers-doc;texlive-latex-extra-doc (<< 2010)
+# replaces for the transition from 2012 -> running
+replaces;texlive-font-utils;texlive-binaries (<< 2012.20121112)
+replaces;texlive-lang-cyrillic;texlive-binaries (<< 2012.20121112)
+replaces;texlive-base;texlive-binaries (<< 2012.20121112)
#
# TITLE AND DESCRIPTIONS
#
@@ -312,7 +291,6 @@ depends;texlive-common;tex-common (>= 3)
# suggests texlive-fonts-extra
suggests;texlive-lang-polish;texlive-fonts-extra
recommends;texlive-pstricks;texlive-extra-utils
-conflicts;texlive-latex-base;ivritex (<= 1.1.1-5)
#
# texlive-extra-utils
#contains dviasm which is a python script
@@ -551,9 +529,7 @@ recommends;texlive-latex-recommended;latex-xcolor (>= 2.09)
# Replacements of packages already or formerly in Debian
#
# dvipdfmx in Debian
-replaces;texlive-base;dvipdfmx
provides;texlive-base;dvipdfmx
-conflicts;texlive-base;dvipdfmx
#
# Disabling in TeX Live packages and pulling in other packages
#
@@ -601,7 +577,6 @@ depends;texlive-full;cm-super (>= 0.3.3-3)
# texinfo
blacklist;tpm;texinfo;*
depends;texlive-full;texinfo (>= 4.8), info (>= 4.8)
-conflicts;texlive-base;texinfo (<< 4.8);;
#
# preview
blacklist;tpm;preview;*
@@ -620,13 +595,6 @@ recommends;texlive-fonts-recommended;tipa (>= 2:1.2-2.1)
# will NOT install tipa ... what a pain ... see #672348
depends;texlive-xetex;tipa (>= 2:1.2-2.1)
depends;texlive-full;tipa (>= 2:1.2-2.1)
-# REMOVE after that version has disappeared, move of realscripts!
-replaces;texlive-xetex;texlive-math-extra (<= 2011.20120322)
-breaks;texlive-xetex;texlive-math-extra (<= 2011.20120322)
-#
-# we overwrite files that used to be in contex
-replaces;texlive-latex-base;context (<< 2011)
-breaks;texlive-latex-base;context (<< 2011)
#
# latexdiff
blacklist;tpm;latexdiff;*
@@ -713,44 +681,8 @@ recommends;texlive-lang-cjk;latex-cjk-all (>= 4.6.0+cvs20060714-2)
recommends;texlive-lang-cjk;thailatex
depends;texlive-full;latex-cjk-all (>= 4.6.0+cvs20060714-2), thailatex
provides;texlive-lang-cjk;vfdata-morisawa5, okumura-clsfiles, ptex-jisfonts
-conflicts;texlive-lang-cjk;vfdata-morisawa5, okumura-clsfiles, ptex-jisfonts
-replaces;texlive-lang-cjk;ptex-bin, mendexk
-# ptex-base/ptex-bin/ptex-buildsupport: can go away, taken over
-# agreed by maintainer
-# okumura-clsfiles: can go away
-# need agreement of maintainer
-# OHURA Makoto <ohura@debian.org>
-# ptex-jisfonts: dvi2ps part is independent, ptex/jis/* files are here
-# what to do? OHURA Makoto <ohura@debian.org>
-# vfdata-morisawa5: can go away
-# agreed by maintainer
-# jbibtex-base/jbibtex*: no idea!!!
-#
-# possible replacements, but one has to check full coverage?!?
-# adobemapping -> adobe-japan1 and gs-cjk-resource
-# BLACKLIST arphic -> latex-cjk-chinese-arphic-bkai00mp, -gbsn00lp, -bsmi00lp, -gkai00mp
-# c90 -> contained in latex-cjk-thai
-# BLACKLIST cjk -> latex-cjk*
-# BLACKLIST cjkpunkt -> latex-cjk*
-# BLACKLIST cjkutils -> latex-cjk*
-# cns -> none?
-# ctex -> none?
-# BLACKLIST dnp -> contained in latex-cjk-japanese
-# BLACKLIST fonts-tlwg -> latex-fonts-thai-tlwg
-# BLACKLIST garuda-c90 -> latex-cjk-thai
-# hyphen-chinese -> ??
-# ipaex -> fonts-ipafont, fonts-ipaexfont (but no mappings)
-# japanese -> none
-# japanese-otf -> none
-# japanese-otf-uptex -> none
-# jfontmaps -> none
-# jsclasses -> none
-# BLACKLIST norasi-c90 -> latex-cjk-thai
-# BLACKLIST thailatex -> thailatex
-# uhc -> none?
-# BLACKLIST wadalab -> latex-cjk-japanese-wadalab
-# zhmetrics -> none?
-# zhspacing -> none?
+conflicts;texlive-lang-cjk;ptex-jisfonts
+replaces;texlive-lang-cjk;mendexk
#
# jadetex, xmltex, passivetex
# all packages which were contained in texlive-xmlhtml
--
Debian packaging of texlive-nonbin)
Reply to: