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

(-)a/Makefile.PL (-2 / +2 lines)
Lines 96-102 Makefile.PL - Koha packager and installer Link Here
96
    --install_sru                Install the SRU server (yes, no)
96
    --install_sru                Install the SRU server (yes, no)
97
    --install_pazpar2            Install PazPar2 (yes, no)
97
    --install_pazpar2            Install PazPar2 (yes, no)
98
    --use_memcached              Use Memcached (yes, no)
98
    --use_memcached              Use Memcached (yes, no)
99
    --font_dir                   Location of fonts (e.g. /usr/share/fonts/truetype/ttf-dejavu)
99
    --font_dir                   Location of fonts (e.g. /usr/share/fonts/truetype/dejavu)
100
    --run_database_tests         Run database dependent tests (yes, no)
100
    --run_database_tests         Run database dependent tests (yes, no)
101
    --install_base               Base directory of installation (e.g. /usr/share/koha)
101
    --install_base               Base directory of installation (e.g. /usr/share/koha)
102
    --template-cache-dir         Specify a template cache directory (e.g. /var/cache/koha)
102
    --template-cache-dir         Specify a template cache directory (e.g. /var/cache/koha)
Lines 509-515 my %config_defaults = ( Link Here
509
  'USE_ELASTICSEARCH'     => 'no',
509
  'USE_ELASTICSEARCH'     => 'no',
510
  'ELASTICSEARCH_SERVERS' => 'localhost:9200',
510
  'ELASTICSEARCH_SERVERS' => 'localhost:9200',
511
  'ELASTICSEARCH_INDEX'  => 'koha',
511
  'ELASTICSEARCH_INDEX'  => 'koha',
512
  'FONT_DIR'          => '/usr/share/fonts/truetype/ttf-dejavu'
512
  'FONT_DIR'          => '/usr/share/fonts/truetype/dejavu'
513
);
513
);
514
514
515
# set some default configuration options based on OS
515
# set some default configuration options based on OS
(-)a/debian/control (-3 / +3 lines)
Lines 162-168 Build-Depends: libalgorithm-checkdigits-perl, Link Here
162
 libxml-writer-perl,
162
 libxml-writer-perl,
163
 libyaml-perl,
163
 libyaml-perl,
164
 libyaml-syck-perl,
164
 libyaml-syck-perl,
165
 debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, ttf-dejavu,
165
 debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, fonts-dejavu | ttf-dejavu,
166
 libxml2-utils, bash-completion, perl-modules-5.26 | libtest-simple-perl (>= 1.302073)
166
 libxml2-utils, bash-completion, perl-modules-5.26 | libtest-simple-perl (>= 1.302073)
167
167
168
Package: koha-common
168
Package: koha-common
Lines 182-188 Depends: ${misc:Depends}, ${koha:Depends}, Link Here
182
 pwgen,
182
 pwgen,
183
 starman,
183
 starman,
184
 sudo,
184
 sudo,
185
 ttf-dejavu,
185
 fonts-dejavu | ttf-dejavu,
186
 unzip,
186
 unzip,
187
 xmlstarlet,
187
 xmlstarlet,
188
 yaz
188
 yaz
Lines 230-236 Depends: ${misc:Depends}, Link Here
230
 pwgen,
230
 pwgen,
231
 starman,
231
 starman,
232
 sudo,
232
 sudo,
233
 ttf-dejavu,
233
 fonts-dejavu | ttf-dejavu,
234
 unzip,
234
 unzip,
235
 xmlstarlet,
235
 xmlstarlet,
236
 yaz
236
 yaz
(-)a/debian/control.in (-3 / +3 lines)
Lines 10-16 Standards-Version: 3.8.4 Link Here
10
# See debian/rules, the override_dh_gencontrol rules. 
10
# See debian/rules, the override_dh_gencontrol rules. 
11
# There are some exceptions.
11
# There are some exceptions.
12
Build-Depends:__AUTODEPENDS__,
12
Build-Depends:__AUTODEPENDS__,
13
 debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, ttf-dejavu,
13
 debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, fonts-dejavu | ttf-dejavu,
14
 libxml2-utils, bash-completion, perl-modules-5.26 | libtest-simple-perl (>= 1.302073)
14
 libxml2-utils, bash-completion, perl-modules-5.26 | libtest-simple-perl (>= 1.302073)
15
15
16
Package: koha-common
16
Package: koha-common
Lines 30-36 Depends: ${misc:Depends}, ${koha:Depends}, Link Here
30
 pwgen,
30
 pwgen,
31
 starman,
31
 starman,
32
 sudo,
32
 sudo,
33
 ttf-dejavu,
33
 fonts-dejavu | ttf-dejavu,
34
 unzip,
34
 unzip,
35
 xmlstarlet,
35
 xmlstarlet,
36
 yaz
36
 yaz
Lines 78-84 Depends: ${misc:Depends}, Link Here
78
 pwgen,
78
 pwgen,
79
 starman,
79
 starman,
80
 sudo,
80
 sudo,
81
 ttf-dejavu,
81
 fonts-dejavu | ttf-dejavu,
82
 unzip,
82
 unzip,
83
 xmlstarlet,
83
 xmlstarlet,
84
 yaz
84
 yaz
(-)a/debian/templates/koha-conf-site.xml.in (-12 / +12 lines)
Lines 328-345 __END_SRU_PUBLICSERVER__ Link Here
328
328
329
 <!-- true type font mapping according to type from $font_types in C4/Creators/Lib.pm -->
329
 <!-- true type font mapping according to type from $font_types in C4/Creators/Lib.pm -->
330
 <ttf>
330
 <ttf>
331
    <font type="TR" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf</font>
331
    <font type="TR" >/usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf</font>
332
    <font type="TB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf</font>
332
    <font type="TB" >/usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf</font>
333
    <font type="TI" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Italic.ttf</font>
333
    <font type="TI" >/usr/share/fonts/truetype/dejavu/DejaVuSerif-Italic.ttf</font>
334
    <font type="TBI">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldItalic.ttf</font>
334
    <font type="TBI">/usr/share/fonts/truetype/dejavu/DejaVuSerif-BoldItalic.ttf</font>
335
    <font type="C"  >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf</font>
335
    <font type="C"  >/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf</font>
336
    <font type="CB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf</font>
336
    <font type="CB" >/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf</font>
337
    <font type="CO" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf</font>
337
    <font type="CO" >/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Oblique.ttf</font>
338
    <font type="CBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf</font>
338
    <font type="CBO">/usr/share/fonts/truetype/dejavu/DejaVuSansMono-BoldOblique.ttf</font>
339
    <font type="H"  >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf</font>
339
    <font type="H"  >/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf</font>
340
    <font type="HO" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf</font>
340
    <font type="HO" >/usr/share/fonts/truetype/dejavu/DejaVuSans-Oblique.ttf</font>
341
    <font type="HB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf</font>
341
    <font type="HB" >/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf</font>
342
    <font type="HBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf</font>
342
    <font type="HBO">/usr/share/fonts/truetype/dejavu/DejaVuSans-BoldOblique.ttf</font>
343
 </ttf>
343
 </ttf>
344
344
345
 <!-- Path to the config file for SMS::Send -->
345
 <!-- Path to the config file for SMS::Send -->
(-)a/rewrite-config.PL (-2 / +1 lines)
Lines 153-159 $prefix = $ENV{'INSTALL_BASE'} || "/usr"; Link Here
153
  "__USE_ELASTICSEARCH__" => 'no',
153
  "__USE_ELASTICSEARCH__" => 'no',
154
  "__ELASTICSEARCH_SERVERS__" => "localhost:9200",
154
  "__ELASTICSEARCH_SERVERS__" => "localhost:9200",
155
  "__ELASTICSEARCH_INDEX__" => "koha",
155
  "__ELASTICSEARCH_INDEX__" => "koha",
156
  "__FONT_DIR__" => "/usr/share/fonts/truetype/ttf-dejavu",
156
  "__FONT_DIR__" => "/usr/share/fonts/truetype/dejavu",
157
  "__TEMPLATE_CACHE_DIR__" => "/tmp/koha"
157
  "__TEMPLATE_CACHE_DIR__" => "/tmp/koha"
158
);
158
);
159
159
160
- 

Return to bug 25792