[texlive-nonbin] 01/01: get rid of more lintian warnings
This is an automated email from the git hooks/post-receive script.
preining pushed a commit to branch master
in repository texlive-nonbin.
commit d492ebea794974f0f221a5bda142adafea4d526c
Author: Norbert Preining <preining@debian.org>
Date: Mon Apr 7 16:11:58 2014 +0900
get rid of more lintian warnings
. add some font replacements
. make sure that texlive-base does not break against itself
. remove embedded copies of xz in orig.tar
---
all/debian/cfg.d/font-ignore.cfg | 10 ++++++++++
all/debian/tpm2debcommon.pm | 4 +++-
texlive-extra/debian/texlive-fonts-extra.links.dist | 7 +++++++
texlive-lang/debian/texlive-lang-arabic.links.dist | 1 +
tpm2deb-source.pl | 3 +++
5 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/all/debian/cfg.d/font-ignore.cfg b/all/debian/cfg.d/font-ignore.cfg
index 4216368..24e05e6 100644
--- a/all/debian/cfg.d/font-ignore.cfg
+++ b/all/debian/cfg.d/font-ignore.cfg
@@ -124,6 +124,7 @@ 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
+blacklist;file;texmf-dist/fonts/truetype/public/amiri/amiri-quran.ttf
# 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
@@ -172,6 +173,7 @@ blacklist;file;texmf-dist/fonts/opentype/public/libertine/LinBiolinum_RB.otf
blacklist;file;texmf-dist/fonts/opentype/public/libertine/LinBiolinum_RI.otf
blacklist;file;texmf-dist/fonts/opentype/public/libertine/LinLibertine_DR.otf
blacklist;file;texmf-dist/fonts/opentype/public/libertine/LinLibertine_I.otf
+blacklist;file;texmf-dist/fonts/opentype/public/libertine/LinLibertine_M.otf
blacklist;file;texmf-dist/fonts/opentype/public/libertine/LinLibertine_R.otf
blacklist;file;texmf-dist/fonts/opentype/public/libertine/LinLibertine_RB.otf
blacklist;file;texmf-dist/fonts/opentype/public/libertine/LinLibertine_RBI.otf
@@ -210,6 +212,14 @@ blacklist;file;texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-Bold.otf
blacklist;file;texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-BoldItalic.otf
blacklist;file;texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-Italic.otf
blacklist;file;texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-Regular.otf
+depends;texlive-fonts-extra;fonts-ebgaramond
+blacklist;file;texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond12-Italic.otf
+blacklist;file;texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond12-Regular.otf
+depends;texlive-fonts-extra;fonts-ebgaramond-extra
+blacklist;file;texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond-Initials.otf
+blacklist;file;texmf-dist/fonts/truetype/public/ebgaramond/EBGaramond-Initials.ttf
+blacklist;file;texmf-dist/fonts/truetype/public/ebgaramond/EBGaramond12-Italic.ttf
+blacklist;file;texmf-dist/fonts/truetype/public/ebgaramond/EBGaramond12-Regular.ttf
# vim:set fileencoding=utf-8: #
# Local Variables:
# coding: utf-8
diff --git a/all/debian/tpm2debcommon.pm b/all/debian/tpm2debcommon.pm
index 82b1186..70e6da7 100755
--- a/all/debian/tpm2debcommon.pm
+++ b/all/debian/tpm2debcommon.pm
@@ -236,7 +236,9 @@ sub build_data_hash {
$TeXLive{'binary'}{$pkg}{'replaces'} = [ @{$Config{'replaces'}{$pkg}} ];
}
my @breaks;
- push @breaks, "texlive-base (<< $TeXLive{'all'}{'tl_common_version'})";
+ if ($pkg ne "texlive-base") {
+ push @breaks, "texlive-base (<< $TeXLive{'all'}{'tl_common_version'})";
+ }
if (defined($Config{'breaks'}{$pkg})) {
push @breaks, @{$Config{'breaks'}{$pkg}};
}
diff --git a/texlive-extra/debian/texlive-fonts-extra.links.dist b/texlive-extra/debian/texlive-fonts-extra.links.dist
index 0b56938..16b8d7f 100644
--- a/texlive-extra/debian/texlive-fonts-extra.links.dist
+++ b/texlive-extra/debian/texlive-fonts-extra.links.dist
@@ -127,6 +127,7 @@ usr/share/fonts/opentype/linux-libertine/LinBiolinum_RB.otf usr/share/texlive/te
usr/share/fonts/opentype/linux-libertine/LinBiolinum_RI.otf usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/LinBiolinum_RI.otf
usr/share/fonts/opentype/linux-libertine/LinLibertine_DR.otf usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/LinLibertine_DR.otf
usr/share/fonts/opentype/linux-libertine/LinLibertine_I.otf usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/LinLibertine_I.otf
+usr/share/fonts/opentype/linux-libertine/LinLibertine_M.otf usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/LinLibertine_M.otf
usr/share/fonts/opentype/linux-libertine/LinLibertine_R.otf usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/LinLibertine_R.otf
usr/share/fonts/opentype/linux-libertine/LinLibertine_RB.otf usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/LinLibertine_RB.otf
usr/share/fonts/opentype/linux-libertine/LinLibertine_RBI.otf usr/share/texlive/texmf-dist/fonts/opentype/public/libertine/LinLibertine_RBI.otf
@@ -161,3 +162,9 @@ usr/share/fonts/opentype/lobstertwo/LobsterTwo-Bold.otf usr/share/texlive/texmf-
usr/share/fonts/opentype/lobstertwo/LobsterTwo-BoldItalic.otf usr/share/texlive/texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-BoldItalic.otf
usr/share/fonts/opentype/lobstertwo/LobsterTwo-Italic.otf usr/share/texlive/texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-Italic.otf
usr/share/fonts/opentype/lobstertwo/LobsterTwo-Regular.otf usr/share/texlive/texmf-dist/fonts/opentype/impallari/lobster2/LobsterTwo-Regular.otf
+usr/share/fonts/opentype/ebgaramond/EBGaramond12-Italic.otf usr/share/texlive/texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond12-Italic.otf
+usr/share/fonts/opentype/ebgaramond/EBGaramond12-Regular.otf usr/share/texlive/texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond12-Regular.otf
+usr/share/fonts/opentype/ebgaramond/EBGaramond-Initials.otf usr/share/texlive/texmf-dist/fonts/opentype/public/ebgaramond/EBGaramond-Initials.otf
+usr/share/fonts/truetype/ebgaramond/EBGaramond12-Regular.ttf usr/share/texlive/texmf-dist/fonts/truetype/public/ebgaramond/EBGaramond12-Regular.ttf
+usr/share/fonts/truetype/ebgaramond/EBGaramond12-Italic.ttf usr/share/texlive/texmf-dist/fonts/truetype/public/ebgaramond/EBGaramond12-Italic.ttf
+usr/share/fonts/truetype/ebgaramond/EBGaramond-Initials.ttf usr/share/texlive/texmf-dist/fonts/truetype/public/ebgaramond/EBGaramond-Initials.ttf
diff --git a/texlive-lang/debian/texlive-lang-arabic.links.dist b/texlive-lang/debian/texlive-lang-arabic.links.dist
index 2804d4f..076450f 100644
--- a/texlive-lang/debian/texlive-lang-arabic.links.dist
+++ b/texlive-lang/debian/texlive-lang-arabic.links.dist
@@ -2,3 +2,4 @@ usr/share/fonts/opentype/fonts-hosny-amiri/amiri-bold.ttf usr/share/texlive/texm
usr/share/fonts/opentype/fonts-hosny-amiri/amiri-boldslanted.ttf usr/share/texlive/texmf-dist/fonts/truetype/public/amiri/amiri-boldslanted.ttf
usr/share/fonts/opentype/fonts-hosny-amiri/amiri-regular.ttf usr/share/texlive/texmf-dist/fonts/truetype/public/amiri/amiri-regular.ttf
usr/share/fonts/opentype/fonts-hosny-amiri/amiri-slanted.ttf usr/share/texlive/texmf-dist/fonts/truetype/public/amiri/amiri-slanted.ttf
+usr/share/fonts/opentype/fonts-hosny-amiri/amiri-quran.ttf usr/share/texlive/texmf-dist/fonts/truetype/public/amiri/amiri-quran.ttf
diff --git a/tpm2deb-source.pl b/tpm2deb-source.pl
index 5964a09..3892749 100755
--- a/tpm2deb-source.pl
+++ b/tpm2deb-source.pl
@@ -257,6 +257,9 @@ sub make_orig_tar {
# remove binary files
`rm -rf \"$texlivedest/bin\"`;
#
+ # these files should not be here, they are installed by texlive.infra
+ `rm -rf \"$texlivedest/tlpkg/installer/xz\"`;
+ #
# necessary for media detection!
&mkpath("$texlivedest/texmf-dist/web2c");
#
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texlive-nonbin.git
Reply to: