2004-02-23 Ghee Teo <[email protected]>
authorgheet
Mon, 23 Feb 2004 14:07:06 +0000
changeset 1882 913a64e538a5
parent 1881 4474f1e2d533
child 1883 70feca65a32e
2004-02-23 Ghee Teo <[email protected]> * Repatched gnome-mime-data-02-make-jmplay-default-player.diff for cinnabar.
ChangeLog
gnome-mime-data.spec
patches/gnome-mime-data-02-make-jmplay-default-player.diff
--- a/ChangeLog	Mon Feb 23 14:02:31 2004 +0000
+++ b/ChangeLog	Mon Feb 23 14:07:06 2004 +0000
@@ -1,3 +1,8 @@
+2004-02-23  Ghee Teo <[email protected]>
+	
+	* Repatched gnome-mime-data-02-make-jmplay-default-player.diff for
+	  cinnabar.
+
 2004-02-23  Matt Keenan <[email protected]>
 
 	* gcalctool.spec : Bump to 4.3.46
--- a/gnome-mime-data.spec	Mon Feb 23 14:02:31 2004 +0000
+++ b/gnome-mime-data.spec	Mon Feb 23 14:07:06 2004 +0000
@@ -39,7 +39,7 @@
 %prep
 %setup -q
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
@@ -86,6 +86,10 @@
 %{_libdir}/pkgconfig/gnome-mime-data-2.0.pc
 
 %changelog
+* Mon Feb 23 2004  <[email protected]>
+- Repatched gnome-mime-data-02-make-jmplay-default-player.diff for
+  cinnabar.
+
 * Mon Feb 23 2004 - <[email protected]>
 - New tarball 2.4.1, ported patches, still two patches to do
 
--- a/patches/gnome-mime-data-02-make-jmplay-default-player.diff	Mon Feb 23 14:02:31 2004 +0000
+++ b/patches/gnome-mime-data-02-make-jmplay-default-player.diff	Mon Feb 23 14:07:06 2004 +0000
@@ -1,7 +1,7 @@
-diff -urN gnome-mime-data-2.2.1.orig/gnome-vfs.applications gnome-mime-data-2.2.1/gnome-vfs.applications
---- gnome-mime-data-2.2.1.orig/gnome-vfs.applications	2002-10-06 20:14:35.000000000 +0100
-+++ gnome-mime-data-2.2.1/gnome-vfs.applications	2003-08-21 14:01:10.000000000 +0100
-@@ -187,7 +187,7 @@
+diff -urN gnome-mime-data-2.4.1.orig/gnome-vfs.applications gnome-mime-data-2.4.1/gnome-vfs.applications
+--- gnome-mime-data-2.4.1.orig/gnome-vfs.applications	2004-02-23 12:28:34.000000000 +0000
++++ gnome-mime-data-2.4.1/gnome-vfs.applications	2004-02-23 12:49:24.000000000 +0000
+@@ -203,7 +203,7 @@
  	mime_types=application/x-gnumeric,application/x-applix-spreadsheet,application/vnd.ms-excel,application/vnd.lotus-1-2-3,application/x-oleo,application/x-xbase,text/spreadsheet,text/x-comma-separated-values,text/tab-separated-values
  
  grecord
@@ -10,9 +10,9 @@
  	name=Sound Recorder
  	can_open_multiple_files=false
  	expects_uris=false
-@@ -258,6 +258,15 @@
+@@ -282,6 +282,14 @@
  	requires_terminal=false
- 	mime_types=text/*,text/html,text/plain,text/x-c,text/x-c++,text/x-c-header
+ 	mime_types=text/*,text/html,text/plain,text/x-c,text/x-objc,text/x-c++,text/x-c-header
  
 +jmplay
 +        command=jmplay
@@ -22,11 +22,10 @@
 +        requires_terminal=false
 +        mime_types=video/quicktime,video/x-avi,video/msvideo,video/x-msvideo,video/mpeg,audio/x-gsm,audio/midi,audio/rmf,audio/mpeg,application/ogg,application/mvr,application/x-jmx
 +
-+
  killustrator
  	command=killustrator
  	name=KIllustrator
-@@ -426,7 +435,7 @@
+@@ -450,7 +458,7 @@
  	expects_uris=true
  	requires_terminal=false
  	supported_uri_schemes=http,ftp,file
@@ -35,38 +34,9 @@
  
  sodipodi
  	command=sodipodi
-diff -urN gnome-mime-data-2.4.0/gnome-vfs.mime gnome-mime-data-2.4.0-hacked/gnome-vfs.mime
---- gnome-mime-data-2.4.0/gnome-vfs.mime	2003-08-21 12:49:11.000000000 +1200
-+++ gnome-mime-data-2.4.0-hacked/gnome-vfs.mime	2003-12-15 12:15:20.000000000 +1300
-@@ -246,6 +246,10 @@
- application/x-jbuilder-project
- 	ext: jpr jpx
- 
-+application/x-jmx
-+	ext: jmx
-+
-+
- application/x-kde-app-info
- 	ext: kdelnk
- 
-@@ -392,9 +396,15 @@
- audio/prs.sid
- 	ext: sid psid
- 
-+audio/rmf
-+	ext: rmf
-+
- audio/x-aiff
- 	ext: aif aifc aiff
- 
-+audio/x-gsm
-+	ext: gsm
-+
- audio/x-it
- 	ext: it IT
- 
---- gnome-mime-data-2.4.0/gnome-vfs.keys.in	2003-12-15 12:29:09.000000000 +1300
-+++ gnome-mime-data-2.4.0-hacked/gnome-vfs.keys.in	2003-12-15 12:28:06.000000000 +1300
+diff -urN gnome-mime-data-2.4.1.orig/gnome-vfs.keys.in gnome-mime-data-2.4.1/gnome-vfs.keys.in
+--- gnome-mime-data-2.4.1.orig/gnome-vfs.keys.in	2004-02-23 12:28:34.000000000 +0000
++++ gnome-mime-data-2.4.1/gnome-vfs.keys.in	2004-02-23 13:01:41.000000000 +0000
 @@ -35,6 +35,15 @@
  	_category=Documents/Word Processor
  	use_category_default=yes
@@ -96,7 +66,7 @@
  	_category=Audio
  	use_category_default=no
  
-@@ -700,6 +709,15 @@
+@@ -723,6 +732,15 @@
  	_category=Software Development
  	use_category_default=no
  
@@ -112,7 +82,7 @@
  application/x-kde-app-info
  	_description=KDE application details
  	_category=User Interface
-@@ -826,9 +844,9 @@
+@@ -849,9 +867,9 @@
  application/x-ogg
  	_description=Ogg audio
  	default_action_type=application
@@ -125,19 +95,18 @@
  	_category=Audio
  	use_category_default=no
  
-@@ -1047,6 +1065,11 @@
+@@ -1096,6 +1114,10 @@
+ audio/basic
  	_description=Basic audio
  	icon_filename=gnome-audio
- 	_category=Audio
 +	default_action_type=application
 +	short_list_application_ids_for_novice_user_level=jmplay,grecord
 +	short_list_application_ids_for_intermediate_user_level=jmplay,grecord
 +	short_list_application_ids_for_advanced_user_level=jmplay,grecord
-+	_category=Audio
+ 	_category=Audio
  
  # also audio/x-mpeg
- audio/mpeg
-@@ -1063,6 +1086,15 @@
+@@ -1113,6 +1135,15 @@
  	icon_filename=i-music
  	_category=Audio
  
@@ -153,7 +122,7 @@
  audio/x-aifc
  	_description=AIFC audio
  	_category=Audio
-@@ -1070,9 +1102,9 @@
+@@ -1120,9 +1151,9 @@
  audio/x-aiff
  	_description=AIFF audio
  	default_action_type=application
@@ -166,45 +135,7 @@
  	_category=Audio
  
  audio/x-aiffc
-@@ -1084,6 +1116,15 @@
- 	short_list_application_ids_for_advanced_user_level=grecord
- 	_category=Audio
- 
-+audio/x-gsm
-+	_description=GSM audio
-+	icon_filename=gnome-audio
-+	default_action_type=application
-+	short_list_application_ids_for_novice_user_level=jmplay
-+	short_list_application_ids_for_intermediate_user_level=jmplay
-+	short_list_application_ids_for_advanced_user_level=jmplay
-+	_category=Audio
-+
- audio/x-it
- 	_description=Impulse Tracker audio
- 	icon_filename=gnome-audio-x-it
-@@ -1092,24 +1133,28 @@
- audio/x-midi
- 	_description=MIDI audio
- 	icon_filename=gnome-audio-midi
-+	default_action_type=application
-+	short_list_application_ids_for_novice_user_level=jmplay
-+	short_list_application_ids_for_intermediate_user_level=jmplay
-+	short_list_application_ids_for_advanced_user_level=jmplay
- 	_category=Audio
- 
- audio/x-mod
- 	_description=MOD audio
- 	icon_filename=gnome-audio-x-mod
- 	default_action_type=application
--	short_list_application_ids_for_novice_user_level=soundtracker
--	short_list_application_ids_for_intermediate_user_level=soundtracker
--	short_list_application_ids_for_advanced_user_level=soundtracker
-+	short_list_application_ids_for_novice_user_level=jmplay,soundtracker
-+	short_list_application_ids_for_intermediate_user_level=jmplay,soundtracker
-+	short_list_application_ids_for_advanced_user_level=jmplay,soundtracker
- 	_category=Audio
- 
- audio/x-mp3
+@@ -1171,9 +1202,9 @@
  	_description=MP3 audio
  	icon_filename=i-music
  	default_action_type=application
@@ -217,20 +148,18 @@
  	_category=Audio
  
  audio/x-mp3-playlist
-@@ -1126,9 +1171,9 @@
+@@ -1190,8 +1221,8 @@
  	_description=MP3 audio
  	icon_filename=i-music
  	default_action_type=application
 -	short_list_application_ids_for_novice_user_level=xmms,freeamp
 -	short_list_application_ids_for_intermediate_user_level=xmms,freeamp
--	short_list_application_ids_for_advanced_user_level=xmms,freeamp
 +	short_list_application_ids_for_novice_user_level=jmplay,xmms,freeamp
 +	short_list_application_ids_for_intermediate_user_level=jmplay,xmms,freeamp
-+	short_list_application_ids_for_advanced_user_level=jmplay,xmms,freeamp
+ 	short_list_application_ids_for_advanced_user_level=xmms,freeamp
  	_category=Audio
  
- audio/x-mpegurl
-@@ -1208,9 +1253,9 @@
+@@ -1280,9 +1311,9 @@
  audio/x-wav
  	_description=Wave audio
  	default_action_type=application
@@ -243,7 +172,7 @@
  	_category=Audio
  
  audio/x-xi
-@@ -2055,25 +2100,25 @@
+@@ -2176,19 +2207,25 @@
  video/mpeg
  	_description=MPEG video
  	default_action_type=application
@@ -258,49 +187,69 @@
  video/msvideo
  	_description=MS video
  	icon_filename=gnome-video-x-msvideo
--	short_list_application_ids_for_novice_user_level=xmps,omsomi,gtv,xanim
--	short_list_application_ids_for_intermediate_user_level=xmps,omsomi,gtv,xanim
--	short_list_application_ids_for_advanced_user_level=xmps,omsomi,gtv,xanim
-+	short_list_application_ids_for_novice_user_level=jmplay,xmps,omsomi,gtv,xanim
-+	short_list_application_ids_for_intermediate_user_level=jmplay,xmps,omsomi,gtv,xanim
-+	short_list_application_ids_for_advanced_user_level=jmplay,xmps,omsomi,gtv,xanim
++	short_list_application_ids_for_novice_user_level=jmplay
++	short_list_application_ids_for_intermediate_user_level=jmplay
++	short_list_application_ids_for_advanced_user_level=jmplay
  	_category=Video
  
  video/quicktime
  	_description=QuickTime movie
  	default_action_type=application
--	short_list_application_ids_for_novice_user_level=xanim
--	short_list_application_ids_for_intermediate_user_level=xanim
--	short_list_application_ids_for_advanced_user_level=xanim
-+	short_list_application_ids_for_novice_user_level=jmplay,xanim
-+	short_list_application_ids_for_intermediate_user_level=jmplay,xanim
-+	short_list_application_ids_for_advanced_user_level=jmplay,xanim
++	short_list_application_ids_for_novice_user_level=jmplay
++	short_list_application_ids_for_intermediate_user_level=jmplay
++	short_list_application_ids_for_advanced_user_level=jmplay
  	_category=Video
  
- video/vivo
-@@ -2095,9 +2140,9 @@
+ video/vnd.vivo
+@@ -2207,6 +2244,9 @@
  video/x-avi
  	_description=AVI video
  	default_action_type=application
--	short_list_application_ids_for_novice_user_level=xanim
--	short_list_application_ids_for_intermediate_user_level=xanim
--	short_list_application_ids_for_advanced_user_level=xanim
-+	short_list_application_ids_for_novice_user_level=jmplay,xanim
-+	short_list_application_ids_for_intermediate_user_level=jmplay,xanim
-+	short_list_application_ids_for_advanced_user_level=jmplay,xanim
++	short_list_application_ids_for_novice_user_level=jmplay
++	short_list_application_ids_for_intermediate_user_level=jmplay
++	short_list_application_ids_for_advanced_user_level=jmplay
  	_category=Video
  
  video/x-flc
-@@ -2133,9 +2178,9 @@
+@@ -2236,6 +2276,9 @@
  
  video/x-msvideo
  	_description=Microsoft video
--	short_list_application_ids_for_novice_user_level=xmps,omsomi,xanim
--	short_list_application_ids_for_intermediate_user_level=xmps,omsomi,xanim
--	short_list_application_ids_for_advanced_user_level=xmps,omsomi,xanim
-+	short_list_application_ids_for_novice_user_level=jmplay,xmps,omsomi,xanim
-+	short_list_application_ids_for_intermediate_user_level=jmplay,xmps,omsomi,xanim
-+	short_list_application_ids_for_advanced_user_level=jmplay,xmps,omsomi,xanim
++	short_list_application_ids_for_novice_user_level=jmplay
++	short_list_application_ids_for_intermediate_user_level=jmplay
++	short_list_application_ids_for_advanced_user_level=jmplay
  	_category=Video
  
  video/x-nsv
+diff -urN gnome-mime-data-2.4.1.orig/gnome-vfs.mime gnome-mime-data-2.4.1/gnome-vfs.mime
+--- gnome-mime-data-2.4.1.orig/gnome-vfs.mime	2003-12-22 19:00:11.000000000 +0000
++++ gnome-mime-data-2.4.1/gnome-vfs.mime	2004-02-23 12:51:29.000000000 +0000
+@@ -255,6 +255,9 @@
+ application/x-jbuilder-project
+ 	ext: jpr jpx
+ 
++application/x-jmx
++	ext: jmx
++
+ application/x-kde-app-info
+ 	ext: kdelnk
+ 
+@@ -401,12 +404,18 @@
+ audio/prs.sid
+ 	ext: sid psid
+ 
++audio/rmf
++	ext: rmf
++
+ audio/x-aiff
+ 	ext: aif aifc aiff
+ 
+ audio/x-flac
+ 	ext: flac
+ 
++audio/x-gsm
++	ext: gsm
++
+ audio/x-it
+ 	ext: it IT
+