[texlive-nonbin] 01/04: try new checkout, fix some bugs, create loads of stupid transitional packages
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-nonbin.
commit a696206cb4c001f74a234451b612acec6459fcc3
Author: Norbert Preining <preining@debian.org>
Date: Wed Sep 4 15:19:16 2013 +0900
try new checkout, fix some bugs, create loads of stupid transitional packages
---
all/debian/cfg.d/font-ignore.cfg | 12 +-
all/debian/cfg.d/package-naming.cfg | 25 +-
all/debian/cfg.d/upgrade-transitional-packages.cfg | 510 ++++++++++++++++++++
all/debian/tpm2deb.cfg | 2 +
all/debian/tpm2debcommon.pm | 11 +-
all/debian/transitional-packages | 39 ++
scripts/create-transitional-packages | 23 +
texlive-base/debian/changelog | 10 +
texlive-base/debian/texlive-base.maintscript | 1 +
.../debian/texlive-fonts-recommended.links.dist | 9 +-
.../texlive-fonts-recommended.type1-fontdirs | 1 -
texlive-extra/debian/changelog | 9 +
.../debian/texlive-extra-utils.links.dist | 1 +
texlive-lang/debian/changelog | 7 +
14 files changed, 630 insertions(+), 30 deletions(-)
diff --git a/all/debian/cfg.d/font-ignore.cfg b/all/debian/cfg.d/font-ignore.cfg
index 231ab3c..89ed4e4 100644
--- a/all/debian/cfg.d/font-ignore.cfg
+++ b/all/debian/cfg.d/font-ignore.cfg
@@ -124,8 +124,18 @@ blacklist;file;texmf-dist/fonts/truetype/public/amiri/amiri-bold.ttf
blacklist;file;texmf-dist/fonts/truetype/public/amiri/amiri-boldslanted.ttf
blacklist;file;texmf-dist/fonts/truetype/public/amiri/amiri-regular.ttf
blacklist;file;texmf-dist/fonts/truetype/public/amiri/amiri-slanted.ttf
-depends;texlive-fonts-recommended;ttf-marvosym
+# forget about marvosym ttf package, we don't need the ttf font here
+#depends;texlive-fonts-recommended;ttf-marvosym
blacklist;file;texmf-dist/fonts/truetype/public/marvosym/marvosym.ttf
+depends;texlive-fonts-recommended;xfonts-scalable
+blacklist;file;texmf-dist/fonts/type1/bitstrea/charter/bchri8a.pfb
+blacklist;file;texmf-dist/fonts/afm/bitstrea/charter/bchri8a.afm
+blacklist;file;texmf-dist/fonts/type1/bitstrea/charter/bchr8a.pfb
+blacklist;file;texmf-dist/fonts/afm/bitstrea/charter/bchr8a.afm
+blacklist;file;texmf-dist/fonts/type1/bitstrea/charter/bchb8a.pfb
+blacklist;file;texmf-dist/fonts/afm/bitstrea/charter/bchb8a.afm
+blacklist;file;texmf-dist/fonts/type1/bitstrea/charter/bchbi8a.pfb
+blacklist;file;texmf-dist/fonts/afm/bitstrea/charter/bchbi8a.afm
depends;texlive-fonts-extra;fonts-stix
blacklist;file;texmf-dist/fonts/opentype/public/stix/STIXGeneralBolIta.otf
blacklist;file;texmf-dist/fonts/opentype/public/stix/STIXGeneralBol.otf
diff --git a/all/debian/cfg.d/package-naming.cfg b/all/debian/cfg.d/package-naming.cfg
index 7219560..4970b65 100644
--- a/all/debian/cfg.d/package-naming.cfg
+++ b/all/debian/cfg.d/package-naming.cfg
@@ -30,24 +30,6 @@ name;collection-publishers;texlive-publishers;texlive-extra
name;collection-humanities;texlive-humanities;texlive-extra
name;collection-science;texlive-science;texlive-extra
#
-# texlive-doc has disappeared!
-replaces;texlive-base;texlive-doc-base
-replaces;texlive-lang-arabic;texlive-doc-ar
-replaces;texlive-lang-european;texlive-doc-bg, texlive-doc-nl, texlive-doc-fi, texlive-doc-si, texlive-doc-tr
-replaces;texlive-lang-cjk;texlive-doc-zh
-replaces;texlive-lang-czechslovak;texlive-doc-cs+sk
-replaces;texlive-base;texlive-doc-en
-replaces;texlive-lang-english;texlive-doc-en
-replaces;texlive-lang-french;texlive-doc-fr
-replaces;texlive-lang-german;texlive-doc-de
-replaces;texlive-lang-italian;texlive-doc-it
-replaces;texlive-lang-cjk;texlive-doc-ja, texlive-doc-ko
-replaces;texlive-lang-other;texlive-doc-mn, texlive-doc-vi, texlive-doc-th
-replaces;texlive-lang-polish;texlive-doc-pl
-replaces;texlive-lang-portuguese;texlive-doc-pt
-replaces;texlive-lang-cyrillic;texlive-doc-ru, texlive-doc-rs, texlive-doc-uk, texlive-doc-bg, texlive-doc-mn
-replaces;texlive-lang-spanish;texlive-doc-es
-#
# texlive-lang
name;collection-langafrican;texlive-lang-african;texlive-lang
name;collection-langarabic;texlive-lang-arabic;texlive-lang
@@ -56,8 +38,6 @@ name;collection-langcyrillic;texlive-lang-cyrillic;texlive-lang
name;collection-langczechslovak;texlive-lang-czechslovak;texlive-lang
name;collection-langenglish;texlive-lang-english;texlive-lang
name;collection-langeuropean;texlive-lang-european;texlive-lang
-replaces;texlive-lang-european;texlive-lang-armenian, texlive-lang-croatian, texlive-lang-danish, texlive-lang-dutch, texlive-lang-finnish, texlive-lang-hungarian, texlive-lang-latin, texlive-lang-latvian, texlive-lang-lithuanian, texlive-lang-norwegian, texlive-lang-swedish
-conflicts;texlive-base;texlive-lang-armenian, texlive-lang-croatian, texlive-lang-danish, texlive-lang-dutch, texlive-lang-finnish, texlive-lang-hungarian, texlive-lang-latin, texlive-lang-latvian, texlive-lang-lithuanian, texlive-lang-norwegian, texlive-lang-swedish
name;collection-langfrench;texlive-lang-french;texlive-lang
name;collection-langgerman;texlive-lang-german;texlive-lang
name;collection-langgreek;texlive-lang-greek;texlive-lang
@@ -65,12 +45,9 @@ name;collection-langindic;texlive-lang-indic;texlive-lang
depends;texlive-lang-indic;python
name;collection-langitalian;texlive-lang-italian;texlive-lang
name;collection-langother;texlive-lang-other;texlive-lang
-replaces;texlive-lang-other;texlive-lang-hebrew, texlive-lang-tibetan, texlive-lang-vietnamese
-conflicts;texlive-base;texlive-lang-hebrew, texlive-lang-tibetan, texlive-lang-vietnamese
-replaces;texlive-lang-cyrillic;texlive-lang-mongolian
-conflicts;texlive-base;texlive-lang-mongolian
name;collection-langpolish;texlive-lang-polish;texlive-lang
name;collection-langportuguese;texlive-lang-portuguese;texlive-lang
name;collection-langspanish;texlive-lang-spanish;texlive-lang
#
# add necessary conflicts to get rid of the old packges
+# see upgrade-transitional-packages.cfg
diff --git a/all/debian/cfg.d/upgrade-transitional-packages.cfg b/all/debian/cfg.d/upgrade-transitional-packages.cfg
new file mode 100644
index 0000000..e4ffbd7
--- /dev/null
+++ b/all/debian/cfg.d/upgrade-transitional-packages.cfg
@@ -0,0 +1,510 @@
+addpackages;;texlive-doc-ar
+name;collection-foobar;texlive-doc-ar;texlive-lang
+title;texlive-doc-ar;transitional dummy package
+bin-section;texlive-doc-ar;oldlibs
+bin-priority;texlive-doc-ar;extra
+description;texlive-doc-ar;This is a transitional package for texlive-doc-ar to ensure proper
+description;texlive-doc-ar;upgrade to texlive-lang-arabic.
+description;texlive-doc-ar;It can be safely removed after the installation is complete.
+depends;texlive-doc-ar;texlive-lang-arabic
+dependsnot;texlive-lang-all;texlive-doc-ar
+dependsnot;texlive-full;texlive-doc-ar
+conflicts;texlive-base;texlive-doc-ar (<< 2013)
+replaces;texlive-lang-arabic;texlive-doc-ar (<< 2013)
+addpackages;;texlive-doc-base
+name;collection-foobar;texlive-doc-base;texlive-lang
+title;texlive-doc-base;transitional dummy package
+bin-section;texlive-doc-base;oldlibs
+bin-priority;texlive-doc-base;extra
+description;texlive-doc-base;This is a transitional package for texlive-doc-base to ensure proper
+description;texlive-doc-base;upgrade to texlive-base.
+description;texlive-doc-base;It can be safely removed after the installation is complete.
+depends;texlive-doc-base;texlive-base
+dependsnot;texlive-lang-all;texlive-doc-base
+dependsnot;texlive-full;texlive-doc-base
+conflicts;texlive-base;texlive-doc-base (<< 2013)
+replaces;texlive-base;texlive-doc-base (<< 2013)
+addpackages;;texlive-doc-bg
+name;collection-foobar;texlive-doc-bg;texlive-lang
+title;texlive-doc-bg;transitional dummy package
+bin-section;texlive-doc-bg;oldlibs
+bin-priority;texlive-doc-bg;extra
+description;texlive-doc-bg;This is a transitional package for texlive-doc-bg to ensure proper
+description;texlive-doc-bg;upgrade to texlive-lang-european, texlive-lang-cyrillic.
+description;texlive-doc-bg;It can be safely removed after the installation is complete.
+depends;texlive-doc-bg;texlive-lang-european, texlive-lang-cyrillic
+dependsnot;texlive-lang-all;texlive-doc-bg
+dependsnot;texlive-full;texlive-doc-bg
+conflicts;texlive-base;texlive-doc-bg (<< 2013)
+replaces;texlive-lang-european;texlive-doc-bg (<< 2013)
+replaces;texlive-lang-cyrillic;texlive-doc-bg (<< 2013)
+addpackages;;texlive-doc-cs+sk
+name;collection-foobar;texlive-doc-cs+sk;texlive-lang
+title;texlive-doc-cs+sk;transitional dummy package
+bin-section;texlive-doc-cs+sk;oldlibs
+bin-priority;texlive-doc-cs+sk;extra
+description;texlive-doc-cs+sk;This is a transitional package for texlive-doc-cs+sk to ensure proper
+description;texlive-doc-cs+sk;upgrade to texlive-lang-czechslovak.
+description;texlive-doc-cs+sk;It can be safely removed after the installation is complete.
+depends;texlive-doc-cs+sk;texlive-lang-czechslovak
+dependsnot;texlive-lang-all;texlive-doc-cs+sk
+dependsnot;texlive-full;texlive-doc-cs+sk
+conflicts;texlive-base;texlive-doc-cs+sk (<< 2013)
+replaces;texlive-lang-czechslovak;texlive-doc-cs+sk (<< 2013)
+addpackages;;texlive-doc-de
+name;collection-foobar;texlive-doc-de;texlive-lang
+title;texlive-doc-de;transitional dummy package
+bin-section;texlive-doc-de;oldlibs
+bin-priority;texlive-doc-de;extra
+description;texlive-doc-de;This is a transitional package for texlive-doc-de to ensure proper
+description;texlive-doc-de;upgrade to texlive-lang-german.
+description;texlive-doc-de;It can be safely removed after the installation is complete.
+depends;texlive-doc-de;texlive-lang-german
+dependsnot;texlive-lang-all;texlive-doc-de
+dependsnot;texlive-full;texlive-doc-de
+conflicts;texlive-base;texlive-doc-de (<< 2013)
+replaces;texlive-lang-german;texlive-doc-de (<< 2013)
+addpackages;;texlive-doc-en
+name;collection-foobar;texlive-doc-en;texlive-lang
+title;texlive-doc-en;transitional dummy package
+bin-section;texlive-doc-en;oldlibs
+bin-priority;texlive-doc-en;extra
+description;texlive-doc-en;This is a transitional package for texlive-doc-en to ensure proper
+description;texlive-doc-en;upgrade to texlive-lang-english, texlive-base.
+description;texlive-doc-en;It can be safely removed after the installation is complete.
+depends;texlive-doc-en;texlive-lang-english, texlive-base
+dependsnot;texlive-lang-all;texlive-doc-en
+dependsnot;texlive-full;texlive-doc-en
+conflicts;texlive-base;texlive-doc-en (<< 2013)
+replaces;texlive-lang-english;texlive-doc-en (<< 2013)
+replaces;texlive-base;texlive-doc-en (<< 2013)
+addpackages;;texlive-doc-es
+name;collection-foobar;texlive-doc-es;texlive-lang
+title;texlive-doc-es;transitional dummy package
+bin-section;texlive-doc-es;oldlibs
+bin-priority;texlive-doc-es;extra
+description;texlive-doc-es;This is a transitional package for texlive-doc-es to ensure proper
+description;texlive-doc-es;upgrade to texlive-lang-spanish.
+description;texlive-doc-es;It can be safely removed after the installation is complete.
+depends;texlive-doc-es;texlive-lang-spanish
+dependsnot;texlive-lang-all;texlive-doc-es
+dependsnot;texlive-full;texlive-doc-es
+conflicts;texlive-base;texlive-doc-es (<< 2013)
+replaces;texlive-lang-spanish;texlive-doc-es (<< 2013)
+addpackages;;texlive-doc-fi
+name;collection-foobar;texlive-doc-fi;texlive-lang
+title;texlive-doc-fi;transitional dummy package
+bin-section;texlive-doc-fi;oldlibs
+bin-priority;texlive-doc-fi;extra
+description;texlive-doc-fi;This is a transitional package for texlive-doc-fi to ensure proper
+description;texlive-doc-fi;upgrade to texlive-lang-european.
+description;texlive-doc-fi;It can be safely removed after the installation is complete.
+depends;texlive-doc-fi;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-doc-fi
+dependsnot;texlive-full;texlive-doc-fi
+conflicts;texlive-base;texlive-doc-fi (<< 2013)
+replaces;texlive-lang-european;texlive-doc-fi (<< 2013)
+addpackages;;texlive-doc-fr
+name;collection-foobar;texlive-doc-fr;texlive-lang
+title;texlive-doc-fr;transitional dummy package
+bin-section;texlive-doc-fr;oldlibs
+bin-priority;texlive-doc-fr;extra
+description;texlive-doc-fr;This is a transitional package for texlive-doc-fr to ensure proper
+description;texlive-doc-fr;upgrade to texlive-lang-french.
+description;texlive-doc-fr;It can be safely removed after the installation is complete.
+depends;texlive-doc-fr;texlive-lang-french
+dependsnot;texlive-lang-all;texlive-doc-fr
+dependsnot;texlive-full;texlive-doc-fr
+conflicts;texlive-base;texlive-doc-fr (<< 2013)
+replaces;texlive-lang-french;texlive-doc-fr (<< 2013)
+addpackages;;texlive-doc-it
+name;collection-foobar;texlive-doc-it;texlive-lang
+title;texlive-doc-it;transitional dummy package
+bin-section;texlive-doc-it;oldlibs
+bin-priority;texlive-doc-it;extra
+description;texlive-doc-it;This is a transitional package for texlive-doc-it to ensure proper
+description;texlive-doc-it;upgrade to texlive-lang-italian.
+description;texlive-doc-it;It can be safely removed after the installation is complete.
+depends;texlive-doc-it;texlive-lang-italian
+dependsnot;texlive-lang-all;texlive-doc-it
+dependsnot;texlive-full;texlive-doc-it
+conflicts;texlive-base;texlive-doc-it (<< 2013)
+replaces;texlive-lang-italian;texlive-doc-it (<< 2013)
+addpackages;;texlive-doc-ja
+name;collection-foobar;texlive-doc-ja;texlive-lang
+title;texlive-doc-ja;transitional dummy package
+bin-section;texlive-doc-ja;oldlibs
+bin-priority;texlive-doc-ja;extra
+description;texlive-doc-ja;This is a transitional package for texlive-doc-ja to ensure proper
+description;texlive-doc-ja;upgrade to texlive-lang-cjk.
+description;texlive-doc-ja;It can be safely removed after the installation is complete.
+depends;texlive-doc-ja;texlive-lang-cjk
+dependsnot;texlive-lang-all;texlive-doc-ja
+dependsnot;texlive-full;texlive-doc-ja
+conflicts;texlive-base;texlive-doc-ja (<< 2013)
+replaces;texlive-lang-cjk;texlive-doc-ja (<< 2013)
+addpackages;;texlive-doc-ko
+name;collection-foobar;texlive-doc-ko;texlive-lang
+title;texlive-doc-ko;transitional dummy package
+bin-section;texlive-doc-ko;oldlibs
+bin-priority;texlive-doc-ko;extra
+description;texlive-doc-ko;This is a transitional package for texlive-doc-ko to ensure proper
+description;texlive-doc-ko;upgrade to texlive-lang-cjk.
+description;texlive-doc-ko;It can be safely removed after the installation is complete.
+depends;texlive-doc-ko;texlive-lang-cjk
+dependsnot;texlive-lang-all;texlive-doc-ko
+dependsnot;texlive-full;texlive-doc-ko
+conflicts;texlive-base;texlive-doc-ko (<< 2013)
+replaces;texlive-lang-cjk;texlive-doc-ko (<< 2013)
+addpackages;;texlive-doc-mn
+name;collection-foobar;texlive-doc-mn;texlive-lang
+title;texlive-doc-mn;transitional dummy package
+bin-section;texlive-doc-mn;oldlibs
+bin-priority;texlive-doc-mn;extra
+description;texlive-doc-mn;This is a transitional package for texlive-doc-mn to ensure proper
+description;texlive-doc-mn;upgrade to texlive-lang-other, texlive-lang-cyrillic.
+description;texlive-doc-mn;It can be safely removed after the installation is complete.
+depends;texlive-doc-mn;texlive-lang-other, texlive-lang-cyrillic
+dependsnot;texlive-lang-all;texlive-doc-mn
+dependsnot;texlive-full;texlive-doc-mn
+conflicts;texlive-base;texlive-doc-mn (<< 2013)
+replaces;texlive-lang-other;texlive-doc-mn (<< 2013)
+replaces;texlive-lang-cyrillic;texlive-doc-mn (<< 2013)
+addpackages;;texlive-doc-nl
+name;collection-foobar;texlive-doc-nl;texlive-lang
+title;texlive-doc-nl;transitional dummy package
+bin-section;texlive-doc-nl;oldlibs
+bin-priority;texlive-doc-nl;extra
+description;texlive-doc-nl;This is a transitional package for texlive-doc-nl to ensure proper
+description;texlive-doc-nl;upgrade to texlive-lang-european.
+description;texlive-doc-nl;It can be safely removed after the installation is complete.
+depends;texlive-doc-nl;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-doc-nl
+dependsnot;texlive-full;texlive-doc-nl
+conflicts;texlive-base;texlive-doc-nl (<< 2013)
+replaces;texlive-lang-european;texlive-doc-nl (<< 2013)
+addpackages;;texlive-doc-pl
+name;collection-foobar;texlive-doc-pl;texlive-lang
+title;texlive-doc-pl;transitional dummy package
+bin-section;texlive-doc-pl;oldlibs
+bin-priority;texlive-doc-pl;extra
+description;texlive-doc-pl;This is a transitional package for texlive-doc-pl to ensure proper
+description;texlive-doc-pl;upgrade to texlive-lang-polish.
+description;texlive-doc-pl;It can be safely removed after the installation is complete.
+depends;texlive-doc-pl;texlive-lang-polish
+dependsnot;texlive-lang-all;texlive-doc-pl
+dependsnot;texlive-full;texlive-doc-pl
+conflicts;texlive-base;texlive-doc-pl (<< 2013)
+replaces;texlive-lang-polish;texlive-doc-pl (<< 2013)
+addpackages;;texlive-doc-pt
+name;collection-foobar;texlive-doc-pt;texlive-lang
+title;texlive-doc-pt;transitional dummy package
+bin-section;texlive-doc-pt;oldlibs
+bin-priority;texlive-doc-pt;extra
+description;texlive-doc-pt;This is a transitional package for texlive-doc-pt to ensure proper
+description;texlive-doc-pt;upgrade to texlive-lang-portuguese.
+description;texlive-doc-pt;It can be safely removed after the installation is complete.
+depends;texlive-doc-pt;texlive-lang-portuguese
+dependsnot;texlive-lang-all;texlive-doc-pt
+dependsnot;texlive-full;texlive-doc-pt
+conflicts;texlive-base;texlive-doc-pt (<< 2013)
+replaces;texlive-lang-portuguese;texlive-doc-pt (<< 2013)
+addpackages;;texlive-doc-rs
+name;collection-foobar;texlive-doc-rs;texlive-lang
+title;texlive-doc-rs;transitional dummy package
+bin-section;texlive-doc-rs;oldlibs
+bin-priority;texlive-doc-rs;extra
+description;texlive-doc-rs;This is a transitional package for texlive-doc-rs to ensure proper
+description;texlive-doc-rs;upgrade to texlive-lang-cyrillic.
+description;texlive-doc-rs;It can be safely removed after the installation is complete.
+depends;texlive-doc-rs;texlive-lang-cyrillic
+dependsnot;texlive-lang-all;texlive-doc-rs
+dependsnot;texlive-full;texlive-doc-rs
+conflicts;texlive-base;texlive-doc-rs (<< 2013)
+replaces;texlive-lang-cyrillic;texlive-doc-rs (<< 2013)
+addpackages;;texlive-doc-ru
+name;collection-foobar;texlive-doc-ru;texlive-lang
+title;texlive-doc-ru;transitional dummy package
+bin-section;texlive-doc-ru;oldlibs
+bin-priority;texlive-doc-ru;extra
+description;texlive-doc-ru;This is a transitional package for texlive-doc-ru to ensure proper
+description;texlive-doc-ru;upgrade to texlive-lang-cyrillic.
+description;texlive-doc-ru;It can be safely removed after the installation is complete.
+depends;texlive-doc-ru;texlive-lang-cyrillic
+dependsnot;texlive-lang-all;texlive-doc-ru
+dependsnot;texlive-full;texlive-doc-ru
+conflicts;texlive-base;texlive-doc-ru (<< 2013)
+replaces;texlive-lang-cyrillic;texlive-doc-ru (<< 2013)
+addpackages;;texlive-doc-si
+name;collection-foobar;texlive-doc-si;texlive-lang
+title;texlive-doc-si;transitional dummy package
+bin-section;texlive-doc-si;oldlibs
+bin-priority;texlive-doc-si;extra
+description;texlive-doc-si;This is a transitional package for texlive-doc-si to ensure proper
+description;texlive-doc-si;upgrade to texlive-lang-european.
+description;texlive-doc-si;It can be safely removed after the installation is complete.
+depends;texlive-doc-si;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-doc-si
+dependsnot;texlive-full;texlive-doc-si
+conflicts;texlive-base;texlive-doc-si (<< 2013)
+replaces;texlive-lang-european;texlive-doc-si (<< 2013)
+addpackages;;texlive-doc-th
+name;collection-foobar;texlive-doc-th;texlive-lang
+title;texlive-doc-th;transitional dummy package
+bin-section;texlive-doc-th;oldlibs
+bin-priority;texlive-doc-th;extra
+description;texlive-doc-th;This is a transitional package for texlive-doc-th to ensure proper
+description;texlive-doc-th;upgrade to texlive-lang-other.
+description;texlive-doc-th;It can be safely removed after the installation is complete.
+depends;texlive-doc-th;texlive-lang-other
+dependsnot;texlive-lang-all;texlive-doc-th
+dependsnot;texlive-full;texlive-doc-th
+conflicts;texlive-base;texlive-doc-th (<< 2013)
+replaces;texlive-lang-other;texlive-doc-th (<< 2013)
+addpackages;;texlive-doc-tr
+name;collection-foobar;texlive-doc-tr;texlive-lang
+title;texlive-doc-tr;transitional dummy package
+bin-section;texlive-doc-tr;oldlibs
+bin-priority;texlive-doc-tr;extra
+description;texlive-doc-tr;This is a transitional package for texlive-doc-tr to ensure proper
+description;texlive-doc-tr;upgrade to texlive-lang-european.
+description;texlive-doc-tr;It can be safely removed after the installation is complete.
+depends;texlive-doc-tr;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-doc-tr
+dependsnot;texlive-full;texlive-doc-tr
+conflicts;texlive-base;texlive-doc-tr (<< 2013)
+replaces;texlive-lang-european;texlive-doc-tr (<< 2013)
+addpackages;;texlive-doc-uk
+name;collection-foobar;texlive-doc-uk;texlive-lang
+title;texlive-doc-uk;transitional dummy package
+bin-section;texlive-doc-uk;oldlibs
+bin-priority;texlive-doc-uk;extra
+description;texlive-doc-uk;This is a transitional package for texlive-doc-uk to ensure proper
+description;texlive-doc-uk;upgrade to texlive-lang-cyrillic.
+description;texlive-doc-uk;It can be safely removed after the installation is complete.
+depends;texlive-doc-uk;texlive-lang-cyrillic
+dependsnot;texlive-lang-all;texlive-doc-uk
+dependsnot;texlive-full;texlive-doc-uk
+conflicts;texlive-base;texlive-doc-uk (<< 2013)
+replaces;texlive-lang-cyrillic;texlive-doc-uk (<< 2013)
+addpackages;;texlive-doc-vi
+name;collection-foobar;texlive-doc-vi;texlive-lang
+title;texlive-doc-vi;transitional dummy package
+bin-section;texlive-doc-vi;oldlibs
+bin-priority;texlive-doc-vi;extra
+description;texlive-doc-vi;This is a transitional package for texlive-doc-vi to ensure proper
+description;texlive-doc-vi;upgrade to texlive-lang-other.
+description;texlive-doc-vi;It can be safely removed after the installation is complete.
+depends;texlive-doc-vi;texlive-lang-other
+dependsnot;texlive-lang-all;texlive-doc-vi
+dependsnot;texlive-full;texlive-doc-vi
+conflicts;texlive-base;texlive-doc-vi (<< 2013)
+replaces;texlive-lang-other;texlive-doc-vi (<< 2013)
+addpackages;;texlive-doc-zh
+name;collection-foobar;texlive-doc-zh;texlive-lang
+title;texlive-doc-zh;transitional dummy package
+bin-section;texlive-doc-zh;oldlibs
+bin-priority;texlive-doc-zh;extra
+description;texlive-doc-zh;This is a transitional package for texlive-doc-zh to ensure proper
+description;texlive-doc-zh;upgrade to texlive-lang-cjk.
+description;texlive-doc-zh;It can be safely removed after the installation is complete.
+depends;texlive-doc-zh;texlive-lang-cjk
+dependsnot;texlive-lang-all;texlive-doc-zh
+dependsnot;texlive-full;texlive-doc-zh
+conflicts;texlive-base;texlive-doc-zh (<< 2013)
+replaces;texlive-lang-cjk;texlive-doc-zh (<< 2013)
+addpackages;;texlive-lang-armenian
+name;collection-foobar;texlive-lang-armenian;texlive-lang
+title;texlive-lang-armenian;transitional dummy package
+bin-section;texlive-lang-armenian;oldlibs
+bin-priority;texlive-lang-armenian;extra
+description;texlive-lang-armenian;This is a transitional package for texlive-lang-armenian to ensure proper
+description;texlive-lang-armenian;upgrade to texlive-lang-european.
+description;texlive-lang-armenian;It can be safely removed after the installation is complete.
+depends;texlive-lang-armenian;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-armenian
+dependsnot;texlive-full;texlive-lang-armenian
+conflicts;texlive-base;texlive-lang-armenian (<< 2013)
+replaces;texlive-lang-european;texlive-lang-armenian (<< 2013)
+addpackages;;texlive-lang-croatian
+name;collection-foobar;texlive-lang-croatian;texlive-lang
+title;texlive-lang-croatian;transitional dummy package
+bin-section;texlive-lang-croatian;oldlibs
+bin-priority;texlive-lang-croatian;extra
+description;texlive-lang-croatian;This is a transitional package for texlive-lang-croatian to ensure proper
+description;texlive-lang-croatian;upgrade to texlive-lang-european.
+description;texlive-lang-croatian;It can be safely removed after the installation is complete.
+depends;texlive-lang-croatian;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-croatian
+dependsnot;texlive-full;texlive-lang-croatian
+conflicts;texlive-base;texlive-lang-croatian (<< 2013)
+replaces;texlive-lang-european;texlive-lang-croatian (<< 2013)
+addpackages;;texlive-lang-danish
+name;collection-foobar;texlive-lang-danish;texlive-lang
+title;texlive-lang-danish;transitional dummy package
+bin-section;texlive-lang-danish;oldlibs
+bin-priority;texlive-lang-danish;extra
+description;texlive-lang-danish;This is a transitional package for texlive-lang-danish to ensure proper
+description;texlive-lang-danish;upgrade to texlive-lang-european.
+description;texlive-lang-danish;It can be safely removed after the installation is complete.
+depends;texlive-lang-danish;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-danish
+dependsnot;texlive-full;texlive-lang-danish
+conflicts;texlive-base;texlive-lang-danish (<< 2013)
+replaces;texlive-lang-european;texlive-lang-danish (<< 2013)
+addpackages;;texlive-lang-dutch
+name;collection-foobar;texlive-lang-dutch;texlive-lang
+title;texlive-lang-dutch;transitional dummy package
+bin-section;texlive-lang-dutch;oldlibs
+bin-priority;texlive-lang-dutch;extra
+description;texlive-lang-dutch;This is a transitional package for texlive-lang-dutch to ensure proper
+description;texlive-lang-dutch;upgrade to texlive-lang-european.
+description;texlive-lang-dutch;It can be safely removed after the installation is complete.
+depends;texlive-lang-dutch;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-dutch
+dependsnot;texlive-full;texlive-lang-dutch
+conflicts;texlive-base;texlive-lang-dutch (<< 2013)
+replaces;texlive-lang-european;texlive-lang-dutch (<< 2013)
+addpackages;;texlive-lang-finnish
+name;collection-foobar;texlive-lang-finnish;texlive-lang
+title;texlive-lang-finnish;transitional dummy package
+bin-section;texlive-lang-finnish;oldlibs
+bin-priority;texlive-lang-finnish;extra
+description;texlive-lang-finnish;This is a transitional package for texlive-lang-finnish to ensure proper
+description;texlive-lang-finnish;upgrade to texlive-lang-european.
+description;texlive-lang-finnish;It can be safely removed after the installation is complete.
+depends;texlive-lang-finnish;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-finnish
+dependsnot;texlive-full;texlive-lang-finnish
+conflicts;texlive-base;texlive-lang-finnish (<< 2013)
+replaces;texlive-lang-european;texlive-lang-finnish (<< 2013)
+addpackages;;texlive-lang-hebrew
+name;collection-foobar;texlive-lang-hebrew;texlive-lang
+title;texlive-lang-hebrew;transitional dummy package
+bin-section;texlive-lang-hebrew;oldlibs
+bin-priority;texlive-lang-hebrew;extra
+description;texlive-lang-hebrew;This is a transitional package for texlive-lang-hebrew to ensure proper
+description;texlive-lang-hebrew;upgrade to texlive-lang-other.
+description;texlive-lang-hebrew;It can be safely removed after the installation is complete.
+depends;texlive-lang-hebrew;texlive-lang-other
+dependsnot;texlive-lang-all;texlive-lang-hebrew
+dependsnot;texlive-full;texlive-lang-hebrew
+conflicts;texlive-base;texlive-lang-hebrew (<< 2013)
+replaces;texlive-lang-other;texlive-lang-hebrew (<< 2013)
+addpackages;;texlive-lang-hungarian
+name;collection-foobar;texlive-lang-hungarian;texlive-lang
+title;texlive-lang-hungarian;transitional dummy package
+bin-section;texlive-lang-hungarian;oldlibs
+bin-priority;texlive-lang-hungarian;extra
+description;texlive-lang-hungarian;This is a transitional package for texlive-lang-hungarian to ensure proper
+description;texlive-lang-hungarian;upgrade to texlive-lang-european.
+description;texlive-lang-hungarian;It can be safely removed after the installation is complete.
+depends;texlive-lang-hungarian;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-hungarian
+dependsnot;texlive-full;texlive-lang-hungarian
+conflicts;texlive-base;texlive-lang-hungarian (<< 2013)
+replaces;texlive-lang-european;texlive-lang-hungarian (<< 2013)
+addpackages;;texlive-lang-latin
+name;collection-foobar;texlive-lang-latin;texlive-lang
+title;texlive-lang-latin;transitional dummy package
+bin-section;texlive-lang-latin;oldlibs
+bin-priority;texlive-lang-latin;extra
+description;texlive-lang-latin;This is a transitional package for texlive-lang-latin to ensure proper
+description;texlive-lang-latin;upgrade to texlive-lang-european.
+description;texlive-lang-latin;It can be safely removed after the installation is complete.
+depends;texlive-lang-latin;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-latin
+dependsnot;texlive-full;texlive-lang-latin
+conflicts;texlive-base;texlive-lang-latin (<< 2013)
+replaces;texlive-lang-european;texlive-lang-latin (<< 2013)
+addpackages;;texlive-lang-latvian
+name;collection-foobar;texlive-lang-latvian;texlive-lang
+title;texlive-lang-latvian;transitional dummy package
+bin-section;texlive-lang-latvian;oldlibs
+bin-priority;texlive-lang-latvian;extra
+description;texlive-lang-latvian;This is a transitional package for texlive-lang-latvian to ensure proper
+description;texlive-lang-latvian;upgrade to texlive-lang-european.
+description;texlive-lang-latvian;It can be safely removed after the installation is complete.
+depends;texlive-lang-latvian;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-latvian
+dependsnot;texlive-full;texlive-lang-latvian
+conflicts;texlive-base;texlive-lang-latvian (<< 2013)
+replaces;texlive-lang-european;texlive-lang-latvian (<< 2013)
+addpackages;;texlive-lang-lithuanian
+name;collection-foobar;texlive-lang-lithuanian;texlive-lang
+title;texlive-lang-lithuanian;transitional dummy package
+bin-section;texlive-lang-lithuanian;oldlibs
+bin-priority;texlive-lang-lithuanian;extra
+description;texlive-lang-lithuanian;This is a transitional package for texlive-lang-lithuanian to ensure proper
+description;texlive-lang-lithuanian;upgrade to texlive-lang-european.
+description;texlive-lang-lithuanian;It can be safely removed after the installation is complete.
+depends;texlive-lang-lithuanian;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-lithuanian
+dependsnot;texlive-full;texlive-lang-lithuanian
+conflicts;texlive-base;texlive-lang-lithuanian (<< 2013)
+replaces;texlive-lang-european;texlive-lang-lithuanian (<< 2013)
+addpackages;;texlive-lang-mongolian
+name;collection-foobar;texlive-lang-mongolian;texlive-lang
+title;texlive-lang-mongolian;transitional dummy package
+bin-section;texlive-lang-mongolian;oldlibs
+bin-priority;texlive-lang-mongolian;extra
+description;texlive-lang-mongolian;This is a transitional package for texlive-lang-mongolian to ensure proper
+description;texlive-lang-mongolian;upgrade to texlive-lang-cyrillic.
+description;texlive-lang-mongolian;It can be safely removed after the installation is complete.
+depends;texlive-lang-mongolian;texlive-lang-cyrillic
+dependsnot;texlive-lang-all;texlive-lang-mongolian
+dependsnot;texlive-full;texlive-lang-mongolian
+conflicts;texlive-base;texlive-lang-mongolian (<< 2013)
+replaces;texlive-lang-cyrillic;texlive-lang-mongolian (<< 2013)
+addpackages;;texlive-lang-norwegian
+name;collection-foobar;texlive-lang-norwegian;texlive-lang
+title;texlive-lang-norwegian;transitional dummy package
+bin-section;texlive-lang-norwegian;oldlibs
+bin-priority;texlive-lang-norwegian;extra
+description;texlive-lang-norwegian;This is a transitional package for texlive-lang-norwegian to ensure proper
+description;texlive-lang-norwegian;upgrade to texlive-lang-european.
+description;texlive-lang-norwegian;It can be safely removed after the installation is complete.
+depends;texlive-lang-norwegian;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-norwegian
+dependsnot;texlive-full;texlive-lang-norwegian
+conflicts;texlive-base;texlive-lang-norwegian (<< 2013)
+replaces;texlive-lang-european;texlive-lang-norwegian (<< 2013)
+addpackages;;texlive-lang-swedish
+name;collection-foobar;texlive-lang-swedish;texlive-lang
+title;texlive-lang-swedish;transitional dummy package
+bin-section;texlive-lang-swedish;oldlibs
+bin-priority;texlive-lang-swedish;extra
+description;texlive-lang-swedish;This is a transitional package for texlive-lang-swedish to ensure proper
+description;texlive-lang-swedish;upgrade to texlive-lang-european.
+description;texlive-lang-swedish;It can be safely removed after the installation is complete.
+depends;texlive-lang-swedish;texlive-lang-european
+dependsnot;texlive-lang-all;texlive-lang-swedish
+dependsnot;texlive-full;texlive-lang-swedish
+conflicts;texlive-base;texlive-lang-swedish (<< 2013)
+replaces;texlive-lang-european;texlive-lang-swedish (<< 2013)
+addpackages;;texlive-lang-tibetan
+name;collection-foobar;texlive-lang-tibetan;texlive-lang
+title;texlive-lang-tibetan;transitional dummy package
+bin-section;texlive-lang-tibetan;oldlibs
+bin-priority;texlive-lang-tibetan;extra
+description;texlive-lang-tibetan;This is a transitional package for texlive-lang-tibetan to ensure proper
+description;texlive-lang-tibetan;upgrade to texlive-lang-other.
+description;texlive-lang-tibetan;It can be safely removed after the installation is complete.
+depends;texlive-lang-tibetan;texlive-lang-other
+dependsnot;texlive-lang-all;texlive-lang-tibetan
+dependsnot;texlive-full;texlive-lang-tibetan
+conflicts;texlive-base;texlive-lang-tibetan (<< 2013)
+replaces;texlive-lang-other;texlive-lang-tibetan (<< 2013)
+addpackages;;texlive-lang-vietnamese
+name;collection-foobar;texlive-lang-vietnamese;texlive-lang
+title;texlive-lang-vietnamese;transitional dummy package
+bin-section;texlive-lang-vietnamese;oldlibs
+bin-priority;texlive-lang-vietnamese;extra
+description;texlive-lang-vietnamese;This is a transitional package for texlive-lang-vietnamese to ensure proper
+description;texlive-lang-vietnamese;upgrade to texlive-lang-other.
+description;texlive-lang-vietnamese;It can be safely removed after the installation is complete.
+depends;texlive-lang-vietnamese;texlive-lang-other
+dependsnot;texlive-lang-all;texlive-lang-vietnamese
+dependsnot;texlive-full;texlive-lang-vietnamese
+conflicts;texlive-base;texlive-lang-vietnamese (<< 2013)
+replaces;texlive-lang-other;texlive-lang-vietnamese (<< 2013)
diff --git a/all/debian/tpm2deb.cfg b/all/debian/tpm2deb.cfg
index 823df52..cb18204 100644
--- a/all/debian/tpm2deb.cfg
+++ b/all/debian/tpm2deb.cfg
@@ -44,6 +44,7 @@ depends;texlive-base;tex-common (>= 4.03)
#
# collections -> debian package names plus source packages
include-config;cfg.d/package-naming.cfg
+include-config;cfg.d/upgrade-transitional-packages.cfg
#
# docsplitting
# texlive-base source package
@@ -71,6 +72,7 @@ depends;texlive-base;ucf, libpaper-utils, luatex (>= 0.70.1)
suggests;texlive-base;ghostscript, gv | postscript-viewer, xpdf-reader | pdf-viewer
depends;texlive-pictures;luatex
recommends;texlive-pictures;ruby | ruby-interpreter, wish
+suggests;texlive-pictures;texlive-latex-extra, libtcltk-ruby
depends;texlive-luatex;luatex (>= 0.70.1)
depends;texlive-lang-indic;python
recommends;texlive-lang-cjk;ruby | ruby-interpreter
diff --git a/all/debian/tpm2debcommon.pm b/all/debian/tpm2debcommon.pm
index 7229134..193f075 100755
--- a/all/debian/tpm2debcommon.pm
+++ b/all/debian/tpm2debcommon.pm
@@ -398,7 +398,12 @@ sub build_data_hash {
} elsif ($meta_package eq "texlive-lang-all") {
my @foo = ();
foreach my $a (@allpkgs) {
- if ($a =~ /^texlive-lang-/) { push @foo, $a; }
+ my $addthis = 0;
+ if ($a =~ /^texlive-lang-/) { $addthis = 1; }
+ foreach my $depends_not (@{$Config{'depends_not'}{'texlive-lang-all'}}) {
+ $addthis = 0 if ($a eq $depends_not);
+ };
+ $addthis && push @foo, $a;
}
$TeXLive{'mbinary'}{$meta_package}{'depends'} = [ @{$Config{'depends'}{$meta_package}}, @foo ];
} else {
@@ -781,12 +786,12 @@ sub read_one_config_file {
next;
}
if ($type eq "addpackages") {
- @{$Config{'add_packages'}} = @rest;
+ push @{$Config{'add_packages'}}, @rest;
$opt_debug && print STDERR "\nAdditional packages: @{$Config{'add_packages'}}\n";
next;
}
if ($type eq "dependsnot") {
- @{$Config{'depends_not'}{$a}} = @rest;
+ push @{$Config{'depends_not'}{$a}}, @rest;
$opt_debug && print STDERR "Dropped depends of $a on @{$Config{'depends_not'}{$a}}\n";
next;
}
diff --git a/all/debian/transitional-packages b/all/debian/transitional-packages
new file mode 100644
index 0000000..c626236
--- /dev/null
+++ b/all/debian/transitional-packages
@@ -0,0 +1,39 @@
+texlive-doc-ar:texlive-lang-arabic
+texlive-doc-base:texlive-base
+texlive-doc-bg:texlive-lang-european, texlive-lang-cyrillic
+texlive-doc-cs+sk:texlive-lang-czechslovak
+texlive-doc-de:texlive-lang-german
+texlive-doc-en:texlive-lang-english, texlive-base
+texlive-doc-es:texlive-lang-spanish
+texlive-doc-fi:texlive-lang-european
+texlive-doc-fr:texlive-lang-french
+texlive-doc-it:texlive-lang-italian
+texlive-doc-ja:texlive-lang-cjk
+texlive-doc-ko:texlive-lang-cjk
+texlive-doc-mn:texlive-lang-other, texlive-lang-cyrillic
+texlive-doc-nl:texlive-lang-european
+texlive-doc-pl:texlive-lang-polish
+texlive-doc-pt:texlive-lang-portuguese
+texlive-doc-rs:texlive-lang-cyrillic
+texlive-doc-ru:texlive-lang-cyrillic
+texlive-doc-si:texlive-lang-european
+texlive-doc-th:texlive-lang-other
+texlive-doc-tr:texlive-lang-european
+texlive-doc-uk:texlive-lang-cyrillic
+texlive-doc-vi:texlive-lang-other
+texlive-doc-zh:texlive-lang-cjk
+texlive-lang-armenian:texlive-lang-european
+texlive-lang-croatian:texlive-lang-european
+texlive-lang-danish:texlive-lang-european
+texlive-lang-dutch:texlive-lang-european
+texlive-lang-finnish:texlive-lang-european
+texlive-lang-hebrew:texlive-lang-other
+texlive-lang-hungarian:texlive-lang-european
+texlive-lang-latin:texlive-lang-european
+texlive-lang-latvian:texlive-lang-european
+texlive-lang-lithuanian:texlive-lang-european
+texlive-lang-mongolian:texlive-lang-cyrillic
+texlive-lang-norwegian:texlive-lang-european
+texlive-lang-swedish:texlive-lang-european
+texlive-lang-tibetan:texlive-lang-other
+texlive-lang-vietnamese:texlive-lang-other
diff --git a/scripts/create-transitional-packages b/scripts/create-transitional-packages
new file mode 100644
index 0000000..b4f28a2
--- /dev/null
+++ b/scripts/create-transitional-packages
@@ -0,0 +1,23 @@
+
+while (<STDIN>) {
+ chomp;
+ my ($p,$d) = split /:/;
+ my @deps = split (/,\s?/,$d);
+ print "addpackages;;$p
+name;collection-foobar;$p;texlive-lang
+title;$p;transitional dummy package
+bin-section;$p;oldlibs
+bin-priority;$p;extra
+description;$p;This is a transitional package for $p to ensure proper
+description;$p;upgrade to $d.
+description;$p;It can be safely removed after the installation is complete.
+depends;$p;$d
+dependsnot;texlive-lang-all;$p
+dependsnot;texlive-full;$p
+conflicts;texlive-base;$p (<< 2013)
+";
+ for my $i (@deps) {
+ print "replaces;$i;$p (<< 2013)\n";
+ }
+}
+
diff --git a/texlive-base/debian/changelog b/texlive-base/debian/changelog
index dd4606b..58623a4 100644
--- a/texlive-base/debian/changelog
+++ b/texlive-base/debian/changelog
@@ -1,3 +1,13 @@
+texlive-base (2013.20130904-1) UNRELEASED; urgency=low
+
+ * new upstream checkout
+ - don't ship strange duplicates of Nimbus Sans (Closes: #690125)
+ * remove /etc/texmf/dvipdfm/config/config (Closes: #713797)
+ * link instead of ship bitstream charter fonts (Closes: #721633)
+ * do not ship marvosym.ttf via dependency (Closes: #721716)
+
+ -- Norbert Preining <preining@debian.org> Wed, 04 Sep 2013 15:02:21 +0900
+
texlive-base (2013.20130722-1) unstable; urgency=low
* new upstream checkout
diff --git a/texlive-base/debian/texlive-base.maintscript b/texlive-base/debian/texlive-base.maintscript
new file mode 100644
index 0000000..effad87
--- /dev/null
+++ b/texlive-base/debian/texlive-base.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/texmf/dvipdfm/config/config 2013.20130904-1~
diff --git a/texlive-base/debian/texlive-fonts-recommended.links.dist b/texlive-base/debian/texlive-fonts-recommended.links.dist
index 02ee0df..d88dec5 100644
--- a/texlive-base/debian/texlive-fonts-recommended.links.dist
+++ b/texlive-base/debian/texlive-fonts-recommended.links.dist
@@ -1 +1,8 @@
-usr/share/fonts/truetype/ttf-marvosym/marvosym.ttf usr/share/texlive/texmf-dist/fonts/truetype/public/marvosym/marvosym.ttf
+usr/share/fonts/X11/Type1/c0649bt_.pfb usr/share/texlive/texmf-dist/fonts/type1/bitstrea/charter/bchri8a.pfb
+usr/share/fonts/X11/Type1/c0649bt_.afm usr/share/texlive/texmf-dist/fonts/afm/bitstrea/charter/bchri8a.afm
+usr/share/fonts/X11/Type1/c0632bt_.pfb usr/share/texlive/texmf-dist/fonts/type1/bitstrea/charter/bchb8a.pfb
+usr/share/fonts/X11/Type1/c0632bt_.afm usr/share/texlive/texmf-dist/fonts/afm/bitstrea/charter/bchb8a.afm
+usr/share/fonts/X11/Type1/c0648bt_.pfb usr/share/texlive/texmf-dist/fonts/type1/bitstrea/charter/bchr8a.pfb
+usr/share/fonts/X11/Type1/c0648bt_.afm usr/share/texlive/texmf-dist/fonts/afm/bitstrea/charter/bchr8a.afm
+usr/share/fonts/X11/Type1/c0633bt_.pfb usr/share/texlive/texmf-dist/fonts/type1/bitstrea/charter/bchbi8a.pfb
+usr/share/fonts/X11/Type1/c0633bt_.afm usr/share/texlive/texmf-dist/fonts/afm/bitstrea/charter/bchbi8a.afm
diff --git a/texlive-base/debian/texlive-fonts-recommended.type1-fontdirs b/texlive-base/debian/texlive-fonts-recommended.type1-fontdirs
index 1c2e8e1..b70bb60 100644
--- a/texlive-base/debian/texlive-fonts-recommended.type1-fontdirs
+++ b/texlive-base/debian/texlive-fonts-recommended.type1-fontdirs
@@ -1,3 +1,2 @@
texmf-dist/fonts/type1/adobe
-texmf-dist/fonts/type1/bitstrea
texmf-dist/fonts/type1/urw
diff --git a/texlive-extra/debian/changelog b/texlive-extra/debian/changelog
index ddf1858..10aa4cd 100644
--- a/texlive-extra/debian/changelog
+++ b/texlive-extra/debian/changelog
@@ -1,3 +1,12 @@
+texlive-extra (2013.20130904-1) UNRELEASED; urgency=low
+
+ * new upstream checkout
+ * add a latexdef -> texdef link (Closes: #719427)
+ * texlive-pictures suggests texlive-latex-extra (Closes: #705951, #683567)
+ * texlive-pcitures suggest libtcltk-ruby (Closes: #600375)
+
+ -- Norbert Preining <preining@debian.org> Wed, 04 Sep 2013 15:05:11 +0900
+
texlive-extra (2013.20130722-1) unstable; urgency=low
* new upstream checkout
diff --git a/texlive-extra/debian/texlive-extra-utils.links.dist b/texlive-extra/debian/texlive-extra-utils.links.dist
index 6459524..de69f24 100644
--- a/texlive-extra/debian/texlive-extra-utils.links.dist
+++ b/texlive-extra/debian/texlive-extra-utils.links.dist
@@ -1 +1,2 @@
usr/bin/pdfcrop usr/bin/rpdfcrop
+usr/bin/texdef usr/bin/latexdef
diff --git a/texlive-lang/debian/changelog b/texlive-lang/debian/changelog
index 5701949..b947909 100644
--- a/texlive-lang/debian/changelog
+++ b/texlive-lang/debian/changelog
@@ -1,3 +1,10 @@
+texlive-lang (2013.20130904-1) UNRELEASED; urgency=low
+
+ * new upstream checkout
+ * provide a bunch of transitional packages to make the world happy
+
+ -- Norbert Preining <preining@debian.org> Wed, 04 Sep 2013 14:29:37 +0900
+
texlive-lang (2013.20130722-1) unstable; urgency=low
* new upstream checkout
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: