Hello again.
I missed the serious muine-plugin-trayicon (generated from same source) bug,
so I've updated my NMU and for completeness I'm now send out the new version
that also fixes bug #426473 as well (just adds additional text to
debian/copyright).
Please see attached diff instead of previous version, when/if reviewing
proposed NMU changes.
--
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,15 @@
+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).
+ * Add note about parts being available under the MIT License to
+ debian/copyright (Closes: #426473).
+
+ -- Andreas Henriksson <[EMAIL PROTECTED]> Thu, 14 Jun 2007 19:28:19 +0200
+
muine (0.8.7-1) unstable; urgency=high
* New upstream release
diff -u muine-0.8.7/debian/copyright muine-0.8.7/debian/copyright
--- muine-0.8.7/debian/copyright
+++ muine-0.8.7/debian/copyright
@@ -24,2 +24,30 @@
+
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
+
+
+Some parts like deps/dbus-sharp/, dbus-sharp-glib/ and
+plugins/NotificationArea.cs are also available under the MIT License:
+
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+See the respective source file header for any alternative licensing option
+that might be available if you want to use something else then the GPL which
+the entire work is available under.
+
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) {
