Hi, Please, unblock kaffeine 1.0-2.
Due to an update in shared-mime-info (migrated to testing), the mimetypes specified in the kaffeine.desktop file don't assign .m2t files to kaffeine. This is bad, because kaffeine creates such files (and users expect that they can open these files without trouble - currently an 'open with' dialog pops up). The fix isn't intrusive and will be hopefully be accepted for Squeeze (debdiff attached). Cheers, Fathi
diff -Nru kaffeine-1.0/debian/changelog kaffeine-1.0/debian/changelog --- kaffeine-1.0/debian/changelog 2010-06-02 10:52:39.000000000 +0300 +++ kaffeine-1.0/debian/changelog 2010-10-07 11:50:57.000000000 +0300 @@ -1,3 +1,10 @@ +kaffeine (1.0-2) unstable; urgency=low + + * Update mime types and extensions: include the new "video/mp2t" mime type. + (Closes: #596671) + + -- Fathi Boudra <[email protected]> Thu, 07 Oct 2010 11:49:46 +0300 + kaffeine (1.0-1) unstable; urgency=low * New upstream release. diff -Nru kaffeine-1.0/debian/patches/kaffeine_r1137341_mime_type.patch kaffeine-1.0/debian/patches/kaffeine_r1137341_mime_type.patch --- kaffeine-1.0/debian/patches/kaffeine_r1137341_mime_type.patch 1970-01-01 02:00:00.000000000 +0200 +++ kaffeine-1.0/debian/patches/kaffeine_r1137341_mime_type.patch 2010-10-07 11:56:50.000000000 +0300 @@ -0,0 +1,35 @@ +--- a/src/kaffeine.desktop ++++ b/src/kaffeine.desktop +@@ -102,7 +102,7 @@ GenericName[x-test]=xxMedia Playerxx + GenericName[zh_CN]=媒体播放器 + Categories=Qt;KDE;AudioVideo;Player; + Icon=kaffeine +-MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-quicktime-media-link;application/x-shorten;application/xspf+xml;audio/ac3;audio/basic;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp4;video/mpeg;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-anim;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-ogm+ogg; ++MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-quicktime-media-link;application/x-shorten;application/xspf+xml;audio/ac3;audio/basic;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-s3m;audio/x-scpls;audio/x-speex;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-wav;audio/x-wavpack;audio/x-xm;video/dv;video/mp2t;video/mp4;video/mpeg;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/x-anim;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-ogm+ogg; + Terminal=false + Type=Application + X-KDE-HasTempFileOption=true +--- a/src/mediawidget.cpp ++++ b/src/mediawidget.cpp +@@ -519,13 +519,14 @@ QString MediaWidget::extensionFilter() + return QString( + // generated from kaffeine.desktop's mime types + "*.669 *.aac *.ac3 *.aif *.aifc *.aiff *.anim1 *.anim2 *.anim3 *.anim4 *.anim5 " +- "*.anim6 *.anim7 *.anim8 *.anim9 *.animj *.asf *.asx *.au *.avi *.divx *.dv " +- "*.flac *.flc *.fli *.flv *.it *.m15 *.m2t *.m3u *.m3u8 *.m4a *.m4b *.m4v *.med " +- "*.mka *.mkv *.mng *.mod *.moov *.mov *.mp+ *.mp2 *.mp3 *.mp4 *.mpc *.mpe *.mpeg " +- "*.mpg *.mpga *.mpp *.mtm *.nsv *.oga *.ogg *.ogm *.ogv *.ogx *.pls *.qt *.qtl " +- "*.qtvr *.ra *.ram *.rax *.rm *.rmj *.rmm *.rms *.rmvb *.rmx *.rv *.rvx *.s3m " +- "*.shn *.snd *.spx *.spx *.stm *.tta *.ult *.uni *.vlc *.vob *.voc *.wav *.wax " +- "*.wma *.wmv *.wmx *.wv *.wvp *.wvx *.xm *.xspf " ++ "*.anim6 *.anim7 *.anim8 *.anim9 *.animj *.asf *.asx *.au *.avi *.bdm *.bdmv " ++ "*.clpi *.cpi *.divx *.dv *.flac *.flc *.fli *.flv *.it *.m15 *.m2t *.m2ts *.m3u " ++ "*.m3u8 *.m4a *.m4b *.m4v *.med *.mka *.mkv *.mng *.mod *.moov *.mov *.mp+ *.mp2 " ++ "*.mp3 *.mp4 *.mpc *.mpe *.mpeg *.mpg *.mpga *.mpl *.mpls *.mpp *.mtm *.mts *.nsv " ++ "*.oga *.ogg *.ogm *.ogv *.ogx *.pls *.qt *.qtl *.qtvr *.ra *.ram *.rax *.rm " ++ "*.rmj *.rmm *.rms *.rmvb *.rmx *.rv *.rvx *.s3m *.shn *.snd *.spx *.stm *.ts " ++ "*.tta *.ult *.uni *.vlc *.vob *.voc *.wav *.wax *.wma *.wmv *.wmx *.wv *.wvp " ++ "*.wvx *.xm *.xspf " + // manual entries + "*.kaffeine *.iso|") + i18nc("file filter", "Supported Media Files") + + "\n*|" + i18nc("file filter", "All Files"); diff -Nru kaffeine-1.0/debian/patches/series kaffeine-1.0/debian/patches/series --- kaffeine-1.0/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ kaffeine-1.0/debian/patches/series 2010-10-07 11:54:27.000000000 +0300 @@ -0,0 +1 @@ +kaffeine_r1137341_mime_type.patch
