spek

commit f56d07736113290798fc11d1a7f786baa9666838
parent 3d7783bf3895303be5728d06e636f8ea375502d1
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date:   Wed,  4 Jan 2012 18:59:37 +0800

debian: Update to 0.7-2

Diffstat:
M
dist/debian/changelog
 | 
7
+++++++
A
dist/debian/patches/fix-actionentry.patch
 | 
15
+++++++++++++++
A
dist/debian/patches/fix-libav-mathematics.patch
 | 
13
+++++++++++++
A
dist/debian/patches/series
 | 
2
++

4 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/dist/debian/changelog b/dist/debian/changelog
@@ -1,3 +1,10 @@
+spek (0.7-2) unstable; urgency=low
+
+  * Fix Vala build (Closes: #638456)
+  * Fix compilation with libav 0.8 (Closes: #654224)
+
+ -- Alexander Kojevnikov <alexander@kojevnikov.com>  Wed, 04 Jan 2012 17:59:56 +0800
+
 spek (0.7-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/dist/debian/patches/fix-actionentry.patch b/dist/debian/patches/fix-actionentry.patch
@@ -0,0 +1,15 @@
+Author: Colin Watson <cjwatson@ubuntu.com>
+Description: Fix ActionEntry ambiguity resulting in Vala build error
+Bug-Debian: http://bugs.debian.org/638456
+
+--- a/src/spek-window.vala
++++ b/src/spek-window.vala
+@@ -31,7 +31,7 @@
+ 		private FileFilter filter_audio;
+ 		private FileFilter filter_png;
+ 
+-		private const ActionEntry[] ACTION_ENTRIES = {
++		private const Gtk.ActionEntry[] ACTION_ENTRIES = {
+ 			{ "File", null, N_("_File") },
+ 			{ "FileOpen", STOCK_OPEN, null, null, null, on_file_open },
+ 			{ "FileSave", STOCK_SAVE, null, null, null, on_file_save },
diff --git a/dist/debian/patches/fix-libav-mathematics.patch b/dist/debian/patches/fix-libav-mathematics.patch
@@ -0,0 +1,13 @@
+Author: Reinhard Tartler <siretart@tauware.de>
+Description: Fix compilation with libav 0.8
+Bug-Debian: http://bugs.debian.org/654224
+--- a/src/spek-audio.c
++++ b/src/spek-audio.c
+@@ -18,6 +18,7 @@
+ 
+ #include <glib.h>
+ #include <glib/gi18n.h>
++#include <libavutil/mathematics.h>
+ 
+ #include "spek-audio.h"
+ 
diff --git a/dist/debian/patches/series b/dist/debian/patches/series
@@ -0,0 +1,2 @@
+fix-actionentry.patch
+fix-libav-mathematics.patch