Author: miriam Date: 2009-07-11 00:02:35 +0000 (Sat, 11 Jul 2009) New Revision: 10004
Removed: packages/trunk/performous/debian/patches/directories.patch Modified: packages/trunk/performous/debian/changelog packages/trunk/performous/debian/control packages/trunk/performous/debian/patches/boost_fix.patch packages/trunk/performous/debian/patches/desktop.patch packages/trunk/performous/debian/patches/gcc_44.patch packages/trunk/performous/debian/patches/series packages/trunk/performous/debian/rules Log: New upstream release Modified: packages/trunk/performous/debian/changelog =================================================================== --- packages/trunk/performous/debian/changelog 2009-07-10 14:49:45 UTC (rev 10003) +++ packages/trunk/performous/debian/changelog 2009-07-11 00:02:35 UTC (rev 10004) @@ -1,3 +1,13 @@ +performous (0.3.1-1) UNRELEASED; urgency=low + + [ Miriam Ruiz ] + * New upstream release + * Refreshed patches + * New build dependency: libglew1.5-dev + * It depends on cmake (>= 2.6) now + + -- Miriam Ruiz <little_m...@yahoo.es> Sat, 11 Jul 2009 00:52:33 +0200 + performous (0.3.0-3) unstable; urgency=low [ Barry deFreese ] Modified: packages/trunk/performous/debian/control =================================================================== --- packages/trunk/performous/debian/control 2009-07-10 14:49:45 UTC (rev 10003) +++ packages/trunk/performous/debian/control 2009-07-11 00:02:35 UTC (rev 10004) @@ -3,14 +3,14 @@ Priority: extra Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Miriam Ruiz <little_m...@yahoo.es> -Build-Depends: debhelper (>= 5.0.51), cmake (>= 2.4), quilt, help2man, +Build-Depends: debhelper (>= 5.0.51), cmake (>= 2.6), quilt, help2man, libgl1-mesa-dev, libsdl1.2-dev, libcairo2-dev, librsvg2-dev, libboost-thread-dev, libboost-serialization-dev, libboost-program-options-dev, libboost-regex-dev, libboost-filesystem-dev, libavcodec-dev, libavformat-dev, libswscale-dev, libmagick++9-dev, libsamplerate0-dev, libxml++2.6-dev, libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev, - libgstreamer0.10-dev + libgstreamer0.10-dev, libglew1.5-dev Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/ultrastar-ng/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/ultrastar-ng/?op=log Modified: packages/trunk/performous/debian/patches/boost_fix.patch =================================================================== --- packages/trunk/performous/debian/patches/boost_fix.patch 2009-07-10 14:49:45 UTC (rev 10003) +++ packages/trunk/performous/debian/patches/boost_fix.patch 2009-07-11 00:02:35 UTC (rev 10004) @@ -1,28 +1,20 @@ -Index: performous-0.3.0/libda/plugins/audio_dev_tone.cpp -=================================================================== ---- performous-0.3.0.orig/libda/plugins/audio_dev_tone.cpp 2009-05-25 21:28:11.000000000 -0400 -+++ performous-0.3.0/libda/plugins/audio_dev_tone.cpp 2009-05-25 21:29:34.000000000 -0400 -@@ -2,7 +2,7 @@ - #include <boost/scoped_ptr.hpp> +--- Performous-0.3.1-Source.orig/libs/libda/plugins/audio_dev_tone.cpp ++++ Performous-0.3.1-Source/libs/libda/plugins/audio_dev_tone.cpp +@@ -3,7 +3,7 @@ #include <boost/lambda/lambda.hpp> #include <boost/lambda/bind.hpp> + // Needs at least Boost 1.36 and many systems don't have that: #include <boost/spirit/include/classic_core.hpp> -#include <boost/spirit/core.hpp> +#include <boost/spirit/include/classic_core.hpp> #include <boost/thread/thread.hpp> #include <boost/thread/xtime.hpp> #include <algorithm> -@@ -52,11 +52,12 @@ +@@ -60,7 +60,7 @@ boost::xtime time; void add(std::string const& tonestr) { double freq = 440.0, amplitude = 0.1, phase = 0.0; -- using namespace boost::spirit; +- using namespace boost::spirit; //::classic; + using namespace boost::spirit::classic; using namespace boost::lambda; -+ placeholder1_type arg1; + placeholder1_type arg1; if (!parse(tonestr.c_str(), - !(limit_d(1.0, s.rate() / 2.0)[real_p][assign_a(freq)]) >> *(!ch_p('.') >> ( -- str_p("amplitude(") >> (max_limit_d(0.0)[real_p][var(amplitude) = bind(static_cast<double(*)(double, double)>(std::pow), 10.0, _1 / 20.0)] | real_p[assign_a(amplitude)]) | -+ str_p("amplitude(") >> (max_limit_d(0.0)[real_p][var(amplitude) = bind(static_cast<double(*)(double, double)>(std::pow), 10.0, arg1 / 20.0)] | real_p[assign_a(amplitude)]) | - str_p("phase(") >> limit_d(0.0, 1.0)[real_p][assign_a(phase)] - ) >> ')') - ).full) Modified: packages/trunk/performous/debian/patches/desktop.patch =================================================================== --- packages/trunk/performous/debian/patches/desktop.patch 2009-07-10 14:49:45 UTC (rev 10003) +++ packages/trunk/performous/debian/patches/desktop.patch 2009-07-11 00:02:35 UTC (rev 10004) @@ -1,13 +1,6 @@ -Index: performous-0.3.0/data/performous.desktop -=================================================================== ---- performous-0.3.0.orig/data/performous.desktop 2008-11-12 01:39:07.000000000 +0100 -+++ performous-0.3.0/data/performous.desktop 2008-11-12 01:39:23.000000000 +0100 -@@ -4,11 +4,11 @@ - Comment=A karaoke game - Comment[de]=Ein Karaoke Spiel - Comment[ro]=Un joc de tip karaoke --Comment[fr]=Un jeu de Karaok� -+Comment[fr]=Un jeu de Karaoké +--- Performous-0.3.1-Source.orig/data/performous.desktop ++++ Performous-0.3.1-Source/data/performous.desktop +@@ -8,7 +8,7 @@ Comment[fi]=Karaokepeli Comment[se]=Ett karaoke-spel Exec=performous Deleted: packages/trunk/performous/debian/patches/directories.patch =================================================================== --- packages/trunk/performous/debian/patches/directories.patch 2009-07-10 14:49:45 UTC (rev 10003) +++ packages/trunk/performous/debian/patches/directories.patch 2009-07-11 00:02:35 UTC (rev 10004) @@ -1,27 +0,0 @@ -Index: performous-0.3.0/CMakeLists.txt -=================================================================== ---- performous-0.3.0.orig/CMakeLists.txt 2008-11-13 23:32:38.000000000 +0000 -+++ performous-0.3.0/CMakeLists.txt 2008-11-13 23:36:58.000000000 +0000 -@@ -40,17 +40,18 @@ - endif(NOT CMAKE_BUILD_TYPE) - - --set(SHARE_INSTALL "share/performous") -+set(SHARE_INSTALL "share/games/performous") - - add_subdirectory(libda) - add_subdirectory(themes) - add_subdirectory(data) - add_subdirectory(game) - -+set(PERFORMOUS_THEME_PATH "${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/themes") -+set(PERFORMOUS_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/lib/libda") -+set(PERFORMOUS_EXECUTABLE "${CMAKE_INSTALL_PREFIX}/bin/performous") -+ - if(NOT "${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/") -- set(PERFORMOUS_THEME_PATH "${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/themes") -- set(PERFORMOUS_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/lib/libda") -- set(PERFORMOUS_EXECUTABLE "${CMAKE_INSTALL_PREFIX}/bin/performous") - configure_file("${PROJECT_SOURCE_DIR}/cmake/performous.sh.cmake" "${PROJECT_BINARY_DIR}/performous.sh" ESCAPE_QUOTES @ONLY) - install(PROGRAMS "${PROJECT_BINARY_DIR}/performous.sh" DESTINATION bin) - install(SCRIPT "${PROJECT_SOURCE_DIR}/cmake/performous-launcher.cmake") Modified: packages/trunk/performous/debian/patches/gcc_44.patch =================================================================== --- packages/trunk/performous/debian/patches/gcc_44.patch 2009-07-10 14:49:45 UTC (rev 10003) +++ packages/trunk/performous/debian/patches/gcc_44.patch 2009-07-11 00:02:35 UTC (rev 10004) @@ -1,22 +1,10 @@ -Index: performous-0.3.0/game/color.cc -=================================================================== ---- performous-0.3.0.orig/game/color.cc 2009-05-25 21:31:35.000000000 -0400 -+++ performous-0.3.0/game/color.cc 2009-05-25 21:31:53.000000000 -0400 -@@ -1,4 +1,5 @@ - #include "color.hh" -+#include <cstdio> +--- Performous-0.3.1-Source.orig/game/ffmpeg.hh ++++ Performous-0.3.1-Source/game/ffmpeg.hh +@@ -11,6 +11,7 @@ #include <iostream> - - namespace { -Index: performous-0.3.0/game/ffmpeg.hh -=================================================================== ---- performous-0.3.0.orig/game/ffmpeg.hh 2009-05-25 21:31:09.000000000 -0400 -+++ performous-0.3.0/game/ffmpeg.hh 2009-05-25 21:31:27.000000000 -0400 -@@ -10,6 +10,7 @@ - #include <iostream> #include <vector> #include <limits> +#include <stdint.h> - struct AudioFrame { - double timestamp; + using boost::int16_t; + using boost::uint8_t; Modified: packages/trunk/performous/debian/patches/series =================================================================== --- packages/trunk/performous/debian/patches/series 2009-07-10 14:49:45 UTC (rev 10003) +++ packages/trunk/performous/debian/patches/series 2009-07-11 00:02:35 UTC (rev 10004) @@ -1,4 +1,3 @@ desktop.patch -directories.patch boost_fix.patch gcc_44.patch Modified: packages/trunk/performous/debian/rules =================================================================== --- packages/trunk/performous/debian/rules 2009-07-10 14:49:45 UTC (rev 10003) +++ packages/trunk/performous/debian/rules 2009-07-11 00:02:35 UTC (rev 10004) @@ -44,9 +44,8 @@ dh_installdirs cd $(BUILD_TREE); $(MAKE) install DESTDIR=$(CURDIR)/debian/performous $(MAKE) -C debian/h2m - cp themes/lima/icon.png $(CURDIR)/debian/performous/usr/share/pixmaps/performous.png + cp themes/default/icon.png $(CURDIR)/debian/performous/usr/share/pixmaps/performous.png mkdir -p $(CURDIR)/debian/performous/usr/share/games/ultrastar/songs - rm $(CURDIR)/debian/performous/usr/bin/performous.sh mv $(CURDIR)/debian/performous/usr/bin $(CURDIR)/debian/performous/usr/games # Build architecture independant packages using the common target.
_______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
