Bug 25792: Rename 'ttf-dejavu' package to 'fonts-dejavu' for Debian 11

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!

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/Makefile.PL b/Makefile.PL
index 23dff96..1fab6ec 100644 (file)
--- 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 (file)
--- 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 b373abe..c2d7b1b 100644 (file)
--- 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
@@ -29,7 +29,7 @@ Depends: ${misc:Depends}, ${koha:Depends},
  pwgen,
  starman,
  sudo,
- ttf-dejavu,
+ fonts-dejavu | ttf-dejavu,
  unzip,
  xmlstarlet,
  yaz
@@ -76,7 +76,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 4853018..8c5d7d7 100644 (file)
--- 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 f907a03..8479e12 100644 (file)
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -157,7 +157,7 @@ my %configuration = (
   "__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"
 );