[SCM] projectm packaging branch, master, updated. 2.0.1+dfsg-22-g4e6d995

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4e6d99520df73a3f1ab7621f4efdb09f8079982e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 25 22:40:25 2010 +0200

    refresh debian/patches/05_libprojectm_fonts.patch

diff --git a/debian/patches/05_libprojectm_fonts.patch b/debian/patches/05_libprojectm_fonts.patch
index 6fd6fa9..26d7dd7 100644
--- a/debian/patches/05_libprojectm_fonts.patch
+++ b/debian/patches/05_libprojectm_fonts.patch
@@ -3,11 +3,9 @@ from build.
 
 Author: Matthias <matthias at nlinux.org>
 
-Index: projectm-2.0.1/src/libprojectM/CMakeLists.txt
-===================================================================
---- projectm-2.0.1.orig/src/libprojectM/CMakeLists.txt	2010-06-25 17:27:33.154001560 +0200
-+++ projectm-2.0.1/src/libprojectM/CMakeLists.txt	2010-06-25 17:27:33.154001560 +0200
-@@ -169,8 +169,6 @@
+--- a/src/libprojectM/CMakeLists.txt
++++ b/src/libprojectM/CMakeLists.txt
+@@ -190,8 +190,6 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_D
  
  FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
  INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
@@ -16,16 +14,14 @@ Index: projectm-2.0.1/src/libprojectM/CMakeLists.txt
  INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
-Index: projectm-2.0.1/src/libprojectM/config.inp.in
-===================================================================
---- projectm-2.0.1.orig/src/libprojectM/config.inp.in	2010-06-24 20:54:46.000000000 +0200
-+++ projectm-2.0.1/src/libprojectM/config.inp.in	2010-06-25 17:27:33.154001560 +0200
-@@ -17,6 +17,6 @@
- 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/bitstream-vera/Vera.ttf
-+Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/VeraMono.ttf
-  
+--- a/src/libprojectM/config.inp.in
++++ b/src/libprojectM/config.inp.in
+@@ -17,6 +17,6 @@ Hard Cut Sensitivity = 10       # Lower 
+ 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/bitstream-vera/Vera.ttf
++Menu Font = @CMAKE_INSTALL_PREFIX@/share/fonts/bitstream-vera/VeraMono.ttf
+  

-- 
projectm packaging