[SCM] cmus/master.stable: Merge branch 'master' into master.stable

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu May 9 15:00:04 UTC 2013


New entry.
Drop references to roar from debian/rules.
Bump Standards.
wrap and sort
Build cmus without roar support.
Drop DM-Upload-Allowed: yes, no longer needed
Update my email address to @debian.org
Finalize changelog.
Merge commit 'upstream/2.4.3'
Imported Upstream version 2.4.3
Finalize
Drop 0001-fix-compile-error-for-new-versions-of-ffmpeg.patch, applied upstream.
Merge commit 'upstream/2.4.2'
Imported Upstream version 2.4.2
Finalize
Replace negated list of architectures with linux-any (Closes: #634706).
The patch is applied upstream, will be relased with cmus 2.4.2.
Add Ubuntu-specific patch to fix FTBFS with newest version of ffmpeg.
Finalize changelog.
Merge commit 'upstream/2.4.1'
Imported Upstream version 2.4.1
Finalize changelog.
Bump Standards.
Remove debian/patches directory, all patches have been applied upstream.
Remove 20-segfault_on_adding_to_queue.patch, applied upstream.
Remove 10-roaraudio_support.patch, applied upstream.
Merge commit 'upstream/2.4.0'
Imported Upstream version 2.4.0
debian/watch: Properly handle release-candidate,beta releases.
Finalize
Remo 21-missing_plugins.patch, applied upstream.
Refresh patches.
Merge commit 'upstream/2.3.5'
Imported Upstream version 2.3.5
Finalize
debian/gbp.conf: Small fix
Handle missing dependencies more gracefully.
Finalize changelog.
Avoid to depend on several sound servers (Closes: #612887) and let users choose to rely on the favorite one.
Finalize changelog.
Add DM-Upload-Allowed: yes.
Bump my copyright
Refreshed 10-roaraudio_support.patch
Dropped 03-terminal_corruption.patch; applied upstream
Dropped 02_cmus-tutorial_whatis.diff; applied upstream
Dropped 01_spelling_mistakes.diff; applied upstream
Merge branch 'upstream'
Imported Upstream version 2.3.4
Finalize changelog.
Finalize changelog
Fix small mistakes which prevent the build of the roar plugin.
Tune libroad-dev build-dependency
Build-depends on libroar-dev.
Add patch taken from upstream's git to fix segfault when adding to queue.
Add RoarOutput plugin (Closes: #609202), thanks to Philipp "ph3-der-loewe" Schafft <lion at lion.leolix.org> for the patch.
Imported Upstream version 2.3.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master.stable
X-Git-Reftype: branch
X-Git-Oldrev: d5dafe279dea2ad1207ac81a5de972f53905885b
X-Git-Newrev: a21bd012bb764f922b75e091c26d269ac1efb3fe

The following commit has been merged in the master.stable branch:
commit a21bd012bb764f922b75e091c26d269ac1efb3fe
Merge: d5dafe279dea2ad1207ac81a5de972f53905885b 817d29d91ae76cbf19051b4e43ef308908bf2cb9
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 9 16:59:56 2013 +0200

    Merge branch 'master' into master.stable
    
    Conflicts:
    	debian/gbp.conf


-- 
cmus packaging



More information about the pkg-multimedia-commits mailing list