[med-svn] [pirs] 01/02: Do not use non-free font arial.ttf but rather LiberationSans-Regular.ttf from ttf-liberation (this also fixes autopkgtest)

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository pirs.

commit a7d9a96f00f9b65ec69456b9c2b491797e5e63a9
Author: Andreas Tille <tille at debian.org>
Date:   Sat Jan 14 09:41:39 2017 +0100

    Do not use non-free font arial.ttf but rather LiberationSans-Regular.ttf from ttf-liberation (this also fixes autopkgtest)
---
 debian/changelog                               |  7 ++++
 debian/control                                 |  4 +-
 debian/patches/do_not_seek_for_arial.ttf.patch | 57 ++++++++++++++++++++++++++
 debian/patches/series                          |  1 +
 4 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6c368f4..eafac32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pirs (2.0.2+dfsg-5) UNRELEASED; urgency=medium
+
+  * Do not use non-free font arial.ttf but rather LiberationSans-Regular.ttf from
+    ttf-liberation (this also fixes autopkgtest)
+
+ -- Andreas Tille <tille at debian.org>  Sat, 14 Jan 2017 09:40:38 +0100
+
 pirs (2.0.2+dfsg-4) unstable; urgency=medium
 
   * Really fix build for -A
diff --git a/debian/control b/debian/control
index b2dcfac..2c182b2 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,9 @@ Package: pirs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         pirs-profiles
+         pirs-profiles,
+         ttf-liberation,
+         gnuplot
 Description: Profile based Illumina pair-end Reads Simulator
  The program pIRS can be used for simulating Illumina PE reads, with a
  series of characters generated by Illumina sequencing platform, such as
diff --git a/debian/patches/do_not_seek_for_arial.ttf.patch b/debian/patches/do_not_seek_for_arial.ttf.patch
new file mode 100644
index 0000000..39f5835
--- /dev/null
+++ b/debian/patches/do_not_seek_for_arial.ttf.patch
@@ -0,0 +1,57 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 14 Jan 2017 09:40:38 +0100
+Description: Replace arial.ttf by LiberationSans-Regular.ttf
+ and prevent using locate which is not nice in autopkgtest
+
+--- a/src/stator/gcContCvgBias/gc_coverage_bias_plot.pl
++++ b/src/stator/gcContCvgBias/gc_coverage_bias_plot.pl
+@@ -50,13 +50,13 @@ chomp(my $user=`id -nru`);
+ my ($gnuplot,$font);
+ if ($user eq 'galaxy') {
+     $gnuplot='gnuplot';
+-    $font='/home/galaxy/fonts/arial.ttf';
++    $font='/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf';
+ } else {
+     #$gnuplot='/opt/blc/genome/biosoft/gnuplot-4.4.0/bin/gnuplot';
+-    $font='/ifs1/ST_ASMB/USER/huxuesong/public/fonts/arial.ttf';
++    $font='/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf';
+     $gnuplot='gnuplot';
+ }
+-chomp(my @ttfile=`locate arial.ttf`);
++chomp(my @ttfile='/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf');
+ $font = $ttfile[0] if @ttfile;
+ open P,'>',$name.'.dem' or die "Error openimg $name.dem: $!\n";
+ my $yrange='#set yrange [0:10]';
+--- a/src/stator/baseQualityTransition/hist.dem
++++ b/src/stator/baseQualityTransition/hist.dem
+@@ -8,7 +8,7 @@ set logscale y
+ #set xtic rotate by -45 scale 0
+ #set bmargin 10 
+ 
+-set term png font "/export/data0/Fonts/win7/arial.ttf" 48 size 2102,1576 truecolor linewidth 3
++set term png font "/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf" 48 size 2102,1576 truecolor linewidth 3
+ set output "mQhist.png"
+ 
+ set xlabel "Average Q per reads"
+--- a/src/stator/indel_hist.dem
++++ b/src/stator/indel_hist.dem
+@@ -7,7 +7,7 @@
+ #set xtic rotate by -45 scale 0
+ #set bmargin 10 
+ 
+-set term png font "/home/huxuesong/arial.ttf" 48 size 2102,1576 truecolor linewidth 3
++set term png font "/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf" 48 size 2102,1576 truecolor linewidth 3
+ set output "InDel_hist.png"
+ 
+ set xlabel "Read Cycle"
+--- a/src/stator/baseQualityTransition/ifollowQplot.dem
++++ b/src/stator/baseQualityTransition/ifollowQplot.dem
+@@ -6,7 +6,7 @@ set mytics
+ set xtics out
+ set ytics out
+ 
+-set term png font "/export/data0/Fonts/win7/arial.ttf" 48 size 2102,1576 truecolor linewidth 3
++set term png font "/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf" 48 size 2102,1576 truecolor linewidth 3
+ set output "ifollowQplot.png"
+ 
+ # Color runs from white to green
diff --git a/debian/patches/series b/debian/patches/series
index c4e1235..a45167d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_debian_packaged_libgzstream.patch
 Fix-spelling-of-sse2-option.patch
+do_not_seek_for_arial.ttf.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/pirs.git