Mercurial Mercurial > sustaining > oi_151a > spec-files / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2003-08-20 Ghee Teo <[email protected]>
authorgheet
Wed, 20 Aug 2003 11:43:36 +0000
changeset 1097 1daf3a1d13f3
parent 1096 ad744cddf97e
child 1098 5ac454c03cd3
2003-08-20 Ghee Teo <[email protected]> * Corrected a bug that Brian Nitz did, should use jmplay for ogg and also completed th erest of mime types that jmplay can handle including x-gsm, rmf, mvr, x-jmx.
ChangeLog file | annotate | diff | comparison | revisions
gnome-mime-data.spec file | annotate | diff | comparison | revisions
patches/gnome-mime-data-03-make-jmplay-default-player.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Wed Aug 20 11:04:25 2003 +0000
+++ b/ChangeLog	Wed Aug 20 11:43:36 2003 +0000
@@ -1,3 +1,9 @@
+2003-08-20  Ghee Teo <[email protected]>
+
+	* Corrected a bug that Brian Nitz did, should use jmplay for ogg
+	  and also completed th erest of mime types that jmplay can handle
+ 	  including x-gsm, rmf, mvr, x-jmx.
+
 2003-08-20  Glynn Foster  <[email protected]>
 
 	* patches/xscreensaver-02-customise-hacks.diff: Edit to 
--- a/gnome-mime-data.spec	Wed Aug 20 11:04:25 2003 +0000
+++ b/gnome-mime-data.spec	Wed Aug 20 11:43:36 2003 +0000
@@ -3,7 +3,7 @@
 Group:			System/GUI/GNOME
 BuildArchitectures:	noarch
 Version:		2.2.1
-Release:		2
+Release:		3
 Distribution:		Mercury
 Vendor:			Sun Microsystems, Inc.
 Summary:		MIME Type and Application Database for the GNOME Desktop
@@ -57,6 +57,11 @@
 %{_libdir}/pkgconfig/gnome-mime-data-2.0.pc
 
 %changelog
+* Wed Aug 20 2003 - [email protected]
+- updated gnome-vfs.applications, gnome-vfs.keys.in and gnome-vfs.mime
+  to include some of the more obscure mime types that jmplay can 
+  handle including x-gsm, rmf, ogg, mvr, x-jmx.
+
 * Mon Aug 18 2003 - [email protected]
 - created a patch to add jmplay as default media player.
 
--- a/patches/gnome-mime-data-03-make-jmplay-default-player.diff	Wed Aug 20 11:04:25 2003 +0000
+++ b/patches/gnome-mime-data-03-make-jmplay-default-player.diff	Wed Aug 20 11:43:36 2003 +0000
@@ -1,6 +1,6 @@
 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 12:14:35.000000000 -0700
-+++ gnome-mime-data-2.2.1/gnome-vfs.applications	2003-08-15 13:03:00.000000000 -0700
+--- 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-20 12:30:36.000000000 +0100
 @@ -187,7 +187,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
  
@@ -20,16 +20,77 @@
 +        can_open_multiple_files=false
 +        expects_uris=false
 +        requires_terminal=false
-+        mime_types=video/quicktime,video/x-avi,video/msvideo,video/x-msvideo,video/mpeg
++        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
 diff -urN gnome-mime-data-2.2.1.orig/gnome-vfs.keys.in gnome-mime-data-2.2.1/gnome-vfs.keys.in
---- gnome-mime-data-2.2.1.orig/gnome-vfs.keys.in	2003-08-15 10:30:09.000000000 -0700
-+++ gnome-mime-data-2.2.1/gnome-vfs.keys.in	2003-08-15 13:02:47.000000000 -0700
-@@ -958,6 +958,10 @@
+--- gnome-mime-data-2.2.1.orig/gnome-vfs.keys.in	2003-08-20 12:03:28.000000000 +0100
++++ gnome-mime-data-2.2.1/gnome-vfs.keys.in	2003-08-20 12:31:25.000000000 +0100
+@@ -13,6 +13,15 @@
+ 	_category=Documents
+ 	_description=Andrew Toolkit inset
+ 
++application/x-jmx
++	_description=JMF specific multi-file format
++	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
++	use_category_default=no
++
+ application/mac-binhex40
+ 	_category=Packages
+ 	_description=Macintosh BinHex-encoded file
+@@ -35,6 +44,15 @@
+ 	_category=Documents/Word Processor
+ 	use_category_default=yes
+ 
++application/mvr
++	_description=IBM's HotMedia Animation format
++	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=Video
++	use_category_default=no
++
+ application/octet-stream
+ 	can_be_executable=TRUE
+ 	_description=unknown type
+@@ -43,6 +61,15 @@
+ 	_description=ODA document
+ 	_category=Documents
+ 
++application/ogg
++	_description=ogg audio
++	default_action_type=application
++	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
++	_category=Audio
++	use_category_default=no
++
+ application/pdf
+ 	_description=PDF document
+ 	default_action_type=component
+@@ -746,9 +773,9 @@
+ application/x-ogg
+ 	_description=ogg audio
+ 	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
+ 	_category=Audio
+ 	use_category_default=no
+ 
+@@ -958,6 +985,19 @@
  audio/basic
  	_description=basic audio
  	icon_filename=gnome-audio
@@ -37,10 +98,19 @@
 +        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
++
++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
  
  # also audio/x-mpeg
-@@ -965,9 +969,9 @@
+@@ -965,9 +1005,9 @@
  	_description=MPEG audio
  	icon_filename=i-music
  	default_action_type=application
@@ -53,7 +123,23 @@
  	_category=Audio
  
  audio/prs.sid
-@@ -982,9 +986,9 @@
+@@ -975,6 +1015,15 @@
+ 	icon_filename=i-music
+ 	_category=Audio
+ 
++audio/rmf
++	_description=rmf 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
++	use_category_default=no
++
+ audio/x-aifc
+ 	_description=AIFC audio
+ 	_category=Audio
+@@ -982,9 +1031,9 @@
  audio/x-aiff
  	_description=AIFF audio
  	default_action_type=application
@@ -66,7 +152,7 @@
  	_category=Audio
  
  audio/x-aiffc
-@@ -1004,6 +1008,10 @@
+@@ -1004,6 +1053,10 @@
  audio/x-midi
  	_description=MIDI audio
  	icon_filename=gnome-audio-midi
@@ -77,7 +163,7 @@
  	_category=Audio
  
  audio/x-mod
-@@ -1019,9 +1027,9 @@
+@@ -1019,9 +1072,9 @@
  	_description=MP3 audio
  	icon_filename=i-music
  	default_action_type=application
@@ -90,7 +176,7 @@
  	_category=Audio
  
  audio/x-mp3-playlist
-@@ -1119,9 +1127,9 @@
+@@ -1119,9 +1172,9 @@
  audio/x-wav
  	_description=wave audio
  	default_action_type=application
@@ -103,7 +189,7 @@
  	_category=Audio
  
  audio/x-xi
-@@ -1928,25 +1936,26 @@
+@@ -1928,25 +1981,26 @@
  video/mpeg
  	_description=MPEG video
  	default_action_type=application
@@ -139,7 +225,7 @@
  	_category=Video
  
  video/vivo
-@@ -1968,9 +1977,9 @@
+@@ -1968,9 +2022,9 @@
  video/x-avi
  	_description=AVI video
  	default_action_type=application
@@ -152,7 +238,7 @@
  	_category=Video
  
  video/x-flc
-@@ -2002,9 +2011,10 @@
+@@ -2002,9 +2056,10 @@
  
  video/x-msvideo
  	_description=Microsoft video
@@ -166,3 +252,60 @@
  	_category=Video
  
  video/x-real-video
+diff -urN gnome-mime-data-2.2.1.orig/gnome-vfs.mime gnome-mime-data-2.2.1/gnome-vfs.mime
+--- gnome-mime-data-2.2.1.orig/gnome-vfs.mime	2003-03-29 10:21:45.000000000 +0000
++++ gnome-mime-data-2.2.1/gnome-vfs.mime	2003-08-20 12:30:36.000000000 +0100
+@@ -32,15 +32,24 @@
+ application/andrew-inset
+ 	ext: ez
+ 
++application/x-jmx
++	ext: jmx
++
+ application/msword
+ 	ext: doc
+ 
++application/mvr
++	ext: mvr
++
+ application/octet-stream
+ 	ext: bin
+ 
+ application/oda
+ 	ext: oda
+ 
++application/ogg
++	ext: ogg
++
+ application/pdf
+ 	ext: pdf
+ 
+@@ -372,7 +381,7 @@
+ 	ext: snd
+ 
+ audio/mpeg
+-	ext: mp1
++	ext: mp1 mp3
+ 
+ audio/prs.sid
+ 	ext: sid psid
+@@ -380,6 +389,9 @@
+ audio/x-aiff
+ 	ext: aif aifc aiff
+ 
++audio/x-gsm
++	ext: gsm
++
+ audio/x-it
+ 	ext: it IT
+ 
+@@ -401,6 +413,9 @@
+ audio/x-real-audio
+ 	ext: rm ra ram
+ 
++audio/rmf
++	ext: rmf
++
+ audio/x-s3m
+ 	ext: S3M s3m
+
sustaining/oi_151a/spec-files