From c9ac49a5d5c6696c14061eb935dc2442cd877ed4 Mon Sep 17 00:00:00 2001 From: Alexander Kojevnikov Date: Tue, 25 Sep 2012 10:33:58 -0700 Subject: [PATCH] debian: Update to 0.8.0 --- dist/debian/changelog | 6 ++++++ dist/debian/control | 15 ++++++--------- dist/debian/copyright | 4 ++-- dist/debian/patches/fix-actionentry.patch | 15 --------------- dist/debian/patches/fix-libav-mathematics.patch | 13 ------------- dist/debian/patches/series | 2 -- dist/debian/rules | 7 ++----- dist/debian/watch | 2 +- 8 files changed, 17 insertions(+), 47 deletions(-) delete mode 100644 dist/debian/patches/fix-actionentry.patch delete mode 100644 dist/debian/patches/fix-libav-mathematics.patch delete mode 100644 dist/debian/patches/series diff --git a/dist/debian/changelog b/dist/debian/changelog index c2db335..65b91dd 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,3 +1,9 @@ +spek (0.8.0-1) unstable; urgency=low + + * New upstream release. + + -- Alexander Kojevnikov Tue, 25 Sep 2012 09:45:54 -0700 + spek (0.7-3) unstable; urgency=low * Require valac >= 0.12 (Closes: #663319) diff --git a/dist/debian/control b/dist/debian/control index 370fe9d..c0d74bd 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -3,17 +3,14 @@ Section: sound Priority: optional Maintainer: Alexander Kojevnikov Build-Depends: debhelper (>= 7.0.50~), - cdbs, autotools-dev, - valac (>= 0.12), + pkg-config, intltool (>= 0.35), - libavcodec-dev (>= 4:0.6), - libavformat-dev (>= 4:0.6), - libavutil-dev (>= 4:0.6), - libcairo2-dev, - libglib2.0-dev, - libgtk2.0-dev (>= 2.18.0), - libpango1.0-dev + libavcodec-dev (>= 6:0.8), + libavformat-dev (>= 6:0.8), + libavutil-dev (>= 6:0.8), + libwxgtk2.8-dev, + wx-common Standards-Version: 3.9.3 Homepage: http://spek-project.org/ Vcs-Git: git://github.com/alexkay/spek.git diff --git a/dist/debian/copyright b/dist/debian/copyright index df61bda..f923982 100644 --- a/dist/debian/copyright +++ b/dist/debian/copyright @@ -15,7 +15,7 @@ Copyright: For everything not noted below: Copyright (C) 2010-2012 Alexander Kojevnikov - For src/spek-pipeline.*: + For lib/spek-pipeline.c: Copyright (C) 2010-2012 Alexander Kojevnikov Copyright (C) 2007-2009 Sebastian Dröge Copyright (C) 2006 Stefan Kost @@ -41,7 +41,7 @@ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". The Debian packaging is: - Copyright (C) 2011 Alexander Kojevnikov + Copyright (C) 2011-2012 Alexander Kojevnikov and is licensed under the GPL version 3 or any later version, see above. diff --git a/dist/debian/patches/fix-actionentry.patch b/dist/debian/patches/fix-actionentry.patch deleted file mode 100644 index 1d4c67c..0000000 --- a/dist/debian/patches/fix-actionentry.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 4f4de3a..0000000 --- a/dist/debian/patches/fix-libav-mathematics.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 1bbef1f..0000000 --- a/dist/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -fix-actionentry.patch -fix-libav-mathematics.patch diff --git a/dist/debian/rules b/dist/debian/rules index cefdbb3..65028fd 100755 --- a/dist/debian/rules +++ b/dist/debian/rules @@ -1,7 +1,4 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/autotools.mk -include /usr/share/cdbs/1/rules/debhelper.mk - -makebuilddir:: - rm -f src/spek_vala.stamp +%: + dh $@ diff --git a/dist/debian/watch b/dist/debian/watch index 4a3ebf1..67ce5f9 100644 --- a/dist/debian/watch +++ b/dist/debian/watch @@ -1,3 +1,3 @@ version=3 -http://code.google.com/p/spek/downloads/list \ +https://github.com/alexkay/spek/downloads \ .*/spek-([0-9.]+)\.tar\.xz