Author: apo-guest Date: 2014-03-08 12:28:32 +0000 (Sat, 08 Mar 2014) New Revision: 14960
Added: packages/trunk/performous/debian/patches/desktop-file.patch packages/trunk/performous/debian/performous-tools.install packages/trunk/performous/debian/performous.links Removed: packages/trunk/performous/debian/h2m/ packages/trunk/performous/debian/patches/FindFreetype.patch packages/trunk/performous/debian/patches/desktop.patch packages/trunk/performous/debian/patches/libav0.8.patch packages/trunk/performous/debian/patches/use-Boost-TIME_UTC_-constant-unconditionally.patch packages/trunk/performous/debian/performous.manpages packages/trunk/performous/debian/ultrastar-ng.links Modified: packages/trunk/performous/debian/README.Debian packages/trunk/performous/debian/README.source packages/trunk/performous/debian/changelog packages/trunk/performous/debian/control packages/trunk/performous/debian/copyright packages/trunk/performous/debian/docs packages/trunk/performous/debian/patches/series packages/trunk/performous/debian/performous-tools.7 packages/trunk/performous/debian/performous-tools.manpages packages/trunk/performous/debian/performous.install packages/trunk/performous/debian/performous.menu packages/trunk/performous/debian/rules packages/trunk/performous/debian/source/options packages/trunk/performous/debian/watch Log: Debian release 0.7.0+git20140217-1 Modified: packages/trunk/performous/debian/README.Debian =================================================================== --- packages/trunk/performous/debian/README.Debian 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/README.Debian 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,38 +1,44 @@ performous for Debian --------------------- -You can find songs online by Google or at your favorite Torrent sites. We -recommend starting with the ultrastar-songs package that can be download from -our project website. You need to extract that tarball into ~/.ultrastar/ or to -one of the other folders that the game searches songs for. Run ultrastar from -a terminal to see the list of folders. +More songs for performous are available at +http://performous.org/songs + +For more information about finding songs and adding own song folders see also + +https://github.com/performous/performous/wiki/Songs + +Songs are searched for in the following directories: + $HOME/.local/share/games/performous/songs/ + $HOME/.ultrastar/songs/ + /usr/local/share/games/ultrastar/songs/ + /usr/local/share/ultrastar/songs/ + /usr/share/games/ultrastar/songs/ + /usr/share/games/performous/songs/ + /usr/share/ultrastar/songs/ + /usr/local/share/games/fretsonfire/data/songs/ + /usr/share/games/fretsonfire/data/songs/ + +You can see where Performous tries to find songs by launching it from a +terminal with the argument --log info and observing the output. + If your songs are not in UTF-8 (most songs aren't yet), please do: recode CP1252..UTF-8 songs/*/*.txt You can use iconv instead, if you prefer: - iconv --from-code=ISO-8859-1 --to-code=UTF-8 source.txt > dest.txt + iconv --from-code=ISO-8859-1 --to-code=UTF-8 source.txt > dest.txt For converting a whole directory of songs to UTF-8 with iconv: - for i in *; do echo $i; \ - mv "$i/$i.txt" "$i/$i.ISO-8859-1.txt"; \ - iconv --from-code=ISO-8859-1 --to-code=UTF-8 "$i/$i.ISO-8859-1.txt" \ - > "$i/$i.txt"; \ - done + for i in *; do echo $i; \ + mv "$i/$i.txt" "$i/$i.ISO-8859-1.txt"; \ + iconv --from-code=ISO-8859-1 --to-code=UTF-8 "$i/$i.ISO-8859-1.txt" \ + > "$i/$i.txt"; \ + done After that make sure that all the characters display correctly. If they don't, you need to guess which charset the original used (instead of CP1252) and retry. -If you want to improve the game, join IRC channel #Performous (Freenode) and -you'll get SVN write access. - For more (up to date) information, see http://performous.org/ -Songs are searched for in the following directories: - $HOME/.ultrastar/songs/ - /usr/local/share/games/ultrastar/songs/ - /usr/local/share/ultrastar/songs/ - /usr/share/games/ultrastar/songs/ - /usr/share/ultrastar/songs/ - - -- Miriam Ruiz <[email protected]> Tue, 11 Nov 2008 21:11:40 +0100 + -- Markus Koschany <[email protected]> Fri, 07 Mar 2014 21:31:26 +0100 Modified: packages/trunk/performous/debian/README.source =================================================================== --- packages/trunk/performous/debian/README.source 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/README.source 2014-03-08 12:28:32 UTC (rev 14960) @@ -1 +1,9 @@ -See /usr/share/doc/quilt/README.source +Steps to obtain the original upstream sources: + +1. git clone https://github.com/performous/performous.git +2. git checkout 49eb95981573ea5b2e79c2957071d5ac9beb75da + +The file data/fonts/DroidSansMono.ttf was removed and replaced with a symlink +to Debian's system fonts. + + -- Markus Koschany <[email protected]> Fri, 07 Mar 2014 21:31:26 +0100 Modified: packages/trunk/performous/debian/changelog =================================================================== --- packages/trunk/performous/debian/changelog 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/changelog 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,3 +1,52 @@ +performous (0.7.0+git20140217-1) unstable; urgency=medium + + * Imported Upstream version 0.7.0+git20140217. + - Update to recommended git master version. (Closes: #710332) + - Fix audio noise when entering the game. (Closes: #740763) + * Add myself to Uploaders. + * Enable MIDI I/O support. + * debian/rules: + - Switch to dh sequencer and simplify debian/rules. + - Build with --parallel. + - Remove all overrides in regard to libda. + - Use only required dh_auto_configure options. + - Export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed. + - Do not create separate ultrastar directory anymore. + * wrap-and-sort -sa + * debian/control: + - Remove unnecessary build-dependencies: + + libsamplerate0-dev + + libpulse-dev + + libgstreamer0.10-dev + + libjack-dev + - Use libboost-all-dev instead of single boost libraries. + - Switch to libglew-dev from libglew1.5-dev. + - Add libportmidi-dev [linux-any] and enable MIDI I/O support. + - Add libpng-dev and libjpeg-dev. + - Remove Conflicts, Replaces, Provides fields for obsolete ultrastar + package. + - Remove Pre-Depends dpkg (>= 1.15.6) + - performous: Add fonts-droid dependency. + - performous: Remove Recommends: ${alsalibs:Recommends} substvar. + * source/options: Use default xz compression. + * Update desktop.patch to desktop-file.patch and create a valid desktop file. + * Drop use-Boost-TIME_UTC_-constant-unconditionally.patch. Fixed upstream. + * Drop FindFreetype.patch. Fixed upstream. + * Drop libav0.8.patch. Fixed upstream. + * Update README.source. Explain how one can obtain the original sources. + * debian/docs: Do not install TODO.txt anymore. It does no longer exist. + * Drop debian/h2m folder. It is obsolete. + * Add longtitle to performous.menu. + * Add performous-tools.install file. + * Update README.Debian. Mention ~/.local/share/games/performous/songs as an + alternative song location. (Closes: #718897) + * Drop ultrastar-ng.links. + * Update debian/copyright to copyright format 1.0. Add Sil Open Fonts + license. + * Install performous.svg to /usr/share/icons/hicolor/scalable/apps. + + -- Markus Koschany <[email protected]> Sat, 08 Mar 2014 11:52:55 +0100 + performous (0.7.0-3) unstable; urgency=medium * Team upload. Modified: packages/trunk/performous/debian/control =================================================================== --- packages/trunk/performous/debian/control 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/control 2014-03-08 12:28:32 UTC (rev 14960) @@ -2,17 +2,32 @@ Section: games Priority: optional Maintainer: Debian Games Team <[email protected]> -Uploaders: Miriam Ruiz <[email protected]> -Build-Depends: debhelper (>= 9), - cmake (>= 2.6), pkg-config, help2man, gettext, - 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++-dev, libsamplerate0-dev, libxml++2.6-dev, - libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev, - libgstreamer0.10-dev, libglew1.5-dev, libpango1.0-dev +Uploaders: + Miriam Ruiz <[email protected]>, + Markus Koschany <[email protected]> +Build-Depends: + cmake, + debhelper (>= 9), + gettext, + help2man, + libasound2-dev, + libavcodec-dev, + libavformat-dev, + libboost-all-dev, + libcairo2-dev, + libgl1-mesa-dev, + libglew-dev, + libjpeg-dev, + libmagick++-dev, + libpango1.0-dev, + libpng-dev, + libportmidi-dev [linux-any], + librsvg2-dev, + libsdl1.2-dev, + libswscale-dev, + libxml++2.6-dev, + pkg-config, + portaudio19-dev Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/performous/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/performous/ @@ -20,12 +35,10 @@ Package: performous Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: dpkg (>= 1.15.6) -Recommends: ${alsalibs:Recommends} -Conflicts: ultrastar-ng (<< 0.3.0) -Replaces: ultrastar-ng (<< 0.3.0) -Provides: ultrastar-ng +Depends: + fonts-droid, + ${misc:Depends}, + ${shlibs:Depends} Description: karaoke game that allows user supplied songs A karaoke, band and dancing game where one or more players perform a song and the game scores their performances. Supports songs in UltraStar, @@ -35,10 +48,13 @@ Package: performous-tools Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Pre-Depends: dpkg (>= 1.15.6) -Recommends: vorbis-tools -Suggests: performous +Depends: + ${misc:Depends}, + ${shlibs:Depends} +Recommends: + vorbis-tools +Suggests: + performous Description: karaoke game that allows user supplied songs - tools A karaoke, band and dancing game where one or more players perform a song and the game scores their performances. Supports songs in UltraStar, @@ -53,9 +69,9 @@ Section: debug Priority: extra Architecture: any -Depends: performous (= ${binary:Version}) | performous-tools (= ${binary:Version}), +Depends: + performous (= ${binary:Version}) | performous-tools (= ${binary:Version}), ${misc:Depends} -Pre-Depends: dpkg (>= 1.15.6) Description: karaoke game that allows user supplied songs - debug A karaoke, band and dancing game where one or more players perform a song and the game scores their performances. Supports songs in UltraStar, Modified: packages/trunk/performous/debian/copyright =================================================================== --- packages/trunk/performous/debian/copyright 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/copyright 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,49 +1,122 @@ -This package was debianized by Miriam Ruiz <[email protected]> on -Wed, 21 Feb 2007 22:17:24 +0000. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Performous +Source: http://performous.org/download -It was downloaded from http://sourceforge.net/projects/performous/ +Files: * +Copyright: 2006-2014, Performous Developers +License: GPL-2+ +Comment: + Please see Authors.txt for a complete list of contributors. -Upstream Authors: +Files: data/fonts/GoblinOne.otf + data/fonts/NewRocker-Regular.otf +Copyright: 2011, Pablo Impallari (www.impallari.com|[email protected]), + 2011, Brenda Gallo ([email protected]), + 2011, Rodrigo Fuenzalida (www.rfuenzalida.com|[email protected]), +License: SIL-OPEN-FONT-LICENSE-VERSION-1.1 - Vincent Le Ligeour <[email protected]> - Lasse Kärkkäinen <[email protected]> +Files: debian/* +Copyright: 2007-2012, Miriam Ruiz <[email protected]> + 2011, Bruno "Fuddl" Kleinert <[email protected]> + 2011, Moritz Muehlenhoff <[email protected]> + 2012, Ansgar Burchardt <[email protected]> + 2012, Felix Geyer <[email protected]> + 2013-2014, Markus Koschany <[email protected]> +License: GPL-2+ - See Authors.txt for the full list of authors +License: GPL-2+ + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. -Copyright: - - Copyright (c) 2006-2008 Performous Developers - -cmake/Modules/*: - - Copyright (c) 2008 Andreas Schneider <[email protected]> - Copyright (c) 2007 Wengo - Copyright (c) 2007 Mike Jackson - Copyright (c) 2008 Andreas Pakulat <[email protected]> - -libda/plugins/plugin.hpp: - - Copyright (c) 2007-2008 Lasse Karkkainen - -License: - - 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 - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL-2'. - -The Debian packaging is (c) 2007-2008, Miriam Ruiz <[email protected]> -and is licensed under the same license as the program, see above. - +License: SIL-OPEN-FONT-LICENSE-VERSION-1.1 + This Font Software is licensed under the SIL Open Font License, Version 1.1. + This license is copied below, and is also available with a FAQ at: + http://scripts.sil.org/OFL + . + . + ----------------------------------------------------------- + SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 + ----------------------------------------------------------- + . + PREAMBLE + The goals of the Open Font License (OFL) are to stimulate worldwide + development of collaborative font projects, to support the font creation + efforts of academic and linguistic communities, and to provide a free and + open framework in which fonts may be shared and improved in partnership + with others. + . + The OFL allows the licensed fonts to be used, studied, modified and + redistributed freely as long as they are not sold by themselves. The + fonts, including any derivative works, can be bundled, embedded, + redistributed and/or sold with any software provided that any reserved + names are not used by derivative works. The fonts and derivatives, + however, cannot be released under any other type of license. The + requirement for fonts to remain under this license does not apply + to any document created using the fonts or their derivatives. + . + DEFINITIONS + "Font Software" refers to the set of files released by the Copyright + Holder(s) under this license and clearly marked as such. This may + include source files, build scripts and documentation. + . + & quot;Reserved Font Name" refers to any names specified as such after the + copyright statement(s). + . + "Original Version" refers to the collection of Font Software components as + distributed by the Copyright Holder(s). + . + "Modified Version" refers to any derivative made by adding to, deleting, + or substituting -- in part or in whole -- any of the components of the + Original Version, by changing formats or by porting the Font Software to a + new environment. + . + "Author" refers to any designer, engineer, programmer, technical + writer or other person who contributed to the Font Software. + . + PERMISSION & CONDITIONS + Permission is hereby granted, free of charge, to any person obtaining + a copy of the Font Software, to use, study, copy, merge, embed, modify, + redistribute, and sell modified and unmodified copies of the Font + Software, subject to the following conditions: + . + 1) Neither the Font Software nor any of its individual components, + in Original or Modified Versions, may be sold by itself. + . + 2) Original or Modified Versions of the Font Software may be bundled, + redistributed and/or sold with any software, provided that each copy + contains the above copyright notice and this license. These can be + included either as stand-alone text files, human-readable headers or + in the appropriate machine-readable metadata fields within text or + binary files as long as those fields can be easily viewed by the user. + . + 3) No Modified Version of the Font Software may use the Reserved Font + Name(s) unless explicit written permission is granted by the corresponding + Copyright Holder. This restriction only applies to the primary font name as + presented to the users. + . + 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font + Software shall not be used to promote, endorse or advertise any + Modified Version, except to acknowledge the contribution(s) of the + Copyright Holder(s) and the Author(s) or with their explicit written + permission. + . + 5) The Font Software, modified or unmodified, in part or in whole, + must be distributed entirely under this license, and must not be + distributed under any other license. The requirement for fonts to + remain under this license does not apply to any document created + using the Font Software. + . + TERMINATION + This license becomes null and void if any of the above conditions are + not met. + . + DISCLAIMER + 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 THE + COPYRIGHT HOLDER 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. Modified: packages/trunk/performous/debian/docs =================================================================== --- packages/trunk/performous/debian/docs 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/docs 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,2 +1 @@ docs/Authors.txt -docs/TODO.txt Deleted: packages/trunk/performous/debian/patches/FindFreetype.patch =================================================================== --- packages/trunk/performous/debian/patches/FindFreetype.patch 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/patches/FindFreetype.patch 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,21 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sat, 21 Dec 2013 11:48:00 +0100 -Subject: FindFreetype - ---- - cmake/Modules/FindFreetype.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/FindFreetype.cmake b/cmake/Modules/FindFreetype.cmake -index b4c1685..6511b90 100644 ---- a/cmake/Modules/FindFreetype.cmake -+++ b/cmake/Modules/FindFreetype.cmake -@@ -12,7 +12,7 @@ libfind_pkg_check_modules(Freetype_PKGCONF freetype2) - - # Include dir - find_path(Freetype_INCLUDE_DIR -- NAMES freetype/freetype.h -+ NAMES freetype2/freetype.h - PATHS ${Freetype_PKGCONF_INCLUDE_DIRS} - PATH_SUFFIXES freetype2 - ) Added: packages/trunk/performous/debian/patches/desktop-file.patch =================================================================== --- packages/trunk/performous/debian/patches/desktop-file.patch (rev 0) +++ packages/trunk/performous/debian/patches/desktop-file.patch 2014-03-08 12:28:32 UTC (rev 14960) @@ -0,0 +1,34 @@ +From: Markus Koschany <[email protected]> +Date: Fri, 7 Mar 2014 17:18:05 +0100 +Subject: desktop file + +Forwarded: https://github.com/performous/performous/issues/77 +--- + data/performous.desktop | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/data/performous.desktop b/data/performous.desktop +index 3a2a5f9..89fcb8b 100644 +--- a/data/performous.desktop ++++ b/data/performous.desktop +@@ -1,8 +1,7 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=Performous + Comment=A karaoke game +-Comment[de]=Ein Karaoke Spiel ++Comment[de]=Ein Karaoke-Spiel + Comment[es]=Un juego de karaoke + Comment[fi]=Karaokepeli + Comment[fr]=Un jeu de Karaoké +@@ -10,7 +9,8 @@ Comment[it]=Un gioco di karaoke + Comment[ro]=Un joc de tip karaoke + Comment[se]=Ett karaoke-spel + Exec=performous +-Icon=performous.png ++Icon=performous + Terminal=false + Type=Application +-Categories=Application;Game;ArcadeGame; ++Categories=Game;ArcadeGame; ++Keywords=song;music;dance;karaoke;microphone;sound;singing; Deleted: packages/trunk/performous/debian/patches/desktop.patch =================================================================== --- packages/trunk/performous/debian/patches/desktop.patch 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/patches/desktop.patch 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,16 +0,0 @@ -# Copyright (C) 2009 Miriam Ruiz <[email protected]> -# Distributed under the same license as the game. See debian/copyright. - -Index: performous-0.7.0/data/performous.desktop -=================================================================== ---- performous-0.7.0.orig/data/performous.desktop 2012-11-12 23:14:08.000000000 +0100 -+++ performous-0.7.0/data/performous.desktop 2012-11-20 23:56:58.000000000 +0100 -@@ -10,7 +10,7 @@ - Comment[ro]=Un joc de tip karaoke - Comment[se]=Ett karaoke-spel - Exec=performous --Icon=performous.xpm -+Icon=performous.png - Terminal=false - Type=Application - Categories=Application;Game;ArcadeGame; Deleted: packages/trunk/performous/debian/patches/libav0.8.patch =================================================================== --- packages/trunk/performous/debian/patches/libav0.8.patch 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/patches/libav0.8.patch 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,18 +0,0 @@ -Subject: Add missing include -From: Ansgar Burchardt <[email protected]> -Date: Sun, 15 Jan 2012 22:42:32 +0100 -Origin: vendor -Bug-Debian: http://bugs.debian.org/654221 - -Index: performous-0.7.0/game/ffmpeg.cc -=================================================================== ---- performous-0.7.0.orig/game/ffmpeg.cc 2012-11-12 23:14:08.000000000 +0100 -+++ performous-0.7.0/game/ffmpeg.cc 2012-11-21 00:00:16.000000000 +0100 -@@ -8,6 +8,7 @@ - - extern "C" { - #include AVCODEC_INCLUDE -+#include <libavutil/mathematics.h> - #include AVFORMAT_INCLUDE - #include SWSCALE_INCLUDE - } Modified: packages/trunk/performous/debian/patches/series =================================================================== --- packages/trunk/performous/debian/patches/series 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/patches/series 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,4 +1 @@ -desktop.patch -libav0.8.patch -use-Boost-TIME_UTC_-constant-unconditionally.patch -FindFreetype.patch +desktop-file.patch Deleted: packages/trunk/performous/debian/patches/use-Boost-TIME_UTC_-constant-unconditionally.patch =================================================================== --- packages/trunk/performous/debian/patches/use-Boost-TIME_UTC_-constant-unconditionally.patch 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/patches/use-Boost-TIME_UTC_-constant-unconditionally.patch 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,27 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sun, 30 Jun 2013 11:43:12 +0200 -Subject: use Boost TIME_UTC_ constant unconditionally - -Use always the new Boost TIME_UTC_ constant. This patch can be dropped as soon -as libboost1.53 is the new default in Debian. - -Bug: http://bugs.debian.org/710625 -Forwarded: not-needed - ---- - game/xtime.hh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/game/xtime.hh b/game/xtime.hh -index 8f5463d..ab53e23 100644 ---- a/game/xtime.hh -+++ b/game/xtime.hh -@@ -24,7 +24,7 @@ namespace { - #if (BOOST_VERSION / 100 % 1000 >= 50) - boost::xtime_get(&time, boost::TIME_UTC_); - #else -- boost::xtime_get(&time, boost::TIME_UTC); -+ boost::xtime_get(&time, boost::TIME_UTC_); - #endif - return time; - } Modified: packages/trunk/performous/debian/performous-tools.7 =================================================================== --- packages/trunk/performous/debian/performous-tools.7 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/performous-tools.7 2014-03-08 12:28:32 UTC (rev 14960) @@ -3,21 +3,35 @@ performous\-tools \- Tools for Performous karaoke game .SH "SYNOPSIS" \fBss_extract\fR [\-h|\-\-help] [\-\-dvd arg] [\-l|\-\-list] [\-\-song arg] [\-\-video arg] [\-\-audio arg] +.TP \fBss_adpcm_decode\fR [\-h|\-\-help] [archive.pak] input.mib output.wav +.TP \fBss_chc_decode\fR chc_file key1 key2 key3 key4 track_id +.TP \fBss_cover_conv\fR [\-h|\-\-help] [pak_file] [track_id] [output_image] +.TP \fBss_ipu_conv\fR [\-h|\-\-help] infile.ipu outfile.m2v +.TP \fBss_ipu_decode\fR [\-h|\-\-help] input output +.TP \fBss_pak_extract\fR [\-h|\-\-help] file.pak \-\-extract [files] +.TP \fBss_pak_extract\fR file.pak \-\-dump file +.TP \fBss_pak_extract\fR file.pak \-\-list -\fBss_archive_extract\fR archive --extract [files] -\fBss_archive_extract\fR archive --dump file -\fBss_archive_extract\fR archive --list +.TP +\fBss_archive_extract\fR archive \-\-extract [files] +.TP +\fBss_archive_extract\fR archive \-\-dump file +.TP +\fBss_archive_extract\fR archive \-\-list +.TP \fBgh_fsb_decrypt\fR input.fsb +.TP \fBgh_xen_decrypt\fR input.xen output +.TP \fBitg_pck\fR file.pck .SH "DESCRIPTION" Tools for converting original Singstar and Guitar Hero data to the format used by Performous. .SH "SEE ALSO" -\fIperformous\fR(1) +\fIperformous\fR(6) Added: packages/trunk/performous/debian/performous-tools.install =================================================================== --- packages/trunk/performous/debian/performous-tools.install (rev 0) +++ packages/trunk/performous/debian/performous-tools.install 2014-03-08 12:28:32 UTC (rev 14960) @@ -0,0 +1,2 @@ +usr/bin/* usr/games +usr/share/man/man1 Modified: packages/trunk/performous/debian/performous-tools.manpages =================================================================== --- packages/trunk/performous/debian/performous-tools.manpages 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/performous-tools.manpages 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,2 +1 @@ debian/performous-tools.7 -docs/man/*.1 Modified: packages/trunk/performous/debian/performous.install =================================================================== --- packages/trunk/performous/debian/performous.install 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/performous.install 2014-03-08 12:28:32 UTC (rev 14960) @@ -1 +1,7 @@ -debian/performous_32x32.xpm usr/share/pixmaps/ +debian/performous_32x32.xpm usr/share/pixmaps +usr/bin/performous usr/games +usr/share/applications +usr/share/games/performous +usr/share/locale +usr/share/man/man6 +usr/share/pixmaps/performous.svg usr/share/icons/hicolor/scalable/apps Added: packages/trunk/performous/debian/performous.links =================================================================== --- packages/trunk/performous/debian/performous.links (rev 0) +++ packages/trunk/performous/debian/performous.links 2014-03-08 12:28:32 UTC (rev 14960) @@ -0,0 +1 @@ +usr/share/fonts/truetype/droid/DroidSansMono.ttf usr/share/games/performous/fonts/DroidSansMono.ttf Deleted: packages/trunk/performous/debian/performous.manpages =================================================================== --- packages/trunk/performous/debian/performous.manpages 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/performous.manpages 2014-03-08 12:28:32 UTC (rev 14960) @@ -1 +0,0 @@ -debian/h2m/performous.6 Modified: packages/trunk/performous/debian/performous.menu =================================================================== --- packages/trunk/performous/debian/performous.menu 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/performous.menu 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,3 +1,6 @@ -?package(performous):needs="x11" section="Games/Action" \ - title="Performous" command="/usr/games/performous" \ - icon="/usr/share/pixmaps/performous_32x32.xpm" +?package(performous):needs="x11" \ + section="Games/Action" \ + title="Performous" \ + longtitle="Performous - karaoke game that allows user supplied songs" \ + command="/usr/games/performous" \ + icon="/usr/share/pixmaps/performous_32x32.xpm" Modified: packages/trunk/performous/debian/rules =================================================================== --- packages/trunk/performous/debian/rules 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/rules 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,129 +1,19 @@ #!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS) -CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) -CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) -LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -LDFLAGS2:=-Wl,-z,defs -Wl,-as-needed -Wl,--no-undefined -# This has to be exported to make some magic below work. -export DH_OPTIONS +%: + dh $@ --parallel -BUILD_TREE=$(CURDIR)/build-tree +override_dh_auto_configure: + dh_auto_configure -- \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=/usr -configure: configure-stamp -configure-stamp: - dh_testdir - # Perform an out-of-tree build to keep a clean source tree - rm -rf $(BUILD_TREE) - mkdir $(BUILD_TREE) - cd $(BUILD_TREE); cmake .. \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ - -DCMAKE_INSTALL_PREFIX:STRING="/usr" \ - -DLibDA_AUTODETECT_PLUGINS:BOOL=OFF \ - -DLibDA_PLUGIN_ALSA:BOOL=ON \ - -DLibDA_PLUGIN_GSTREAMER:BOOL=ON \ - -DLibDA_PLUGIN_JACK:BOOL=ON \ - -DLibDA_PLUGIN_PORTAUDIO:BOOL=ON \ - -DLibDA_PLUGIN_PULSE:BOOL=ON \ - -DLibDA_PLUGIN_TESTING:BOOL=OFF \ - -DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \ - -DCMAKE_CXX_FLAGS:STRING="$(CXXFLAGS) $(CPPFLAGS)" \ - -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ - -DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" \ - -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" \ - -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS) $(LDFLAGS2)" - touch $@ +override_dh_install: + dh_install --fail-missing + $(RM) debian/performous-tools/usr/games/performous -build-stamp: configure-stamp - dh_testdir - cd $(BUILD_TREE); $(MAKE) - touch $@ - -build-indep: build-stamp - -build-arch: build-stamp - -build: build-arch build-indep - -clean: - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - if [ -d $(BUILD_TREE) ]; then cd $(BUILD_TREE); $(MAKE) clean; fi - rm -fr $(BUILD_TREE) - $(MAKE) -C debian/h2m clean - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - cd $(BUILD_TREE); $(MAKE) install DESTDIR=$(CURDIR)/debian/performous - $(MAKE) -C debian/h2m - cp themes/default/icon.png $(CURDIR)/debian/performous/usr/share/pixmaps/performous.png - mkdir -p $(CURDIR)/debian/performous/usr/share/games/ultrastar/songs - mv $(CURDIR)/debian/performous/usr/bin $(CURDIR)/debian/performous/usr/games - - # Remove development stuff - rm -rf $(CURDIR)/debian/performous/usr/include - rm -rf $(CURDIR)/debian/performous/usr/lib/*.a - - # Move tools to their own package - mkdir -p $(CURDIR)/debian/performous-tools/usr/games - cd $(CURDIR)/debian/performous/usr/games/ && \ - for i in ss_adpcm_decode ss_cover_conv ss_ipu_conv ss_ipu_decode \ - ss_archive_extract ss_chc_decode ss_pak_extract ss_extract \ - gh_fsb_decrypt gh_xen_decrypt itg_pck; do \ - mv $(CURDIR)/debian/performous/usr/games/"$$i" $(CURDIR)/debian/performous-tools/usr/games/ ; \ - done - -# Build architecture independant packages using the common target. -binary-indep: - dh_testdir - dh_testroot - dh_install -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_makeshlibs -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i -- -Zxz - -# Build architecture dependant packages using the common target. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs -a - dh_installdocs -a - dh_installmenu -a - dh_installman -a - dh_install -a - dh_icons -a - dh_link -a +override_dh_strip: dh_strip --dbg-package=performous-dbg - dh_compress -a - dh_fixperms -a - dh_makeshlibs -a - dh_installdeb -a - dh_shlibdeps -a \ - -Xusr/lib/performous/libda-1/ - dh_shlibdeps -a \ - -Xusr/lib/performous/libda-1/libda.a \ - -Xusr/lib/performous/libda-1/libda_audio_dev_gst.so \ - -Xusr/lib/performous/libda-1/libda_audio_dev_jack.so \ - -Xusr/lib/performous/libda-1/libda_audio_dev_pa19.so \ - -Xusr/lib/performous/libda-1/libda_audio_dev_pulse.so \ - -- -dRecommends -palsalibs - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a -- -Zxz - -binary: binary-arch binary-indep -.PHONY: build-arch build-indep build clean binary-indep binary-arch binary install configure Modified: packages/trunk/performous/debian/source/options =================================================================== --- packages/trunk/performous/debian/source/options 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/source/options 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,5 +1,2 @@ -# Bzip2 compression for debian.tar -compression = "bzip2" -compression-level = 7 # Do not generate diff for changes in config.(sub|guess) extend-diff-ignore = "(^|/)config.(sub|guess)$" Deleted: packages/trunk/performous/debian/ultrastar-ng.links =================================================================== --- packages/trunk/performous/debian/ultrastar-ng.links 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/ultrastar-ng.links 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,3 +0,0 @@ -usr/games/performous usr/games/ultrastar-ng -usr/share/man/man6/performous.6.gz usr/share/man/man6/ultrastar-ng.6.gz -usr/share/doc/performous usr/share/doc/ultrastar-ng Modified: packages/trunk/performous/debian/watch =================================================================== --- packages/trunk/performous/debian/watch 2014-03-06 21:48:20 UTC (rev 14959) +++ packages/trunk/performous/debian/watch 2014-03-08 12:28:32 UTC (rev 14960) @@ -1,8 +1,2 @@ -# Watch control file for uscan -# See uscan(1) for format - -# Compulsory line, this is a version 3 file version=3 - -# Find new files on sourceforge, for debscripts >= 2.9 http://sf.net/performous/performous-(.*)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
