[SCM] projectm/master: Adjust hard-coded font paths

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

The following commit has been merged in the master branch:
commit f2e2abef5a2990e6b6cca233e07319f8bf9f442e
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Sun Sep 26 23:26:10 2010 +0200

    Adjust hard-coded font paths

diff --git a/debian/patches/06_lprojectm_fonts.patch b/debian/patches/06_lprojectm_fonts.patch
index 11516ca..83ad4f0 100644
--- a/debian/patches/06_lprojectm_fonts.patch
+++ b/debian/patches/06_lprojectm_fonts.patch
@@ -12,5 +12,5 @@ Last-Update: 2010-06-26
 -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/bitstream-vera/Vera.ttf
-+Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/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
diff --git a/debian/patches/10_lprojectm_userfonts.patch b/debian/patches/10_lprojectm_userfonts.patch
index cc0d074..5a3c20c 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/bitstream-vera/Vera.ttf" );
++    ( "Title Font", "/usr/share/fonts/truetype/ttf-bitstream-vera/Vera.ttf" );
      _settings.menuFontURL = config.read<string>
 -    ( "Menu Font", CMAKE_INSTALL_PREFIX  "/share/projectM/fonts/VeraMono.ttf" );
-+    ( "Menu Font", "/usr/share/fonts/bitstream-vera/VeraMono.ttf" );
++    ( "Menu Font", "/usr/share/fonts/truetype/ttf-bitstream-vera/VeraMono.ttf" );
      #endif
  
      #ifdef WIN32

-- 
projectm packaging