Bugzilla – Attachment 106000 Details for
Bug 25792
Rename 'ttf-dejavu' package to 'fonts-dejavu' for Debian 11
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25792: Rename 'ttf-dejavu' package to 'fonts-dejavu' for Debian 11
Bug-25792-Rename-ttf-dejavu-package-to-fonts-dejav.patch (text/plain), 6.44 KB, created by
Mason James
on 2020-06-18 10:30:25 UTC
(
hide
)
Description:
Bug 25792: Rename 'ttf-dejavu' package to 'fonts-dejavu' for Debian 11
Filename:
MIME Type:
Creator:
Mason James
Created:
2020-06-18 10:30:25 UTC
Size:
6.44 KB
patch
obsolete
>From 72ddae414ecf7676dd6767b0493b75aab1b28c94 Mon Sep 17 00:00:00 2001 >From: Mason James <mtj@kohaaloha.com> >Date: Thu, 18 Jun 2020 13:26:20 +1200 >Subject: [PATCH] Bug 25792: Rename 'ttf-dejavu' package to 'fonts-dejavu' for > Debian 11 >Content-Type: text/plain; charset="utf-8" > >to test... > 1/ attempt to install koha 20.05 package on deb11, fail :'( > 2/ apply patch and build new koha package > 3/ attempt to install new koha package on deb11, succeed! >--- > Makefile.PL | 4 ++-- > debian/control | 6 +++--- > debian/control.in | 6 +++--- > debian/templates/koha-conf-site.xml.in | 24 ++++++++++++------------ > rewrite-config.PL | 2 +- > 5 files changed, 21 insertions(+), 21 deletions(-) > >diff --git a/Makefile.PL b/Makefile.PL >index ad98d8b..641a558 100644 >--- a/Makefile.PL >+++ b/Makefile.PL >@@ -96,7 +96,7 @@ Makefile.PL - Koha packager and installer > --install_sru Install the SRU server (yes, no) > --install_pazpar2 Install PazPar2 (yes, no) > --use_memcached Use Memcached (yes, no) >- --font_dir Location of fonts (e.g. /usr/share/fonts/truetype/ttf-dejavu) >+ --font_dir Location of fonts (e.g. /usr/share/fonts/truetype/dejavu) > --run_database_tests Run database dependent tests (yes, no) > --install_base Base directory of installation (e.g. /usr/share/koha) > --template-cache-dir Specify a template cache directory (e.g. /var/cache/koha) >@@ -509,7 +509,7 @@ my %config_defaults = ( > 'USE_ELASTICSEARCH' => 'no', > 'ELASTICSEARCH_SERVERS' => 'localhost:9200', > 'ELASTICSEARCH_INDEX' => 'koha', >- 'FONT_DIR' => '/usr/share/fonts/truetype/ttf-dejavu' >+ 'FONT_DIR' => '/usr/share/fonts/truetype/dejavu' > ); > > # set some default configuration options based on OS >diff --git a/debian/control b/debian/control >index c42a69b..b212ee3 100644 >--- a/debian/control >+++ b/debian/control >@@ -162,7 +162,7 @@ Build-Depends: libalgorithm-checkdigits-perl, > libxml-writer-perl, > libyaml-perl, > libyaml-syck-perl, >- debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, ttf-dejavu, >+ debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, fonts-dejavu | ttf-dejavu, > libxml2-utils, bash-completion, perl-modules-5.26 | libtest-simple-perl (>= 1.302073) > > Package: koha-common >@@ -182,7 +182,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, > pwgen, > starman, > sudo, >- ttf-dejavu, >+ fonts-dejavu | ttf-dejavu, > unzip, > xmlstarlet, > yaz >@@ -230,7 +230,7 @@ Depends: ${misc:Depends}, > pwgen, > starman, > sudo, >- ttf-dejavu, >+ fonts-dejavu | ttf-dejavu, > unzip, > xmlstarlet, > yaz >diff --git a/debian/control.in b/debian/control.in >index 782f790..676ae00 100644 >--- a/debian/control.in >+++ b/debian/control.in >@@ -10,7 +10,7 @@ Standards-Version: 3.8.4 > # See debian/rules, the override_dh_gencontrol rules. > # There are some exceptions. > Build-Depends:__AUTODEPENDS__, >- debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, ttf-dejavu, >+ debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, fonts-dejavu | ttf-dejavu, > libxml2-utils, bash-completion, perl-modules-5.26 | libtest-simple-perl (>= 1.302073) > > Package: koha-common >@@ -30,7 +30,7 @@ Depends: ${misc:Depends}, ${koha:Depends}, > pwgen, > starman, > sudo, >- ttf-dejavu, >+ fonts-dejavu | ttf-dejavu, > unzip, > xmlstarlet, > yaz >@@ -78,7 +78,7 @@ Depends: ${misc:Depends}, > pwgen, > starman, > sudo, >- ttf-dejavu, >+ fonts-dejavu | ttf-dejavu, > unzip, > xmlstarlet, > yaz >diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in >index fe71b9a..116038d 100644 >--- a/debian/templates/koha-conf-site.xml.in >+++ b/debian/templates/koha-conf-site.xml.in >@@ -328,18 +328,18 @@ __END_SRU_PUBLICSERVER__ > > <!-- true type font mapping according to type from $font_types in C4/Creators/Lib.pm --> > <ttf> >- <font type="TR" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf</font> >- <font type="TB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf</font> >- <font type="TI" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Italic.ttf</font> >- <font type="TBI">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldItalic.ttf</font> >- <font type="C" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf</font> >- <font type="CB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf</font> >- <font type="CO" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf</font> >- <font type="CBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf</font> >- <font type="H" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf</font> >- <font type="HO" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf</font> >- <font type="HB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf</font> >- <font type="HBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf</font> >+ <font type="TR" >/usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf</font> >+ <font type="TB" >/usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf</font> >+ <font type="TI" >/usr/share/fonts/truetype/dejavu/DejaVuSerif-Italic.ttf</font> >+ <font type="TBI">/usr/share/fonts/truetype/dejavu/DejaVuSerif-BoldItalic.ttf</font> >+ <font type="C" >/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf</font> >+ <font type="CB" >/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf</font> >+ <font type="CO" >/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Oblique.ttf</font> >+ <font type="CBO">/usr/share/fonts/truetype/dejavu/DejaVuSansMono-BoldOblique.ttf</font> >+ <font type="H" >/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf</font> >+ <font type="HO" >/usr/share/fonts/truetype/dejavu/DejaVuSans-Oblique.ttf</font> >+ <font type="HB" >/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf</font> >+ <font type="HBO">/usr/share/fonts/truetype/dejavu/DejaVuSans-BoldOblique.ttf</font> > </ttf> > > <!-- Path to the config file for SMS::Send --> >diff --git a/rewrite-config.PL b/rewrite-config.PL >index 1fec27c..b49b387 100644 >--- a/rewrite-config.PL >+++ b/rewrite-config.PL >@@ -153,7 +153,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr"; > "__USE_ELASTICSEARCH__" => 'no', > "__ELASTICSEARCH_SERVERS__" => "localhost:9200", > "__ELASTICSEARCH_INDEX__" => "koha", >- "__FONT_DIR__" => "/usr/share/fonts/truetype/ttf-dejavu", >+ "__FONT_DIR__" => "/usr/share/fonts/truetype/dejavu", > "__TEMPLATE_CACHE_DIR__" => "/tmp/koha" > ); > >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25792
:
106000
|
106243