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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9d4ce6d86ae9dc4097f3d2f07352aec52fe74e75
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 27 09:36:15 2010 +0200

    refresh patches and drop already applied hunks

diff --git a/debian/patches/05_libprojectm_fonts.patch b/debian/patches/05_libprojectm_fonts.patch
index c14a795..028190d 100644
--- a/debian/patches/05_libprojectm_fonts.patch
+++ b/debian/patches/05_libprojectm_fonts.patch
@@ -4,25 +4,14 @@ 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
-@@ -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)
 --- a/src/libprojectM/config.inp.in
 +++ b/src/libprojectM/config.inp.in
-@@ -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
-  
+@@ -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
+  
diff --git a/debian/patches/06_libprojectm_use-threads.patch b/debian/patches/06_libprojectm_use-threads.patch
index 7269326..c488228 100644
--- a/debian/patches/06_libprojectm_use-threads.patch
+++ b/debian/patches/06_libprojectm_use-threads.patch
@@ -3,18 +3,18 @@ Origin: fedora, http://cvs.fedoraproject.org/viewvc/rpms/libprojectM/devel/libpr
 Author: Jameson Pugh <imntreal at gmail.com>
 Last-Update: 2010-06-25
 
---- projectm-2.0.1.orig/src/libprojectM/CMakeLists.txt	2010-02-08 09:11:11.000000000 -0500
-+++ projectm-2.0.1/src/libprojectM/CMakeLists.txt	2010-02-08 09:20:37.000000000 -0500
-@@ -112,7 +112,7 @@
+--- a/src/libprojectM/CMakeLists.txt
++++ b/src/libprojectM/CMakeLists.txt
+@@ -112,7 +112,7 @@ endif(BUILD_PROJECTM_STATIC)
  
- SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2.0.1)
+ SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2)
  
 -ADD_DEFINITIONS(-DUSE_THREADS)
 +#ADD_DEFINITIONS(-DUSE_THREADS)
  
  if (APPLE)
  ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ set (RESOURCE_PREFIX "Resources")
  ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS)
  else(WIN32)
  set (RESOURCE_PREFIX "share/projectM")

-- 
projectm packaging