[SCM] projectm packaging branch, master, updated. 2.0.1+dfsg-26-gaab1786

Fri Jun 25 21:11:14 UTC 2010

The following commit has been merged in the master branch:
commit aab1786e48093459093b5591d4fe1a813824488b
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Fri Jun 25 23:11:00 2010 +0200

    Added DEP3 patch headers to patches

diff --git a/debian/patches/01_pulseaudio_cmakelist.patch b/debian/patches/01_pulseaudio_cmakelist.patch
index cf295f8..e52fa9b 100644
--- a/debian/patches/01_pulseaudio_cmakelist.patch
+++ b/debian/patches/01_pulseaudio_cmakelist.patch
@@ -1,8 +1,10 @@
-Change projectM-pulseaudio CMakeLists.txt to search for some required
-files of the PulseAudio part in build dir.
-(Makes compiling out-of-source possible)
+Description: Fix FTBSF cause moc files are not found
+ This patch modifies the CMakeList of projectM-pulseaudio
+ (Makes compiling out-of-source possible)
+Forwarded: yes
+Author: Matthias Klumpp <matthias at nlinux.org>
+Last-Update: 2010-06-25
 
-Author: Matthias <matthias at nlinux.org>
 Index: projectm-2.0.1/src/projectM-pulseaudio/CMakeLists.txt
 ===================================================================
 --- projectm-2.0.1.orig/src/projectM-pulseaudio/CMakeLists.txt	2010-05-04 21:48:09.739838192 +0200
diff --git a/debian/patches/02_desktop-encoding.patch b/debian/patches/02_desktop-encoding.patch
index a4c39b5..80419f3 100644
--- a/debian/patches/02_desktop-encoding.patch
+++ b/debian/patches/02_desktop-encoding.patch
@@ -1,4 +1,8 @@
-Remove encoding keys from .desktop files.
+Description: Remove encoding keys from .desktop files.
+Forwarded: yes
+Author: Matthias Klumpp <matthias at nlinux.org>
+Last-Update: 2010-06-25
+
 Index: projectm-2.0.1/src/projectM-jack/projectM-jack.desktop
 ===================================================================
 --- projectm-2.0.1.orig/src/projectM-jack/projectM-jack.desktop	2010-05-18 17:39:03.925815509 +0200
diff --git a/debian/patches/03_pulseaudio_stat.patch b/debian/patches/03_pulseaudio_stat.patch
index 140429f..cbc6857 100644
--- a/debian/patches/03_pulseaudio_stat.patch
+++ b/debian/patches/03_pulseaudio_stat.patch
@@ -1,3 +1,7 @@
+Description: Add stat.h to projectM-pulseaudio fix FTBFS in some cases.
+Origin: fedora, http://cvs.fedoraproject.org/viewvc/rpms/projectM-pulseaudio/devel/projectM-pulseaudio-stat.patch?view=log
+Last-Update: 2010-06-25
+
 diff -Naur projectM-pulseaudio-2.0.1-orig/qprojectM-pulseaudio.cpp projectM-pulseaudio-2.0.1/qprojectM-pulseaudio.cpp
 --- projectm-2.0.1.orig/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp	2010-01-26 11:52:18.000000000 -0500
 +++ projectm-2.0.1/src/projectM-pulseaudio/qprojectM-pulseaudio.cpp		2010-01-26 12:09:43.000000000 -0500
diff --git a/debian/patches/04_libprojectm_fix-version.patch b/debian/patches/04_libprojectm_fix-version.patch
index 0ba1f8d..cce1ec8 100644
--- a/debian/patches/04_libprojectm_fix-version.patch
+++ b/debian/patches/04_libprojectm_fix-version.patch
@@ -1,6 +1,10 @@
-diff -Naur libprojectM-2.0.1-orig/CMakeLists.txt libprojectM-2.0.1/CMakeLists.txt
---- projectm-2.0.1.orig/src/libprojectM/CMakeLists.txt	2010-01-16 17:23:11.000000000 -0500
-+++ projectm-2.0.1/src/libprojectM/CMakeLists.txt	2010-01-16 17:23:40.000000000 -0500
+Description: Set right upstream version in library
+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
 @@ -110,7 +110,7 @@
  ADD_LIBRARY(projectM SHARED ${projectM_SOURCES})
  endif(BUILD_PROJECTM_STATIC)
diff --git a/debian/patches/05_libprojectm_fonts.patch b/debian/patches/05_libprojectm_fonts.patch
index 26d7dd7..d78ff50 100644
--- a/debian/patches/05_libprojectm_fonts.patch
+++ b/debian/patches/05_libprojectm_fonts.patch
@@ -1,7 +1,8 @@
-Set the right system font directories and exclude fonts
-from build.
-
-Author: Matthias <matthias at nlinux.org>
+Description: Make projectM load system fonts and exclude fonts
+ delivered with projectM from build.
+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
@@ -17,11 +18,11 @@ Author: Matthias <matthias at nlinux.org>
 --- 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
index 60bf954..7269326 100644
--- a/debian/patches/06_libprojectm_use-threads.patch
+++ b/debian/patches/06_libprojectm_use-threads.patch
@@ -1,3 +1,8 @@
+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
+
 --- 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 @@

-- 
projectm packaging

