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

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

The following commit has been merged in the master branch:
commit f7f9794a0591afb7bb467570a136aff476e95cd3
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Sun Jun 27 17:15:01 2010 +0200

    Move all CMakeLists related stuff to one patch
    
    All patches should apply now.

diff --git a/debian/patches/04_libprojectm_fix-version.patch b/debian/patches/04_libprojectm_fix-cmakelists.patch
similarity index 53%
rename from debian/patches/04_libprojectm_fix-version.patch
rename to debian/patches/04_libprojectm_fix-cmakelists.patch
index 23b232a..9d75dcd 100644
--- a/debian/patches/04_libprojectm_fix-version.patch
+++ b/debian/patches/04_libprojectm_fix-cmakelists.patch
@@ -1,22 +1,36 @@
-Description: Set right upstream version in library
-Forwarded: yes
+Description: Make some changes on libprojectMs CMakeLists.txt
+ * Set right upstream version in library
+ * Remove the USE_THREADS option pending an update from upstream
+ * Exclude fonts from build
+Forwarded: no
 Author: Matthias Klumpp <matthias at nlinux.org>
-Last-Update: 2010-06-25
+Last-Update: 2010-06-26
 
-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 @@
+--- a/src/libprojectM/CMakeLists.txt
++++ b/src/libprojectM/CMakeLists.txt
+@@ -110,9 +110,9 @@
  ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
  endif(BUILD_PROJECTM_STATIC)
  
 -SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.00 SOVERSION 2)
 +SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2)
  
- ADD_DEFINITIONS(-DUSE_THREADS)
+-ADD_DEFINITIONS(-DUSE_THREADS)
++#ADD_DEFINITIONS(-DUSE_THREADS)
  
-@@ -190,8 +190,6 @@
+ if (APPLE)
+ ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
+@@ -123,7 +123,8 @@
+ ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS)
+ else(WIN32)
+ set (RESOURCE_PREFIX "share/projectM")
+-ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
++#ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
++ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS)
+ endif(WIN32)
+ endif(APPLE)
+ 
+@@ -190,8 +191,6 @@
  
  FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
  INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
diff --git a/debian/patches/05_libprojectm_fonts.patch b/debian/patches/05_libprojectm_fonts.patch
index 028190d..1e95caa 100644
--- a/debian/patches/05_libprojectm_fonts.patch
+++ b/debian/patches/05_libprojectm_fonts.patch
@@ -1,5 +1,4 @@
-Description: Make projectM load system fonts and exclude fonts
- delivered with projectM from build.
+Description: Make projectM load system fonts.
 Forwarded: not-needed
 Author: Matthias Klumpp <matthias at nlinux.org>
 Last-Update: 2010-06-25
@@ -7,11 +6,11 @@ Last-Update: 2010-06-25
 --- 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
-  
+ 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
deleted file mode 100644
index c488228..0000000
--- a/debian/patches/06_libprojectm_use-threads.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Patch to remove the USE_THREADS option pending an update from upstream
-Origin: fedora, http://cvs.fedoraproject.org/viewvc/rpms/libprojectM/devel/libprojectM-USE_THREADS.patch?view=log
-Author: Jameson Pugh <imntreal at gmail.com>
-Last-Update: 2010-06-25
-
---- 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)
- 
--ADD_DEFINITIONS(-DUSE_THREADS)
-+#ADD_DEFINITIONS(-DUSE_THREADS)
- 
- if (APPLE)
- ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
-@@ -123,7 +123,7 @@ set (RESOURCE_PREFIX "Resources")
- ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS)
- else(WIN32)
- set (RESOURCE_PREFIX "share/projectM")
--ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS -DUSE_THREADS)
-+ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS)
- endif(WIN32)
- endif(APPLE)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2f986f0..5fb3dc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 01_pulseaudio_cmakelist.patch
 02_desktop-encoding.patch
 03_pulseaudio_stat.patch
-04_libprojectm_fix-version.patch
+04_libprojectm_fix-cmakelists.patch
 05_libprojectm_fonts.patch
-06_libprojectm_use-threads.patch

-- 
projectm packaging