--- Begin Message ---
Package: kaffeine-mozilla
Version: 0.4.3.1.dfsg-0.2
Tags: patch
This is the patch I used in my NMU.
diff -u kaffeine-mozilla-0.4.3.1.dfsg/debian/copyright
kaffeine-mozilla-0.4.3.1.dfsg/debian/copyright
--- kaffeine-mozilla-0.4.3.1.dfsg/debian/copyright
+++ kaffeine-mozilla-0.4.3.1.dfsg/debian/copyright
@@ -6,5 +6,8 @@
-Upstream Author: Jürgen Kofler
+Upstream Author: Jürgen Kofler <[email protected]>
-This software is copyright (c) Jürgen Kofler
+This software is copyright (c) 2004 Jürgen Kofler
-You are free to distribute this software under the terms of the GNU General
Public License. On Debian systems, the complete text of the GNU General Public
License can be found in the file `/usr/share/common-licenses/GPL'.
+You are free to distribute this software under the terms of the
+GNU General Public License. On Debian systems, the complete text
+of the GNU General Public License can be found in the file
+`/usr/share/common-licenses/GPL'.
diff -u kaffeine-mozilla-0.4.3.1.dfsg/debian/control
kaffeine-mozilla-0.4.3.1.dfsg/debian/control
--- kaffeine-mozilla-0.4.3.1.dfsg/debian/control
+++ kaffeine-mozilla-0.4.3.1.dfsg/debian/control
@@ -5,10 +5,10 @@
Uploaders: Riku Voipio <[email protected]>
Build-Depends: debhelper (>= 4.0.0), libxaw7-dev, libnspr4-dev
-Standards-Version: 3.6.1
+Standards-Version: 3.8.0
Package: kaffeine-mozilla
Architecture: any
Depends: kaffeine, ${shlibs:Depends}, ${misc:Depends}
-Description: mozilla plugin that lanches kaffeine for supported media types
+Description: mozilla plugin that launches kaffeine for supported media types
This mozilla plugin launches kaffeine, the xine-based media player for KDE,
when a page containing a supported media format is loaded.
diff -u kaffeine-mozilla-0.4.3.1.dfsg/debian/changelog
kaffeine-mozilla-0.4.3.1.dfsg/debian/changelog
--- kaffeine-mozilla-0.4.3.1.dfsg/debian/changelog
+++ kaffeine-mozilla-0.4.3.1.dfsg/debian/changelog
@@ -1,3 +1,36 @@
+kaffeine-mozilla (0.4.3.1.dfsg-0.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix typo in package description (Closes: #363989)
+ * Make sure to provide process name as argument 0 (Closes: #490711).
+ * List more mime types as handled by this plugin, based on the set
+ of mime types handled by mozilla-mplayer and mozilla-plugin-vlc,
+ because I believe kaffeine can handle the same formats as mplayer
+ and vlc. Added mime types application/asx, application/mpeg4-iod,
+ application/mpeg4-muxcodetable, application/ogg, application/smil,
+ application/vnd.rn-realaudio, application/vnd.rn-realmedia,
+ application/x-drm-v2, application/x-google-vlc-plugin,
+ application/x-ms-wmp, application/x-ms-wmv,
+ application/x-nsv-vp3-mp3, application/x-ogg,
+ application/x-quicktimeplayer, application/xspf+xml, audio/3gpp2,
+ audio/3gpp, audio/basic, audio/flac, audio/mp3, audio/mp4,
+ audio/mpeg4, audio/ogg, audio/wav, audio/x-basic, audio/x-flac,
+ audio/x-m4a, audio/x-mod, audio/x-ms-wax, audio/x-ms-wmv,
+ audio/x-pn-realaudio-plugin, audio/x-pn-realaudio,
+ audio/x-realaudio, audio/x-wav, image/x-quicktime, video/3gpp2,
+ video/3gpp, video/divx, video/fli, video/mp4, video/mpeg-system,
+ video/mpeg4, video/vnd.divx, video/vnd.rn-realvideo,
+ video/vnd.vivo, video/x-fli, video/x-flv, video/x-mpeg-system,
+ video/x-mpeg2, video/x-ms-asf, video/x-ms-wm, video/x-ms-wma,
+ video/x-ms-wmp, video/x-ms-wmp, video/x-ms-wmv and video/x-ms-wvx
+ (Closes: #490557).
+ * Implement support for url= and autostart=1 style arguments from
+ the browser (Closes: #490723).
+ * Improve debian/copyright to get rid of lintian warning.
+ * Change Standards-Version from 3.6.1 to 3.8.0. No change needed.
+
+ -- Petter Reinholdtsen <[email protected]> Sun, 13 Jul 2008 23:32:01 +0200
+
kaffeine-mozilla (0.4.3.1.dfsg-0.1) unstable; urgency=low
* Non-maintainer upload
@@ -21 +53,0 @@
-
only in patch2:
unchanged:
--- kaffeine-mozilla-0.4.3.1.dfsg.orig/src/plugin.c
+++ kaffeine-mozilla-0.4.3.1.dfsg/src/plugin.c
@@ -165,6 +165,63 @@
"audio/x-ms-wma: wma: Microsoft Media Audio;"
"video/x-ms-wmv: wmv: Microsoft Media Video;"
"audio/x-mpegurl: m3u: Streaming-MPEG-Audio;"
+
+ "application/asx:*:Media Files;"
+ "application/mpeg4-iod:mp4,mpg4:MPEG-4 video;"
+ "application/mpeg4-muxcodetable:mp4,mpg4:MPEG-4 video;"
+ "application/ogg:ogg:Ogg stream;"
+ "application/smil:smil:SMIL;"
+ "application/vnd.rn-realaudio:ra,ram:RealAudio;"
+ "application/vnd.rn-realmedia:rm:RealMedia;"
+ "application/x-drm-v2:asx,*:Windows Media;"
+ "application/x-google-vlc-plugin::Google Video;"
+ "application/x-ms-wmp:wmp,*:Windows Media;"
+ "application/x-ms-wmv:wmv,*:Microsoft WMV video;"
+ "application/x-nsv-vp3-mp3:nsv:Nullsoft Streaming Video;"
+ "application/x-ogg:ogg:Ogg stream;"
+ "application/x-quicktimeplayer:mov:Quicktime;"
+ "application/xspf+xml:xspf:XSPF playlist;"
+ "audio/3gpp2:3g2,3gpp2:3GPP2 audio;"
+ "audio/3gpp:3gp,3gpp:3GPP audio;"
+ "audio/basic:au,snd:Basic Audio File;"
+ "audio/flac:flac:FLAC Audio;"
+ "audio/mp3:mp3:MPEG audio;"
+ "audio/mp4:mp4,mpg4:MPEG-4 audio;"
+ "audio/mpeg4:mp4,mpg4:MPEG-4 audio;"
+ "audio/ogg:ogg:Ogg Vorbis Audio;"
+ "audio/wav:wav:WAV audio;"
+ "audio/x-basic:au,snd:Basic Audio File;"
+ "audio/x-flac:flac:FLAC Audio;"
+ "audio/x-m4a:m4a:MPEG audio;"
+ "audio/x-mod:mod:Soundtracker;"
+ "audio/x-ms-wax:wax,*:Windows Media;"
+ "audio/x-ms-wmv:wmv,*:Windows Media;"
+ "audio/x-pn-realaudio-plugin:rpm:RealAudio;"
+ "audio/x-pn-realaudio:ram,rm:RealAudio;"
+ "audio/x-realaudio:ra:RealAudio;"
+ "audio/x-wav:wav:WAV audio;"
+ "image/x-quicktime:mov:Quicktime;"
+ "video/3gpp2:3g2,3gpp2:3GPP2 video;"
+ "video/3gpp:3gp,3gpp:3GPP video;"
+ "video/divx:divx:DivX Media Format;"
+ "video/fli:fli,flc:FLI animation;"
+ "video/mp4:mp4:MPEG 4 Video;"
+ "video/mpeg-system:mpg,mpeg,mpe,vob:MPEG video;"
+ "video/mpeg4:mp4,mpg4:MPEG-4 video;"
+ "video/vnd.divx:divx:DivX Media Format;"
+ "video/vnd.rn-realvideo:rv:RealVideo;"
+ "video/vnd.vivo:viv,vivo:VivoActive;"
+ "video/x-fli:fli,flc:FLI animation;"
+ "video/x-flv:flv:Flash Video;"
+ "video/x-mpeg-system:mpg,mpeg,mpe,vob:MPEG video;"
+ "video/x-mpeg2:mpv2,mp2ve:MPEG2;"
+ "video/x-ms-asf:asf,asx:Windows Media Video;"
+ "video/x-ms-wm:wm,*:Media Files;"
+ "video/x-ms-wma:wma:Windows Media;"
+ "video/x-ms-wmp:wmp,*:Windows Media;"
+ "video/x-ms-wmp:wmp,*:Windows Media;"
+ "video/x-ms-wmv:wmv,*:Microsoft WMV video;"
+ "video/x-ms-wvx:wvx,*:Windows Media;"
;
}
@@ -296,9 +353,9 @@
xprintf ("launch_kaffeine: url = %s\n", globals.url);
- execlp("kaffeine","" , globals.url, NULL);
+ execlp("kaffeine", "kaffeine", globals.url, NULL);
- if (execlp("kaffeine", NULL) == -1) {
+ if (execlp("kaffeine", "kaffeine", NULL) == -1) {
perror("Error while launching Kaffeine");
_exit(0);
}
@@ -355,8 +412,12 @@
} else if (!strcasecmp (argn[i], "src") && !globals.url) {
got_url (argv[i]);
xprintf ("got src url %s\n", globals.url);
+ } else if (!strcasecmp (argn[i], "url") && !globals.url) {
+ got_url (argv[i]);
+ xprintf ("got url %s\n", globals.url);
} else if (!strcasecmp (argn[i], "autostart")) {
- this->autostart = !strcasecmp (argv[i], "true");
+ this->autostart = !strcasecmp (argv[i], "true")
+ || !strcasecmp (argv[i], "1") ;
xprintf ("got autostart %d\n", this->autostart);
} else if (!strcasecmp (argn[i], "controls")) {
this->imageWindow = !strcasecmp (argv[i], "imagewindow");
Happy hacking,
--
Petter Reinholdtsen
--- End Message ---
