[SCM] projectm packaging branch, master, updated. upstream/2.0.1+dfsg-27-g3f0c7f2

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

The following commit has been merged in the master branch:
commit 3f0c7f22d5f198c3f6670f21e82672cbef453e23
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Sat Jun 26 14:51:07 2010 +0200

    Refreshed patches

diff --git a/debian/patches/04_libprojectm_fix-version.patch b/debian/patches/04_libprojectm_fix-version.patch
index cce1ec8..23b232a 100644
--- a/debian/patches/04_libprojectm_fix-version.patch
+++ b/debian/patches/04_libprojectm_fix-version.patch
@@ -3,8 +3,10 @@ Forwarded: yes
 Author: Matthias Klumpp <matthias at nlinux.org>
 Last-Update: 2010-06-25
 
---- a/src/libprojectM/CMakeLists.txt	2010-01-16 17:23:11.000000000 -0500
-+++ b/src/libprojectM/CMakeLists.txt	2010-01-16 17:23:40.000000000 -0500
+Index: projectm-2.0.1+dfsg/src/libprojectM/CMakeLists.txt
+===================================================================
+--- projectm-2.0.1+dfsg.orig/src/libprojectM/CMakeLists.txt	2010-06-24 20:05:49.000000000 +0200
++++ projectm-2.0.1+dfsg/src/libprojectM/CMakeLists.txt	2010-06-25 22:54:10.887652510 +0200
 @@ -110,7 +110,7 @@
  ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
  endif(BUILD_PROJECTM_STATIC)
@@ -14,3 +16,12 @@ Last-Update: 2010-06-25
  
  ADD_DEFINITIONS(-DUSE_THREADS)
  
+@@ -190,8 +190,6 @@
+ 
+ FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
+ INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
+-FILE(GLOB fonts "fonts/*.ttf")
+-INSTALL(FILES ${fonts} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/fonts)
+ 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)
diff --git a/debian/patches/05_libprojectm_fonts.patch b/debian/patches/05_libprojectm_fonts.patch
index d78ff50..3c698d1 100644
--- a/debian/patches/05_libprojectm_fonts.patch
+++ b/debian/patches/05_libprojectm_fonts.patch
@@ -4,8 +4,10 @@ Forwarded: not-needed
 Author: Matthias Klumpp <matthias at nlinux.org>
 Last-Update: 2010-06-25
 
---- a/src/libprojectM/CMakeLists.txt
-+++ b/src/libprojectM/CMakeLists.txt
+Index: projectm-2.0.1+dfsg/src/libprojectM/CMakeLists.txt
+===================================================================
+--- projectm-2.0.1+dfsg.orig/src/libprojectM/CMakeLists.txt
++++ projectm-2.0.1+dfsg/src/libprojectM/CMakeLists.txt
 @@ -190,8 +190,6 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_D
  
  FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
@@ -15,8 +17,10 @@ Last-Update: 2010-06-25
  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)
---- a/src/libprojectM/config.inp.in
-+++ b/src/libprojectM/config.inp.in
+Index: projectm-2.0.1+dfsg/src/libprojectM/config.inp.in
+===================================================================
+--- projectm-2.0.1+dfsg.orig/src/libprojectM/config.inp.in
++++ projectm-2.0.1+dfsg/src/libprojectM/config.inp.in
 @@ -17,6 +17,6 @@ Hard Cut Sensitivity = 10       # Lower 
  Aspect Correction = true	# Custom Shape Aspect Correction
  

-- 
projectm packaging