[SCM] projectm/master: Use DejaVu font instead of Bistream-vera (Closes: #630557)

[ximion-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 10d6d7d1d59cc76796a3d27cab642e6c2b46afac
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Mon Jul 4 23:19:02 2011 +0200

    Use DejaVu font instead of Bistream-vera (Closes: #630557)
    
    Using DejaVu is indeed a good suggestion,
    as we don't force users to install an extra-font
    which is not installed by default now.
    Also, DejaVu looks nice with projectM.

diff --git a/debian/control b/debian/control
index eab4924..bddef09 100644
--- a/debian/control
+++ b/debian/control
@@ -2,34 +2,32 @@ Source: projectm
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders:
- Matthias Klumpp <matthias at nlinux.org>,
- Reinhard Tartler <siretart at tauware.de>
+Uploaders: Matthias Klumpp <matthias at nlinux.org>,
+           Reinhard Tartler <siretart at tauware.de>
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/projectm.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/projectm.git
-Build-Depends:
- cmake,
- debhelper (>= 8),
- libfreetype6-dev,
- libftgl-dev,
- libgl1-mesa-dev,
- libglew-dev,
- libglu-dev,
- libice-dev,
- libjack-dev,
- libpulse-dev,
- libqt4-dev,
- libqt4-opengl-dev,
- libsdl1.2-dev,
- libvisual-0.4-dev,
- libx11-dev
+Build-Depends: cmake,
+               debhelper (>= 8),
+               libfreetype6-dev,
+               libftgl-dev,
+               libgl1-mesa-dev,
+               libglew-dev,
+               libglu-dev,
+               libice-dev,
+               libjack-dev,
+               libpulse-dev,
+               libqt4-dev,
+               libqt4-opengl-dev,
+               libsdl1.2-dev,
+               libvisual-0.4-dev,
+               libx11-dev
 Standards-Version: 3.9.2
 Homepage: http://projectm.sf.net
 
 Package: libprojectm2
 Architecture: any
 Section: libs
-Depends: projectm-data, ttf-bitstream-vera, ${misc:Depends}, ${shlibs:Depends}
+Depends: projectm-data, ttf-dejavu-core, ${misc:Depends}, ${shlibs:Depends}
 Replaces: libprojectm-data (<< 2.0.1)
 Description: Advanced Milkdrop-compatible music visualization library
  libprojectm is an iterative music visualization library which uses
diff --git a/debian/patches/06_lprojectm_fonts.patch b/debian/patches/06_lprojectm_fonts.patch
index 83ad4f0..92f10d7 100644
--- a/debian/patches/06_lprojectm_fonts.patch
+++ b/debian/patches/06_lprojectm_fonts.patch
@@ -6,11 +6,11 @@ Last-Update: 2010-06-26
 --- a/src/libprojectM/config.inp.in
 +++ b/src/libprojectM/config.inp.in
 @@ -17,6 +17,5 @@
- Aspect Correction = true	# Custom Shape Aspect Correction
- 
- Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
--Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
--Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
-- 
-+Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf
-+Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf
+ Aspect Correction = true	# Custom Shape Aspect Correction
+ 
+ Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location
+-Title Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/Vera.ttf
+-Menu Font = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/fonts/VeraMono.ttf
+- 
++Title Font = @CMAKE_INSTALL_PREFIX@/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
++Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
diff --git a/debian/patches/10_lprojectm_userfonts.patch b/debian/patches/10_lprojectm_userfonts.patch
index 85f0b9b..86f1247 100644
--- a/debian/patches/10_lprojectm_userfonts.patch
+++ b/debian/patches/10_lprojectm_userfonts.patch
@@ -11,10 +11,10 @@ Last-Update: 2010-09-25
      #ifdef LINUX
      _settings.titleFontURL = config.read<string>
 -    ( "Title Font", CMAKE_INSTALL_PREFIX  "/share/projectM/fonts/Vera.ttf" );
-+    ( "Title Font", "/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf" );
++    ( "Title Font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf" );
      _settings.menuFontURL = config.read<string>
 -    ( "Menu Font", CMAKE_INSTALL_PREFIX  "/share/projectM/fonts/VeraMono.ttf" );
-+    ( "Menu Font", "/usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf" );
++    ( "Menu Font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf" );
      #endif
  
      #ifdef WIN32

-- 
projectm packaging