[SCM] projectm packaging branch, master, updated. upstream/2.0.1+dfsg-3-g3fe29e6
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Sun Jun 20 04:57:34 UTC 2010
The following commit has been merged in the master branch:
commit 3fe29e6f270d0c75084d8b3d237fbb9b17457c1f
Author: Matthias Klumpp <matthias at nlinux.org>
Date: Mon Mar 8 16:36:41 2010 +0100
Imported Debian patch 2.0.1+dfsg-1
diff --git a/debian/changelog b/debian/changelog
index 945360a..57911be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,101 +1,5 @@
-libprojectm (1.2.0-3) unstable; urgency=low
+projectm (2.0.1+dfsg-1) unstable; urgency=low
- * debian/control: libprojectm2, changed depencie from ttf-bitstream-vera
- to ttf-dejavu. Thanks to Barry deFreese. (Closes: #528149)
- * debian/control: updated Standards-Version to 3.8.1, no changes needed.
- * debian/rules: replaced dh_clean -k statement with dh_prep.
- * debian/control: removed dupplicate section value.
- * debian/copyright: changed copyright symbol to ©.
+ * Initial release (Closes: #565355; LP: #376576)
- -- Francesco Namuri <francesco at namuri.it> Thu, 14 May 2009 23:41:28 +0200
-
-libprojectm (1.2.0-2) unstable; urgency=low
-
- * Fix build for the incoming GCC 4.4 release (Closes: #505687).
-
- -- Adam Cécile (Le_Vert) <gandalf at le-vert.net> Thu, 12 Mar 2009 22:15:52 +0100
-
-libprojectm (1.2.0-1) unstable; urgency=low
-
- * New Upstream Version.
- * Removed patches: 01_soil_64bit_fixes.dpatch, 02_cmake_soname.dpatch,
- 04_fix_brokenness_on_radeon_cards.dpatch, 05_fix_gcc43_ftbfs.dpatch
- now these modifies are included in original tarball; removed also
- 03_cmake_ftgl_pic.dpatch, this one is useless.
- * debian/control: changed depends in libprojectm section from
- ttf-dejavu-core to ttf-bitstream-vera.
- * debian/copyright: added debian packaging copyright informations.
- * debian/rules: updated to fit with new upstream, removed some rules to
- convert files from dos to unix format, removed some rules to backup
- restore some files modified by build process.
- * debian/control: removed build-dep on tofrodos.
- * debian/docs removed, upstream has removed from tarball the only doc file
- (README) so debian/docs is not needed.
- * added debian/patches/02_config.inp.in.dpatch to fix a wrong path to fonts
- needed by the library.
- * debian/control: added Replaces, Conflicts with the old version.
- * debian/copyright: added some new copyright informations and fixed some
- lines exceding the 80 chars.
- * debian/control: renamed package libprojectm1 to libprojectm2 and package
- libprojectm1-data to libprojectm-data.
- * debian/compat: bumped to 7.
-
- -- Francesco Namuri <francesco at namuri.it> Fri, 18 Jul 2008 10:47:16 +0200
-
-libprojectm (1.01-7) unstable; urgency=low
-
- * New Maintainer (Closes: #485105)
- * added debian/patches/06_fix_wrong_UPPERCASE_in_Renderer.hpp.dpatch to fix
- an outdated include of ftgl.h, in recent versions of the library the file
- is in lowercase and not uppercase. (Closes: #486963)
- * debian/patches/00-list: commented out 03_cmake_ftgl_pic.dpatch to avoid
- the use of ftgl_pic library, now no longer exists and is no longer
- necessary.
- * debian/control: Standard-Version updated to 3.8.0, no modifications
- needed.
- * debian/rules: added a rule to preserve unchanged 2 files modified by the
- build process.
- [ unera ]
- * Fixed debian/watch.
-
- -- Francesco Namuri <francesco at namuri.it> Mon, 07 Jul 2008 15:26:01 +0200
-
-libprojectm (1.01-6) unstable; urgency=low
-
- * Fix a bogus dependency relation. (Closes: #477051)
-
- -- William Pitcock <nenolod at sacredspiral.co.uk> Sun, 20 Apr 2008 13:44:21 -0500
-
-libprojectm (1.01-5) unstable; urgency=low
-
- * Use libglew-dev instead of libglew1.4-dev. (Closes: #464847)
-
- -- William Pitcock <nenolod at sacredspiral.co.uk> Sat, 09 Feb 2008 05:16:39 -0600
-
-libprojectm (1.01-4) unstable; urgency=medium
-
- * Standards-Version bump; no changes required.
- * Prepare for ttf-dejavu migration. (Closes: #461266)
- * Fix FTBFS with GCC 4.3. (Closes: #456061)
-
- -- William Pitcock <nenolod at sacredspiral.co.uk> Wed, 06 Feb 2008 01:01:43 -0600
-
-libprojectm (1.01-3) unstable; urgency=low
-
- * Make it build against libftgl_pic.a so that the FTGL feature
- may be used on PIC-strict architectures.
- * Fix broken behaviour with some OpenGL configurations. (Closes: #456792)
-
- -- William Pitcock <nenolod at sacredspiral.co.uk> Mon, 17 Dec 2007 16:59:45 -0600
-
-libprojectm (1.01-2) unstable; urgency=low
-
- * Add missing entries to debian/copyright.
-
- -- William Pitcock <nenolod at sacredspiral.co.uk> Sun, 04 Nov 2007 09:20:16 -0600
-
-libprojectm (1.01-1) unstable; urgency=low
-
- * Initial release (Closes: #448425).
-
- -- William Pitcock <nenolod at sacredspiral.co.uk> Mon, 29 Oct 2007 11:04:59 -0500
+ -- Matthias Klumpp <matthias at nlinux.org> Mon, 08 Mar 2010 16:36:41 +0100
diff --git a/debian/control b/debian/control
index dc14d3b..9e5acdf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,30 @@
-Source: libprojectm
+Source: projectm
+Section: sound
Priority: optional
-Maintainer: Francesco Namuri <francesco at namuri.it>
-Uploaders: Adam Cécile (Le_Vert) <gandalf at le-vert.net>
-Build-Depends: debhelper (>= 7.0.0), libglew-dev, libgl1-mesa-dev | libgl-dev,
- libglu1-mesa-dev | libglu-dev, libx11-dev, libice-dev, pkg-config, cmake,
- ftgl-dev, dpatch
-Standards-Version: 3.8.1
+Maintainer: Matthias Klumpp <matthias at nlinux.org>
+Uploaders: Andres Mejia <mcitadel at gmail.com>
+Build-Depends: debhelper (>= 7), cdbs, cmake, libqt4-dev, libqt4-opengl-dev, libjack-dev,
+ libglew-dev, libgl1-mesa-dev, libglu-dev, libx11-dev, libice-dev, libpulse-dev, libfreetype6-dev,
+ libvisual-0.4-dev, libsdl1.2-dev, libftgl-dev
+Standards-Version: 3.8.4
+Homepage: http://projectm.sf.net
+
+Package: libprojectm2
+Architecture: any
Section: libs
-Homepage: http://projectm.sourceforge.net
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Advanced Milkdrop-compatible music visualization library
+ libprojectm is an iterative music visualization library which uses
+ OpenGL for hardware acceleration. It is compatible with Milkdrop
+ presets.
+ .
+ This package contains the library and essential data needed for
+ the visualization library to work.
Package: libprojectm-dev
Section: libdevel
Architecture: any
-Depends: libprojectm2 (= ${binary:Version}), ${misc:Depends}
+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
@@ -20,28 +32,68 @@ Description: Advanced Milkdrop-compatible music visualization library - dev
.
This package contains the development headers.
-Package: libprojectm-data
+Package: projectm-data
Architecture: all
-Recommends: libprojectm2 (>= ${binary:Version})
-Replaces: libprojectm1-data
-Conflicts: libprojectm1-data
+Section: libs
+Depends: ${misc:Depends}
Description: Advanced Milkdrop-compatible music visualization library - data
libprojectm is an iterative music visualization library which uses
OpenGL for hardware acceleration. It is compatible with Milkdrop
presets.
.
- This package contains the presets which are normally distributed with
+ This package contains the presets which are distributed with
projectM.
-Package: libprojectm2
+Package: libvisual-projectm
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libprojectm-data (>= ${source:Upstream-Version}), ttf-dejavu
-Replaces: libprojectm1
-Conflicts: libprojectm1, libprojectm1-data
-Description: Advanced Milkdrop-compatible music visualization library
- libprojectm is an iterative music visualization library which uses
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: libvisual module for projectM
+ projectM is an iterative music visualization library which uses
OpenGL for hardware acceleration. It is compatible with Milkdrop
presets.
.
- This package contains the library and essential data needed for
- the visualization library to work.
+ This package contains a module for libvisual enabling support for
+ projectM.
+
+Package: libprojectm-qt1
+Architecture: any
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: projectM Qt4 bindings
+ projectM is an iterative music visualization library which uses
+ OpenGL for hardware acceleration. It is compatible with Milkdrop
+ presets.
+ .
+ This package contains Qt4 interfaces to projectM.
+
+Package: libprojectm-qt-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libprojectm-qt1 (= ${binary:Version})
+Description: projectM Qt4 (development files)
+ projectM is an iterative music visualization library which uses
+ OpenGL for hardware acceleration. It is compatible with Milkdrop
+ presets.
+ .
+ This package contains the development files for the Qt4 bindings of projectM
+
+Package: projectm-jack
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: projectM JackAudio module
+ projectM is an iterative music visualization library which uses
+ OpenGL for hardware acceleration. It is compatible with Milkdrop
+ presets.
+ .
+ This package contains an application to visualize JackAudio streams.
+
+Package: projectm-pulseaudio
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: projectM PulseAudio module
+ projectM is an iterative music visualization library which uses
+ OpenGL for hardware acceleration. It is compatible with Milkdrop
+ presets.
+ .
+ This package contains an application to visualize PulseAudio streams.
diff --git a/debian/copyright b/debian/copyright
index 62c6522..d551a0c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,56 @@
-This package was debianized by William Pitcock <nenolod at sacredspiral.co.uk>
-on Sun, 28 Oct 2007 17:35:59 -0500.
-
-It was downloaded from <http://projectm.sourceforge.net>
-
-Upstream Authors:
-
- Peter Sperl <peter at sperl.com>,
- Carmelo Piccione <carmelo.piccione at gmail.com>
-
-Copyrights:
- Copyright © 2002-2008, Milan Ikits
- Copyright © 2002-2008, Marcelo E. Magallon
- Copyright © 2002, Lev Povalahev
- Copyright © 1999-2007 Brian Paul
- Copyright © 2007 The Khronos Group Inc.
- Copyright © Tao Pang
+This package was debianized by Matthias Klumpp <matthias at nlinux.org> on
+Mon, 08 Feb 2009 19:36:41 +0100.
+
+It was downloaded from http://projectm.sf.net
+
+Copyright:
+
+ Copyright (C) 2009-2010 projectM Team
+
+ Carmelo Piccione <Carmelo.Piccione+projectM at gmail.com>
+ Parser
+ Evaluator
+ Pulse Audio support (projectM-pulseaudio)
+ Qt GUI (projectM-qt)
+
+ Peter Sperl <peter at sperl.com>
+ Beat Detection
+ Rendering
+ XMMS Support (projectM-xmms)
+ libvisual Support (projectM-libvisual)
+
+ Alligator Descartes
+ Media Player Support (iTunes, Winamp, Windows Media Player)
+ Test application frameworks (projectM-wxvis, projectM-sdlvis)
+ DVD application (projectM-movie)
+ Win32 screensaver (projectM-screensaver)
+
+ Roger Dannenburg
+ Advice & Support
+
+Removed components:
+ The following modules were removed from the Debian version of projectM:
+ src/WinLibs - Binary modules for Windows
+ src/macos - MacOS components
+ src/win32
License:
- Copyright © 2003-2007 projectM team
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ The libprojectm library is licensed under LGPLv2.1:
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -32,118 +64,8 @@ License:
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301, USA.
-
- On Debian and Ubuntu systems, the complete text of the GNU Lesser General
- Public License is available at `/usr/share/common-licenses/LGPL'.
-
-All files are copyright and licensed as described above, except:
-
- "ConfigFile.h":
- Copyright: Copyright (c) 2004 Richard J. Wagner
- License: MIT license
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- "FindPkgConfig.cmake":
- Copyright: Copyright (C) 2006 Enrico Scholz
- License: Two-clause BSD license
- Redistribution and use, with or without modification, are permitted
- provided that the following conditions are met:
-
- 1. Redistributions must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 2. The name of the author may not be used to endorse or promote
- products derived from this software without specific prior
- written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- "win32-dirent.cpp", "win32-dirent.h":
- Copyright: Copyright Kevlin Henney, 1997, 2003. All rights reserved.
- License: ISC license derivate
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose is hereby granted without fee, provided
- that this copyright and permissions notice appear in all copies and
- derivatives.
-
- This software is supplied "as is" without express or implied warranty.
-
- But that said, if there are any problems please get in touch.
-
- "fonts/Vera.ttf", "fonts/VeraMono.ttf":
- Copyright: Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved.
- License: BSD-like license
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of the fonts accompanying this license ("Fonts") and associated
- documentation files (the "Font Software"), to reproduce and distribute
- the Font Software, including without limitation the rights to use,
- copy, merge, publish, distribute, and/or sell copies of the Font
- Software, and to permit persons to whom the Font Software is furnished
- to do so, subject to the following conditions:
-
- The above copyright and trademark notices and this permission notice shall
- be included in all copies of one or more of the Font Software typefaces.
-
- The Font Software may be modified, altered, or added to, and in
- particular the designs of glyphs or characters in the Fonts may be
- modified and additional glyphs or characters may be added to the Fonts,
- only if the fonts are renamed to names not containing either the words
- "Bitstream" or the word "Vera".
-
- This License becomes null and void to the extent applicable to Fonts
- or Font Software that has been modified and is distributed under the
- "Bitstream Vera" names.
-
- The Font Software may be sold as part of a larger software package but
- no copy of one or more of the Font Software typefaces may be sold by
- itself.
-
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
- BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES
- OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT,
- INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF
- CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
- INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN
- THE FONT SOFTWARE.
-
- Except as contained in this notice, the names of Gnome, the Gnome
- Foundation, and Bitstream Inc., shall not be used in advertising
- or otherwise to promote the sale, use or other dealings in this Font
- Software without prior written authorization from the Gnome Foundation
- or Bitstream Inc., respectively. For further information, contact:
- fonts at gnome dot org.
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ See 'LICENSE.txt' included within this release
-The Debian packaging is
-© 2007, William Pitcock <nenolod at sacredspiral.co.uk>,
-© 2008-2009, Francesco Namuri <francesco at namuri.it>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is copyright 2009, Matthias Klumpp <matthias at nlinux.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..2a0b9cb
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+FAQ.txt
diff --git a/debian/libprojectm-data.install b/debian/libprojectm-data.install
deleted file mode 100644
index c9c5a92..0000000
--- a/debian/libprojectm-data.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/projectM/presets
-usr/share/projectM/config.inp
diff --git a/debian/libprojectm-dev.install b/debian/libprojectm-dev.install
index 41a4c77..6c68bdf 100644
--- a/debian/libprojectm-dev.install
+++ b/debian/libprojectm-dev.install
@@ -1,3 +1,3 @@
usr/include/libprojectM
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/libprojectM.so
+usr/lib/pkgconfig/libprojectM.pc
diff --git a/debian/libprojectm-qt-dev.install b/debian/libprojectm-qt-dev.install
new file mode 100644
index 0000000..8dcfbe4
--- /dev/null
+++ b/debian/libprojectm-qt-dev.install
@@ -0,0 +1,3 @@
+usr/include/libprojectM-qt
+usr/lib/libprojectM-qt.so
+usr/lib/pkgconfig/libprojectM-qt.pc
diff --git a/debian/libprojectm-qt1.install b/debian/libprojectm-qt1.install
new file mode 100644
index 0000000..bc15cc2
--- /dev/null
+++ b/debian/libprojectm-qt1.install
@@ -0,0 +1,2 @@
+usr/lib/libprojectM-qt.so.*
+
diff --git a/debian/libprojectm2.install b/debian/libprojectm2.install
index d0dbfd1..83ec90a 100644
--- a/debian/libprojectm2.install
+++ b/debian/libprojectm2.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/libprojectM.so.*
diff --git a/debian/libvisual-projectm.install b/debian/libvisual-projectm.install
new file mode 100644
index 0000000..b397efa
--- /dev/null
+++ b/debian/libvisual-projectm.install
@@ -0,0 +1 @@
+usr/lib/libvisual-0.4
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5d844c3..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01_fix_wrong_UPPERCASE_in_Renderer.hpp.dpatch
-02_config.inp.in.dpatch
-03_fix_gcc4.4_build.dpatch
diff --git a/debian/patches/01_fix_wrong_UPPERCASE_in_Renderer.hpp.dpatch b/debian/patches/01_fix_wrong_UPPERCASE_in_Renderer.hpp.dpatch
deleted file mode 100644
index 52fefbd..0000000
--- a/debian/patches/01_fix_wrong_UPPERCASE_in_Renderer.hpp.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_fix06_fix_wrong_UPPERCASE_in_Renderer.hpp.dpatch by Francesco Namuri <francesco at namuri.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This patch only correct a outdated name of the ftgl header file.
-## DP: Now the correct file name is lowercase.
-
- at DPATCH@
-diff -urNad libprojectm-1.01~/Renderer.hpp libprojectm-1.01/Renderer.hpp
---- libprojectm-1.01~/Renderer.hpp 2008-07-07 15:34:20.000000000 +0200
-+++ libprojectm-1.01/Renderer.hpp 2008-07-07 15:35:19.000000000 +0200
-@@ -21,7 +21,7 @@
- #include <FTGLPixmapFont.h>
- #include <FTGLExtrdFont.h>
- #else
--#include <FTGL/FTGL.h>
-+#include <FTGL/ftgl.h>
- #include <FTGL/FTGLPixmapFont.h>
- #include <FTGL/FTGLExtrdFont.h>
- #endif
diff --git a/debian/patches/01_pulsecmakelist.patch b/debian/patches/01_pulsecmakelist.patch
new file mode 100644
index 0000000..cf295f8
--- /dev/null
+++ b/debian/patches/01_pulsecmakelist.patch
@@ -0,0 +1,17 @@
+Change projectM-pulseaudio CMakeLists.txt to search for some required
+files of the PulseAudio part in build dir.
+(Makes compiling out-of-source possible)
+
+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
++++ projectm-2.0.1/src/projectM-pulseaudio/CMakeLists.txt 2010-05-04 21:48:38.417337441 +0200
+@@ -81,6 +81,7 @@
+ endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+
+ INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${LIBPULSE_INCLUDEDIR})
++INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/projectM-pulseaudio)
+
+ LINK_DIRECTORIES(${PROJECTM_LINK} ${PULSEAUDIO_LDFLAGS})
+
diff --git a/debian/patches/02_config.inp.in.dpatch b/debian/patches/02_config.inp.in.dpatch
deleted file mode 100644
index a2503d8..0000000
--- a/debian/patches/02_config.inp.in.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_config.inp.in.dpatch by Francesco Namuri <francesco at namuri.it>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: this patch sets the right position of the fonts needed by
-## DP: the library.
-
- at DPATCH@
-diff -urNad libprojectM-1.2.0~/config.inp.in libprojectM-1.2.0/config.inp.in
---- libprojectM-1.2.0~/config.inp.in 2008-06-12 05:39:28.000000000 +0200
-+++ libprojectM-1.2.0/config.inp.in 2008-07-09 16:15:08.000000000 +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 = /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-+Menu Font = /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
-
diff --git a/debian/patches/02_desktop_encoding.patch b/debian/patches/02_desktop_encoding.patch
new file mode 100644
index 0000000..a4c39b5
--- /dev/null
+++ b/debian/patches/02_desktop_encoding.patch
@@ -0,0 +1,21 @@
+Remove encoding keys from .desktop files.
+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
++++ projectm-2.0.1/src/projectM-jack/projectM-jack.desktop 2010-05-18 17:41:10.935816068 +0200
+@@ -6,5 +6,4 @@
+ Icon=prjm16-transparent.svg
+ Type=Application
+ Categories=AudioVideo;Audio;
+-Encoding=UTF-8
+ Terminal=false
+Index: projectm-2.0.1/src/projectM-pulseaudio/projectM-pulseaudio.desktop
+===================================================================
+--- projectm-2.0.1.orig/src/projectM-pulseaudio/projectM-pulseaudio.desktop 2010-05-18 17:40:01.868313751 +0200
++++ projectm-2.0.1/src/projectM-pulseaudio/projectM-pulseaudio.desktop 2010-05-18 17:40:49.407164230 +0200
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=projectM-pulseaudio
+ GenericName=PulseAudio Visualization
+ Comment=projectM for Pulse Audio
diff --git a/debian/patches/03_fix_gcc4.4_build.dpatch b/debian/patches/03_fix_gcc4.4_build.dpatch
deleted file mode 100644
index 49c6d17..0000000
--- a/debian/patches/03_fix_gcc4.4_build.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_fix_gcc4.4_build.dpatch
-## by Martin Michlmayr <tbm at cyrius.com>
-##
-## DP: Add missing implicit includes required by gcc4.4+
-
- at DPATCH@
-diff -Nur libprojectm-1.2.0/BuiltinParams.cpp libprojectm-1.2.0.new/BuiltinParams.cpp
---- libprojectm-1.2.0/BuiltinParams.cpp 2008-06-12 05:39:28.000000000 +0200
-+++ libprojectm-1.2.0.new/BuiltinParams.cpp 2009-03-12 22:10:27.188584853 +0100
-@@ -6,7 +6,7 @@
- #include <iostream>
- #include <algorithm>
- #include "InitCondUtils.hpp"
--
-+#include <cstdio>
-
- using namespace Algorithms;
-
diff --git a/debian/patches/debian-changes-2.0.1+dfsg-1 b/debian/patches/debian-changes-2.0.1+dfsg-1
new file mode 100644
index 0000000..7695804
--- /dev/null
+++ b/debian/patches/debian-changes-2.0.1+dfsg-1
@@ -0,0 +1,52 @@
+Description: Upstream changes introduced in version 2.0.1+dfsg-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ projectm (2.0.1+dfsg-1) unstable; urgency=low
+ .
+ * Initial release (Closes: #565355; LP: #376576)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Matthias Klumpp <matthias at nlinux.org>
+Bug-Debian: http://bugs.debian.org/565355
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/376576
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- projectm-2.0.1+dfsg.orig/src/projectM-pulseaudio/CMakeLists.txt
++++ projectm-2.0.1+dfsg/src/projectM-pulseaudio/CMakeLists.txt
+@@ -81,7 +81,6 @@ elseif (${CMAKE_PROJECT_NAME} MATCHES ${
+ endif (${CMAKE_PROJECT_NAME} MATCHES "PROJECTM_ROOT")
+
+ INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${LIBPULSE_INCLUDEDIR})
+-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/projectM-pulseaudio)
+
+ LINK_DIRECTORIES(${PROJECTM_LINK} ${PULSEAUDIO_LDFLAGS})
+
+--- projectm-2.0.1+dfsg.orig/src/projectM-pulseaudio/projectM-pulseaudio.desktop
++++ projectm-2.0.1+dfsg/src/projectM-pulseaudio/projectM-pulseaudio.desktop
+@@ -1,4 +1,5 @@
+ [Desktop Entry]
++Encoding=UTF-8
+ Name=projectM-pulseaudio
+ GenericName=PulseAudio Visualization
+ Comment=projectM for Pulse Audio
+--- projectm-2.0.1+dfsg.orig/src/projectM-jack/projectM-jack.desktop
++++ projectm-2.0.1+dfsg/src/projectM-jack/projectM-jack.desktop
+@@ -6,4 +6,5 @@ Exec=/usr/bin/projectM-jack
+ Icon=prjm16-transparent.svg
+ Type=Application
+ Categories=AudioVideo;Audio;
++Encoding=UTF-8
+ Terminal=false
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5f0404d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01_pulsecmakelist.patch
+02_desktop_encoding.patch
+debian-changes-2.0.1+dfsg-1
diff --git a/debian/projectm-data.install b/debian/projectm-data.install
new file mode 100644
index 0000000..979a8b3
--- /dev/null
+++ b/debian/projectm-data.install
@@ -0,0 +1,4 @@
+usr/share/pixmaps/prjm16-transparent.svg
+usr/share/projectM/presets
+usr/share/projectM/shaders
+usr/share/projectM/config.inp
diff --git a/debian/projectm-jack.install b/debian/projectm-jack.install
new file mode 100644
index 0000000..ec4316e
--- /dev/null
+++ b/debian/projectm-jack.install
@@ -0,0 +1,2 @@
+usr/bin/projectM-jack
+usr/share/applications/projectM-jack.desktop
diff --git a/debian/projectm-pulseaudio.install b/debian/projectm-pulseaudio.install
new file mode 100644
index 0000000..43e248b
--- /dev/null
+++ b/debian/projectm-pulseaudio.install
@@ -0,0 +1,2 @@
+usr/bin/projectM-pulseaudio
+usr/share/applications/projectM-pulseaudio.desktop
diff --git a/debian/rules b/debian/rules
index d8f6563..aa91935 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,78 +1,31 @@
#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Dpatch targets
-include /usr/share/dpatch/dpatch.make
-
-CFLAGS = -Wall -g
-CXXFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- CXXFLAGS += -O0
-else
- CFLAGS += -O2
- CXXFLAGS += -O2
-endif
-
-conv-stamp:
- touch $@
-
-configure: configure-stamp
-configure-stamp: conv-stamp patch-stamp
- dh_testdir
-
- # CXXFLAGS are seperate for possible future use of -fno-rtti.
- # i would split this up, but cmake doesn't want to play nice
- cmake -DCMAKE_INSTALL_PREFIX="/usr" -DUSE_FTGL=ON -DCMAKE_CC_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" .
- touch $@
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
- touch $@
-
-clean: unpatch
- dh_testdir
- dh_testroot
- rm -f conv-stamp build-stamp configure-stamp
- [ ! -d CMakeFiles/ ] || $(MAKE) clean
- rm -rf CMakeFiles/ \
- CMakeCache.txt \
- cmake_install.cmake \
- config.inp \
- install_manifest.txt \
- Makefile \
- libprojectM.pc
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-binary-indep: build install
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_install --sourcedir=$(CURDIR)/debian/tmp
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- #install -m644 debian/shlibs.libprojectm2 debian/libprojectm2/DEBIAN/shlibs
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+# -*- mode: makefile; coding: utf-8 -*-
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+
+DEB_SRCDIR := ./src
+DEB_DH_INSTALL_SOURCEDIR := $(CURDIR)/debian/tmp
+DEB_CMAKE_EXTRA_FLAGS := -DINCLUDE-PROJECTM-TEST=OFF -DINCLUDE-PROJECTM-JACK=ON
+DEB_DH_INSTALL_ARGS := --list-missing
+
+common-configure-arch common-configure-indep::
+ rm -rf $(CURDIR)/fonts
+
+
+clean::
+ #Make clean forgets these files
+ rm -f $(CURDIR)/src/libprojectM/libprojectM.pc
+ rm -f $(CURDIR)/src/libprojectM/config.inp
+ rm -f $(CURDIR)/src/projectM-qt/libprojectM-qt.pc
+
+upstream:
+ rm -rf $(CURDIR)/src/WinLibs
+ rm -rf $(CURDIR)/src/macos
+ rm -rf $(CURDIR)/src/win32
+ rm -rf $(CURDIR)/fonts/CVS
+ rm -rf $(CURDIR)/presets/CVS
+ rm -rf $(CURDIR)/presets_milkdrop/CVS
+ rm -rf $(CURDIR)/presets_projectM/CVS
+ rm -rf $(CURDIR)/presets_test
+ rm -rf $(CURDIR)/presets_yin/CVS
diff --git a/debian/shlibs.libprojectm2 b/debian/shlibs.libprojectm2
deleted file mode 100644
index 0ad1a1f..0000000
--- a/debian/shlibs.libprojectm2
+++ /dev/null
@@ -1 +0,0 @@
-libprojectM 2 libprojectm (>= 1.2.0)
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
index 8230677..16a631a 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://sf.net/projectm/libprojectM\D+(\d+(?:\.\d+){1,3})\D*\.tar\.bz2
+dversionmangle=s/\+dfsg// \
+http://sf.net/projectm/libprojectM-qt-(.+)-Source\.tar\.bz2
--
projectm packaging
More information about the pkg-multimedia-commits
mailing list