Hello! I've been asked to look at the RC bugs and prepare a NMU during my New Maintainer Tasks and Skills examination. I noticed that Muine had a couple of bugs open for a few days that I would be able to fix and prepare a new package version for. I'm attaching my proposed NMU changes and ask you to please speak up as soon as possible if you have anything against me asking my Application Manager to review and upload these changes.
debdiff with proposed NMU attached. -- Regards, Andreas Henriksson
diff -u muine-0.8.7/debian/control muine-0.8.7/debian/control
--- muine-0.8.7/debian/control
+++ muine-0.8.7/debian/control
@@ -7,7 +7,7 @@
Package: muine
Architecture: any
-Depends: ${shlibs:Depends}, gstreamer0.10-gnomevfs (>= 0.10.0), ${misc:Depends}, ${cli:Depends}, gstreamer0.10-plugins-base
+Depends: ${shlibs:Depends}, gstreamer0.10-gnomevfs (>= 0.10.0), ${misc:Depends}, ${cli:Depends}, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good
Description: Simple playlist based music player
Muine is an innovative music player. It has a simple interface designed to
allow the user to easily construct playlists from albums and/or single songs.
diff -u muine-0.8.7/debian/changelog muine-0.8.7/debian/changelog
--- muine-0.8.7/debian/changelog
+++ muine-0.8.7/debian/changelog
@@ -1,3 +1,13 @@
+muine (0.8.7-1.1) unstable; urgency=low
+
+ * Non-Maintainer Upload (NMU)
+ * Add patch stolen from upstream SVN to allow building with FLAC >= 1.1.3
+ (Closes: #427751).
+ * Add dependency on gstreamer0.10-plugins-good as muine uses gconfaudiosink
+ from gconfelements, which is in -plugins-good (Closes: #421047).
+
+ -- Andreas Henriksson <[EMAIL PROTECTED]> Thu, 14 Jun 2007 19:28:19 +0200
+
muine (0.8.7-1) unstable; urgency=high
* New upstream release
only in patch2:
unchanged:
--- muine-0.8.7.orig/debian/patches/muine-flac113.diff
+++ muine-0.8.7/debian/patches/muine-flac113.diff
@@ -0,0 +1,73 @@
+diff -Nur muine-0.8.7/libmuine/metadata.c muine-0.8.7.new/libmuine/metadata.c
+--- muine-0.8.7/libmuine/metadata.c 2007-01-19 23:14:07.000000000 +0100
++++ muine-0.8.7.new/libmuine/metadata.c 2007-06-14 19:27:31.000000000 +0200
+@@ -41,6 +41,12 @@
+ #include "metadata.h"
+ #include "macros.h"
+
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ struct _Metadata {
+ char *title;
+
+@@ -741,7 +747,14 @@
+ } CallbackData;
+
+ static FLAC__StreamDecoderReadStatus
+-FLAC_read_callback (const FLAC__StreamDecoder *UNUSED(decoder), FLAC__byte buffer[], unsigned *bytes, void *client_data)
++FLAC_read_callback (const FLAC__StreamDecoder *UNUSED(decoder),
++ FLAC__byte buffer[],
++#if defined(LEGACY_FLAC)
++ unsigned *bytes,
++#else
++ size_t *bytes,
++#endif
++ void *client_data)
+ {
+ CallbackData *data = (CallbackData *) client_data;
+ GnomeVFSFileSize read;
+@@ -829,22 +842,40 @@
+
+ flac_decoder = FLAC__stream_decoder_new ();
+
++#if defined(LEGACY_FLAC)
+ FLAC__stream_decoder_set_read_callback (flac_decoder, FLAC_read_callback);
+ FLAC__stream_decoder_set_write_callback (flac_decoder, FLAC_write_callback);
+ FLAC__stream_decoder_set_metadata_callback (flac_decoder, FLAC_metadata_callback);
+ FLAC__stream_decoder_set_error_callback (flac_decoder, FLAC_error_callback);
++#endif
+
+ callback_data = g_new0 (CallbackData, 1);
+ callback_data->handle = handle;
+ callback_data->comment = comment;
++#if defined(LEGACY_FLAC)
+ FLAC__stream_decoder_set_client_data (flac_decoder, callback_data);
++#endif
+
+ /* by default, only the STREAMINFO block is parsed and passed to
+ * the metadata callback. Here we instruct the decoder to also
+ * pass us the VORBISCOMMENT block if there is one. */
+ FLAC__stream_decoder_set_metadata_respond (flac_decoder, FLAC__METADATA_TYPE_VORBIS_COMMENT);
+
++#if defined(LEGACY_FLAC)
+ FLAC__stream_decoder_init (flac_decoder);
++#else
++ FLAC__stream_decoder_init_stream (flac_decoder,
++ FLAC_read_callback,
++ NULL,
++ NULL,
++ NULL,
++ NULL,
++ FLAC_write_callback,
++ FLAC_metadata_callback,
++ FLAC_error_callback,
++ callback_data
++ );
++#endif
+
+ /* this runs the decoding process, calling the callbacks as appropriate */
+ if (FLAC__stream_decoder_process_until_end_of_metadata (flac_decoder) == 0) {
signature.asc
Description: This is a digitally signed message part
