Merge lp:~tintou/performous/debian into lp:~guilhem-fr/performous/debian

Proposed by Corentin Noël
Status: Merged
Approved by: Guilhem Lettron
Approved revision: 3
Merged at revision: 3
Proposed branch: lp:~tintou/performous/debian
Merge into: lp:~guilhem-fr/performous/debian
Diff against target: 34 lines (+4/-4)
2 files modified
control (+3/-3)
source/format (+1/-1)
To merge this branch: bzr merge lp:~tintou/performous/debian
Reviewer Review Type Date Requested Status
Guilhem Lettron Approve
Review via email: mp+222323@code.launchpad.net

Commit message

Fix for 14.04

Description of the change

Updated required packages according to current trunk.

To post a comment you must log in.
Revision history for this message
Guilhem Lettron (guilhem-fr) wrote :

ok for me!

Revision history for this message
Guilhem Lettron (guilhem-fr) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'control'
2--- control 2013-07-09 13:00:19 +0000
3+++ control 2014-06-06 12:59:10 +0000
4@@ -6,13 +6,13 @@
5 Uploaders: Miriam Ruiz <miriam@debian.org>
6 Build-Depends: debhelper (>= 9),
7 cmake (>= 2.6), pkg-config, help2man, gettext,
8- libgl1-mesa-dev, libsdl1.2-dev, libcairo2-dev, librsvg2-dev,
9+ libgl1-mesa-dev, libsdl2-dev, libcairo2-dev, librsvg2-dev,
10 libboost-thread-dev (>= 1.36), libboost-serialization-dev (>= 1.36),
11 libboost-program-options-dev (>= 1.36), libboost-regex-dev (>= 1.36),
12 libboost-filesystem-dev (>= 1.36),
13 libavcodec-dev, libavformat-dev, libswscale-dev,
14 libmagick++-dev, libsamplerate0-dev, libxml++2.6-dev,
15- libasound2-dev, libjack-dev, libpulse-dev, portaudio19-dev,
16+ libasound2-dev, libjack-jackd2-dev, libpulse-dev, portaudio19-dev,
17 libgstreamer0.10-dev, libglew-dev, libpango1.0-dev
18 Standards-Version: 3.9.3
19 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/performous/
20@@ -32,4 +32,4 @@
21 and the game scores their performances. Supports songs in UltraStar,
22 Frets on Fire and StepMania formats. Microphones and instruments from
23 SingStar, Guitar Hero and Rock Band as well as some dance pads are
24- autodetected.
25+ autodetected.
26\ No newline at end of file
27
28=== modified file 'source/format'
29--- source/format 2013-07-09 11:15:06 +0000
30+++ source/format 2014-06-06 12:59:10 +0000
31@@ -1,1 +1,1 @@
32-3.0 (quilt)
33+3.0 (native)
34\ No newline at end of file

Subscribers

People subscribed via source and target branches