[SCM] projectm packaging branch, master, updated. 2.0.1+dfsg-25-g2902daa

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

The following commit has been merged in the master branch:
commit 83c2d585dd05f919f02a3e4c681a6018abf93404
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Fri Jun 25 22:50:36 2010 +0200

    Just change projectM version, do not touch SONAME
    
    * Updated SONAME patch

diff --git a/debian/control b/debian/control
index 2ca66b8..fe08c25 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,9 @@ Build-Depends: debhelper (>= 7.0.50~), cmake, libqt4-dev, libqt4-opengl-dev, lib
 Standards-Version: 3.8.4
 Homepage: http://projectm.sf.net
 
-Package: libprojectm2.0.1
+Package: libprojectm2
 Architecture: any
 Section: libs
-Replaces: libprojectm2
-Breaks: libprojectm2
 Depends: ${misc:Depends}, ${shlibs:Depends}, ttf-bitstream-vera
 Description: Advanced Milkdrop-compatible music visualization library
  libprojectm is an iterative music visualization library which uses
@@ -26,7 +24,7 @@ Description: Advanced Milkdrop-compatible music visualization library
 Package: libprojectm-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libprojectm2.0.1 (= ${binary:Version})
+Depends: ${misc:Depends}, libprojectm2 (= ${binary:Version})
 Description: Advanced Milkdrop-compatible music visualization library - dev
  libprojectm is an iterative music visualization library which uses
  OpenGL for hardware acceleration. It is compatible with Milkdrop
diff --git a/debian/patches/04_libprojectm_fix-soname.patch b/debian/patches/04_libprojectm_fix-version.patch
similarity index 98%
rename from debian/patches/04_libprojectm_fix-soname.patch
rename to debian/patches/04_libprojectm_fix-version.patch
index 3a29984..0ba1f8d 100644
--- a/debian/patches/04_libprojectm_fix-soname.patch
+++ b/debian/patches/04_libprojectm_fix-version.patch
@@ -6,7 +6,7 @@ diff -Naur libprojectM-2.0.1-orig/CMakeLists.txt libprojectM-2.0.1/CMakeLists.tx
  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.0.1)
++SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION 2.0.1 SOVERSION 2)
  
  ADD_DEFINITIONS(-DUSE_THREADS)
  
diff --git a/debian/patches/05_libprojectm_fonts.patch b/debian/patches/05_libprojectm_fonts.patch
index 26eefbc..26d7dd7 100644
--- a/debian/patches/05_libprojectm_fonts.patch
+++ b/debian/patches/05_libprojectm_fonts.patch
@@ -2,11 +2,10 @@ Set the right system font directories and exclude fonts
 from build.
 
 Author: Matthias <matthias at nlinux.org>
-Index: projectm-2.0.1/src/libprojectM/CMakeLists.txt
-===================================================================
---- a/src/libprojectM/CMakeLists.txt	2010-06-25 17:27:33.154001560 +0200
-+++ b/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)
@@ -15,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
-===================================================================
---- a/src/libprojectM/config.inp.in	2010-06-24 20:54:46.000000000 +0200
-+++ b/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
+  
diff --git a/debian/patches/series b/debian/patches/series
index c8f02ee..2f986f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
 01_pulseaudio_cmakelist.patch
 02_desktop-encoding.patch
 03_pulseaudio_stat.patch
-04_libprojectm_fix-soname.patch
+04_libprojectm_fix-version.patch
 05_libprojectm_fonts.patch
 06_libprojectm_use-threads.patch

-- 
projectm packaging