cytadela: unfreeze request

[Sylvain <beuc@debian.org>]

Hi,

Please unblock cytadela-1.0.1-2 that fixes video playback for libvlc5
>= 2.0 (#698489, severity=important).

http://packages.qa.debian.org/c/cytadela.html
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698489

[Please keep me in CC.]

Below is the debdiff:

diff -Nru cytadela-1.0.1/debian/changelog cytadela-1.0.1/debian/changelog
--- cytadela-1.0.1/debian/changelog	2010-07-02 21:22:38.000000000 +0200
+++ cytadela-1.0.1/debian/changelog	2013-01-19 12:02:15.000000000 +0100
@@ -1,3 +1,10 @@
+cytadela (1.0.1-2) unstable; urgency=low
+
+  * Fix intro and outro videos playback that broke with newer libVLC
+    (Closes: #698489)
+
+ -- Sylvain Beucler <beuc@debian.org>  Sat, 19 Jan 2013 12:02:15 +0100
+
 cytadela (1.0.1-1) unstable; urgency=low
 
   * New upstream release (supports new libvlc-dev 1.1 and hence fixes
diff -Nru cytadela-1.0.1/debian/control cytadela-1.0.1/debian/control
--- cytadela-1.0.1/debian/control	2010-07-02 21:21:07.000000000 +0200
+++ cytadela-1.0.1/debian/control	2013-01-15 00:31:10.000000000 +0100
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Sylvain Beucler <beuc@debian.org>
-Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-mixer1.2-dev, mesa-common-dev, libglu1-mesa-dev, libvlc-dev (>= 1.1)
+Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-mixer1.2-dev, mesa-common-dev, libglu1-mesa-dev, libvlc-dev (>= 2.0)
 Standards-Version: 3.8.4
 Homepage: http://cytadela.sf.net/
 Vcs-Git: git://git.debian.org/git/pkg-games/cytadela.git
diff -Nru cytadela-1.0.1/debian/patches/fix_libvlc_playback.patch cytadela-1.0.1/debian/patches/fix_libvlc_playback.patch
--- cytadela-1.0.1/debian/patches/fix_libvlc_playback.patch	1970-01-01 01:00:00.000000000 +0100
+++ cytadela-1.0.1/debian/patches/fix_libvlc_playback.patch	2013-01-19 11:46:15.000000000 +0100
@@ -0,0 +1,278 @@
+--- cytadela-1.0.1/src/videoplayer.cpp	2010-06-29 21:28:59.000000000 +0200
++++ cytadela-1.1.0/src/videoplayer.cpp	2013-01-14 22:50:35.000000000 +0100
+@@ -1,7 +1,7 @@
+ /* libSDL and libVLC sample code
+  * Copyright © 2008 Sam Hocevar <sam@zoy.org>
+ 
+- Copyright (c) 2010 Tomasz Kazmierczak
++ Copyright (c) 2010, 2013 Tomasz Kazmierczak
+  Copyright (c) 2010 Tomasz Wisniewski
+  Modified the original code by Sam Hocevar in order to adapt to the game and
+  relicensed from Do What The Fuck You Want To Public License to GNU GPLv3
[snip!]
+-    return true;
++	return true;
+ }
diff -Nru cytadela-1.0.1/debian/patches/series cytadela-1.0.1/debian/patches/series
--- cytadela-1.0.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ cytadela-1.0.1/debian/patches/series	2013-01-19 11:46:30.000000000 +0100
@@ -0,0 +1 @@
+fix_libvlc_playback.patch

-- 
Sylvain