[SCM] Gnuplot. Interactive plotting program branch, master, updated. debian/4.6.0-5-4-gd572c4e

[Anton Gladky]

The following commit has been merged in the master branch:
commit d572c4e81a83d0d20e0e917ddbf338f96660b9b5
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Apr 25 21:41:21 2012 +0200

    Replace ttf-liberation by fonts-liberation. Thanks to Fabian Greffrath. (Closes: #670423)

diff --git a/debian/control b/debian/control
index 1ea3afc..c44909b 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Description: Command-line driven interactive plotting program
 Package: gnuplot-nox
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: groff, ttf-liberation
+Recommends: groff, fonts-liberation
 Suggests: gnuplot-x11, gnuplot-doc
 Description: Command-line driven interactive plotting program
  Gnuplot is a portable command-line driven interactive data and function
diff --git a/debian/patches/05_default_gd_font.diff b/debian/patches/05_default_gd_font.diff
index ddf0696..2e8f863 100644
--- a/debian/patches/05_default_gd_font.diff
+++ b/debian/patches/05_default_gd_font.diff
@@ -5,7 +5,7 @@
  		png_state.ttffont = gp_strdup(external_default);
  	else	/* Might as well try some plausible font; it's no worse than failing immediately */
 -		png_state.ttffont = gp_strdup("arial");
-+		png_state.ttffont = gp_strdup("/usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf");
++		png_state.ttffont = gp_strdup("/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf");
  
  	free(png_state.default_ttffont);
  	png_state.default_ttffont = gp_strdup(png_state.ttffont);

-- 
Gnuplot. Interactive plotting program