diff --git a/dist/debian/changelog b/dist/debian/changelog index e3913c8..d0f9615 100644 --- 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 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 new file mode 100644 index 0000000..1d4c67c --- /dev/null +++ b/dist/debian/patches/fix-actionentry.patch @@ -0,0 +1,15 @@ +Author: Colin Watson +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 new file mode 100644 index 0000000..4f4de3a --- /dev/null +++ b/dist/debian/patches/fix-libav-mathematics.patch @@ -0,0 +1,13 @@ +Author: Reinhard Tartler +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 + #include ++#include + + #include "spek-audio.h" + diff --git a/dist/debian/patches/series b/dist/debian/patches/series new file mode 100644 index 0000000..1bbef1f --- /dev/null +++ b/dist/debian/patches/series @@ -0,0 +1,2 @@ +fix-actionentry.patch +fix-libav-mathematics.patch