View | Details | Raw Unified | Return to bug 12549
Collapse All | Expand All

(-)a/Makefile.PL (-1 / +8 lines)
Lines 240-245 Directory for external Koha plugins. Link Here
240
240
241
Directory for PazPar2 configuration files.
241
Directory for PazPar2 configuration files.
242
242
243
=item FONT_DIR
244
245
Directory where DejaVu fonts are installed.
246
243
=item NONE
247
=item NONE
244
248
245
This is a dummy target used to explicitly state
249
This is a dummy target used to explicitly state
Lines 442-448 my %config_defaults = ( Link Here
442
  'PATH_TO_ZEBRA' => '',
446
  'PATH_TO_ZEBRA' => '',
443
  'USE_MEMCACHED'     => 'no',
447
  'USE_MEMCACHED'     => 'no',
444
  'MEMCACHED_SERVERS' => '127.0.0.1:11211',
448
  'MEMCACHED_SERVERS' => '127.0.0.1:11211',
445
  'MEMCACHED_NAMESPACE' => 'KOHA'
449
  'MEMCACHED_NAMESPACE' => 'KOHA',
450
  'FONT_DIR'          => '/usr/share/fonts/truetype/ttf-dejavu'
446
);
451
);
447
452
448
# set some default configuration options based on OS
453
# set some default configuration options based on OS
Lines 1082-1087 Memcached namespace?); Link Here
1082
      $config{'MEMCACHED_NAMESPACE'} = _get_value('MEMCACHED_NAMESPACE', $msg, $defaults->{'MEMCACHED_NAMESPACE'}, $valid_values, $install_log_values);
1087
      $config{'MEMCACHED_NAMESPACE'} = _get_value('MEMCACHED_NAMESPACE', $msg, $defaults->{'MEMCACHED_NAMESPACE'}, $valid_values, $install_log_values);
1083
  }
1088
  }
1084
1089
1090
  $msg = q(Path to DejaVu fonts?);
1091
  $config{'FONT_DIR'} = _get_value('FONT_DIR', $msg, $defaults->{'FONT_DIR'}, $valid_values, $install_log_values);
1085
1092
1086
1093
1087
  $msg = q(
1094
  $msg = q(
(-)a/etc/koha-conf.xml (-12 / +12 lines)
Lines 122-139 __PAZPAR2_TOGGLE_XML_POST__ Link Here
122
122
123
 <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm -->
123
 <!-- true type font mapping accoding to type from $font_types in C4/Creators/Lib.pm -->
124
 <ttf>
124
 <ttf>
125
    <font type="TR" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf</font>
125
    <font type="TR" >__FONT_DIR__/DejaVuSerif.ttf</font>
126
    <font type="TB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf</font>
126
    <font type="TB" >__FONT_DIR__/DejaVuSerif-Bold.ttf</font>
127
    <font type="TI" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Italic.ttf</font>
127
    <font type="TI" >__FONT_DIR__/DejaVuSerif-Italic.ttf</font>
128
    <font type="TBI">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldItalic.ttf</font>
128
    <font type="TBI">__FONT_DIR__/DejaVuSerif-BoldItalic.ttf</font>
129
    <font type="C"  >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf</font>
129
    <font type="C"  >__FONT_DIR__/DejaVuSansMono.ttf</font>
130
    <font type="CB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf</font>
130
    <font type="CB" >__FONT_DIR__/DejaVuSansMono-Bold.ttf</font>
131
    <font type="CO" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf</font>
131
    <font type="CO" >__FONT_DIR__/DejaVuSansMono-Oblique.ttf</font>
132
    <font type="CBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf</font>
132
    <font type="CBO">__FONT_DIR__/DejaVuSansMono-BoldOblique.ttf</font>
133
    <font type="H"  >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf</font>
133
    <font type="H"  >__FONT_DIR__/DejaVuSans.ttf</font>
134
    <font type="HO" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf</font>
134
    <font type="HO" >__FONT_DIR__/DejaVuSans-Oblique.ttf</font>
135
    <font type="HB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf</font>
135
    <font type="HB" >__FONT_DIR__/DejaVuSans-Bold.ttf</font>
136
    <font type="HBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf</font>
136
    <font type="HBO">__FONT_DIR__/DejaVuSans-BoldOblique.ttf</font>
137
 </ttf>
137
 </ttf>
138
138
139
</config>
139
</config>
(-)a/rewrite-config.PL (-1 / +1 lines)
Lines 147-152 $prefix = $ENV{'INSTALL_BASE'} || "/usr"; Link Here
147
  "__USE_MEMCACHED__" => 'no',
147
  "__USE_MEMCACHED__" => 'no',
148
  "__MEMCACHED_SERVERS__" => "",
148
  "__MEMCACHED_SERVERS__" => "",
149
  "__MEMCACHED_NAMESPACE__" => "",
149
  "__MEMCACHED_NAMESPACE__" => "",
150
  "__FONT_DIR__" => "/usr/share/fonts/truetype/ttf-dejavu",
150
);
151
);
151
152
152
# Override configuration from the environment
153
# Override configuration from the environment
153
- 

Return to bug 12549