tags 385844 + pending
thanks
Hi,
Gergely Nagy wrote:
at this point in the freeze, it's probably better to go with the esd patch
instead of a whole new upstream version.
I agree.
I'll try to get around to do an upload in the next couple of days.
I've prepared an NMU for libmikmod (versioned as 3.1.12-4.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should cancel it or delay it longer.
I attach an nmudiff, but you'll probably find this git repository more useful.
I branched yours and tried to follow your packaging style:
git+ssh://git.debian.org/git/users/smcv/qa/libmikmod.git
http://anonscm.debian.org/gitweb/?p=users/smcv/qa/libmikmod.git;a=commitdiff;h=bf3a4898d9248ef4366f0c2f6695e8c31432f2fc
http://anonscm.debian.org/gitweb/?p=users/smcv/qa/libmikmod.git;a=shortlog;h=refs/heads/patch-queue/master
Tested with mikmod and bb, using wheezy's pulseaudio version.
Changes since Pantelis' patch:
* adapted to (what I infer from your git repository to be) your workflow
* git-format-patch-style headers for the new patches
* Recommends: pulseaudio-esound-compat | oss-compat because I noticed the
failure mode is pretty bad if you don't have one of those: libmikmod
falls through to one of its disk writer drivers, which is pretty useless
for audio output! (I'll open a bug)
One problem with the packaging style used in your git repository is that
the master branch (and its tags) don't track which patches were applied:
there's no way to see which patches were in a particular Debian release,
except rummaging in snapshot.debian.org. Obviously, it's your choice as
maintainer what packaging style you want to use, but I would suggest
either applying the patches to the Debian branch and using merges to
incorporate new upstream releases (like the Debian X maintainers do), or
using the documented gbp-pq workflow and living with the fact that the
patch series gets committed to the repository (like pkg-telepathy and
pkg-utopia do).
Regards,
S
diffstat for libmikmod-3.1.12 libmikmod-3.1.12
changelog | 11
control |4
patches/0001-Drop-LIBOBJS-from-configure.in.patch |3
patches/0002-dlopen-libesd.so.0-rather-than-libesd.so.patch |3
patches/0003-Use-_LP64-to-detect-64bit-arches.patch |1
patches/0004-CVE-2009-0179.patch |1
patches/0005-CVE-2007-6720.patch |3
patches/0006-CVE-2009-3995f.patch |3
patches/0007-CVE-2010-2546.patch |3
patches/0008-Fix-libmikmod-Makefile.in.patch |3
patches/0009-libmikmod-Makefile.in-Respect-CPPFLAGS-and-LDFLAGS.patch |3
patches/0010-libmikmod-config-manual-page-fix.patch |3
patches/0011-Disable-ALSA-by-default.patch| 31 +
patches/0011-Disable-ESD-and-ALSA-by-default.patch| 38 -
patches/0012-fix-ESD.patch| 259 ++
patches/0013-fix-building-of-ESD.patch| 133 +
patches/series|4
rules |2
18 files changed, 448 insertions(+), 60 deletions(-)
diff -Nru libmikmod-3.1.12/debian/changelog libmikmod-3.1.12/debian/changelog
--- libmikmod-3.1.12/debian/changelog 2012-04-05 17:31:57.0 +0100
+++ libmikmod-3.1.12/debian/changelog 2012-10-19 09:41:58.0 +0100
@@ -1,3 +1,14 @@
+libmikmod (3.1.12-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Apply patches from Hans de Goede and Pantelis Koukousoulas to enable
+the ESD driver, so we can interoperate with PulseAudio (Closes: #385844)
+ * Recommend pulseaudio-esound-compat | oss-compat because if we don't have
+one of those, the fallback path is to write output to ./music.raw, which
+is unlikely to be what you want!
+
+ -- Simon McVittie s...@debian.org Fri, 19 Oct 2012 09:12:08 +0100
+
libmikmod (3.1.12-4) unstable; urgency=low
* Drop the dependency on oss-compat. Programs that use libmikmod should
diff -Nru libmikmod-3.1.12/debian/control libmikmod-3.1.12/debian/control
--- libmikmod-3.1.12/debian/control 2012-04-05 17:28:36.0 +0100
+++ libmikmod-3.1.12/debian/control 2012-10-19 09:15:49.0 +0100
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Gergely Nagy alger...@madhouse-project.org
-Build-Depends: debhelper (= 9~), dh-autoreconf, texinfo
+Build-Depends: debhelper (= 9~), dh-autoreconf, texinfo, libesd0-dev
Standards-Version: 3.9.3
Homepage: http://mikmod.raphnet.net/
Vcs-Git: git://git.madhouse-project.org/debian/libmikmod.git
@@ -32,7 +32,7 @@
