* Zack Cerza [Thu, 10 Nov 2005 10:44:41 -0500]:
> Adeodato Simó wrote:
> > Is Modestas' patch OK?
> Yeah, sorry for the delay (again). The patch looks perfect.
NMU uploaded, final diff attached.
Cheers,
--
Adeodato Simó
EM: dato (at) the-barrel.org | PK: DA6AE621
He has never been known to use a word that might send a reader to the
dictionary.
-- William Faulkner (about Ernest Hemingway)
diff -u kaffeine-0.7.1/debian/changelog kaffeine-0.7.1/debian/changelog
--- kaffeine-0.7.1/debian/changelog
+++ kaffeine-0.7.1/debian/changelog
@@ -1,3 +1,22 @@
+kaffeine (0.7.1-1.3) unstable; urgency=low
+
+ * NMU with maintainer's approval. All changes come straight from a patch
+ sent by Modestas Vainius <[EMAIL PROTECTED]> to the BTS. Thanks!
+
+ * Remove 13_xine_service_menu.diff, since it breaks loading of
+ libkaffeinepart (the name "Kaffeine" is hardcored in many places in the
+ code, so leave it). Closes: #328738
+
+ * Make kaffeine depend on kaffeine-xine | kaffeine-gstreamer instead of
+ backwards, so that the XINE engine (the only one it used to exist) gets
+ installed by default when upgrading from << 0.7 versions.
+
+ * Update 12_gstreamer_service_menu.diff to leave "Name" section unchanged;
+ no need to risk breaking things (like the bug above) in the future. Leave
+ "Icon" unchanged as well.
+
+ -- Adeodato Simó <[EMAIL PROTECTED]> Fri, 11 Nov 2005 00:06:35 +0100
+
kaffeine (0.7.1-1.2) unstable; urgency=low
* Non-maintainer upload.
reverted:
--- kaffeine-0.7.1/debian/patches/13_xine_service_menu.diff
+++ kaffeine-0.7.1.orig/debian/patches/13_xine_service_menu.diff
@@ -1,13 +0,0 @@
-Index: kaffeine/player-parts/kaffeine-part/kaffeine_part.desktop
-===================================================================
---- kaffeine/player-parts/kaffeine-part/kaffeine_part.desktop (revision 45)
-+++ kaffeine/player-parts/kaffeine-part/kaffeine_part.desktop (working copy)
-@@ -2,7 +2,7 @@
- Encoding=UTF-8
- Icon=kaffeine
-
MimeType=application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack;
--Name=Kaffeine
-+Name=Xine
- Comment=A player part based on xine.
- Comment[de]=Ein auf xine basierender player part.
- ServiceTypes=KParts/ReadOnlyPart,KMediaPart
diff -u kaffeine-0.7.1/debian/control kaffeine-0.7.1/debian/control
--- kaffeine-0.7.1/debian/control
+++ kaffeine-0.7.1/debian/control
@@ -8,7 +8,7 @@
Package: kaffeine
Architecture: any
-Depends: ${shlibs:Depends}, kaffeine-gstreamer | kaffeine-xine
+Depends: ${shlibs:Depends}, kaffeine-xine | kaffeine-gstreamer
Description: versatile media player for KDE 3
Kaffeine is a media player for KDE. While it supports multiple player
engines, its default engine is Xine, giving Kaffeine a wide variety of
diff -u kaffeine-0.7.1/debian/patches/12_gstreamer_service_menu.diff
kaffeine-0.7.1/debian/patches/12_gstreamer_service_menu.diff
--- kaffeine-0.7.1/debian/patches/12_gstreamer_service_menu.diff
+++ kaffeine-0.7.1/debian/patches/12_gstreamer_service_menu.diff
@@ -5,10 +5,8 @@
@@ -1,11 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
--Icon=gstreamer
--Name=GStreamerPart
-+Icon=kaffeine
-+Name=GStreamer
+ Icon=gstreamer
+ Name=GStreamerPart
Comment=A player part based on GStreamer.
Comment[de]=Ein auf GStreamer basierender player part.
-MimeType=application/x-ogg;audio/x-mp3;audio/x-mpeg;audio/x-ogg;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/x-avi;application/x-kaffeine
