[SCM] projectm packaging branch, master, updated. debian/2.0.1+dfsg-2-4-g32f2af1

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

The following commit has been merged in the master branch:
commit 32f2af178bb481c002e052ddc2a57920790796de
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Sat Jul 31 18:43:55 2010 +0200

    Add patch for #591011
    
    * Updated libprojectm_fix-cmake patch
    * Updated changelog

diff --git a/debian/changelog b/debian/changelog
index 720f8e8..3ee00c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+projectm (2.0.1+dfsg-3) unstable; urgency=low
+
+  * Generate valid pc file for libprojectM (Closes: #591011)
+  * Update debian/watch file
+  * Replaced section 'libs' with 'sound' in libvisual-projectm
+    (Solves override disparity)
+
+ -- Matthias Klumpp <matthias at nlinux.org>  Sat, 31 Jul 2010 18:41:14 +0200
+
 projectm (2.0.1+dfsg-2) unstable; urgency=low
 
   * Prevent projectM-pulseaudio from crashing if graphics
diff --git a/debian/patches/05_libprojectm_fix-cmakelists.patch b/debian/patches/05_libprojectm_fix-cmakelists.patch
index 9d75dcd..771c157 100644
--- a/debian/patches/05_libprojectm_fix-cmakelists.patch
+++ b/debian/patches/05_libprojectm_fix-cmakelists.patch
@@ -2,13 +2,48 @@ 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
+ * Correctly set LIB_INSTALl_DIR variable (Closes: #591011)
 Forwarded: no
 Author: Matthias Klumpp <matthias at nlinux.org>
 Last-Update: 2010-06-26
 
 --- a/src/libprojectM/CMakeLists.txt
 +++ b/src/libprojectM/CMakeLists.txt
-@@ -110,9 +110,9 @@
+@@ -5,13 +5,11 @@
+ INCLUDE(cmake/CPack-projectM.cmake)
+ 
+ 
+-
+-
+ cmake_policy(SET CMP0005 OLD)
+ 
+ 
+ set( CMAKE_MODULE_PATH    ${CMAKE_MODULE_PATH}
+-                          ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
++                          ${CMAKE_CURRENT_SOURCE_DIR}/cmake )     
+ 
+ OPTION (USE_DEVIL "Use devIL for image loading rather than the builtin SOIL library" OFF)
+ 
+@@ -34,8 +32,18 @@
+ OPTION (DISABLE_NATIVE_PRESETS "Turn off support for native (C++ style) presets" OFF)
+ OPTION (DISABLE_MILKDROP_PRESETS "Turn off support for Milkdrop (.milk / .prjm) presets"  OFF)
+ 
++SET(LIB_SUFFIX ""
++  CACHE STRING "Define suffix of directory name (32/64)"
++  FORCE)
++
++ADD_DEFINITIONS(-DLIB_SUFFIX="\\\"${LIB_SUFFIX}\\\"")
++
+ ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
+ 
++SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
++  CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})"
++  FORCE)  
++  
+ if (USE_NATIVE_GLEW)
+ ADD_DEFINITIONS(-DUSE_NATIVE_GLEW)
+ SET(GLEW_SOURCES glew.h glew.c)
+@@ -110,9 +118,9 @@
  ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
  endif(BUILD_PROJECTM_STATIC)
  
@@ -20,7 +55,7 @@ Last-Update: 2010-06-26
  
  if (APPLE)
  ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS -DUSE_THREADS)
-@@ -123,7 +123,8 @@
+@@ -123,7 +131,8 @@
  ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS -DUSE_THREADS)
  else(WIN32)
  set (RESOURCE_PREFIX "share/projectM")
@@ -30,7 +65,7 @@ Last-Update: 2010-06-26
  endif(WIN32)
  endif(APPLE)
  
-@@ -190,8 +191,6 @@
+@@ -190,8 +199,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/series b/debian/patches/series
index fc62544..86ea8fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07_cg-profile-setting.patch
 08_qprojectm-openglcontext.patch
 09_error-handling.patch
+

-- 
projectm packaging