[shared-mime-info] Make shotwell the default for camera roll handling Make shotwell-viewer the default image viewer (fo
Bastien Nocera
hadess at fedoraproject.org
Thu Oct 13 15:12:50 UTC 2011
commit ea3701cf912fffb5c79dea996cdcabb3e96d4372
Author: Bastien Nocera <hadess at hadess.net>
Date: Thu Oct 13 16:00:35 2011 +0100
Make shotwell the default for camera roll handling
Make shotwell-viewer the default image viewer (for the
image types it handles)
Prefer Rhythmbox to Totem for music files
defaults.list | 9 +-----
shared-mime-info.spec | 14 +++++++++-
shotwell-viewer-defaults.list | 52 +++++++++++++++++++++++++++++++++++++++++
totem-defaults.list | 28 +++++++++++++++-------
4 files changed, 85 insertions(+), 18 deletions(-)
---
diff --git a/defaults.list b/defaults.list
index 56d3fce..e90f4b7 100644
--- a/defaults.list
+++ b/defaults.list
@@ -10,11 +10,6 @@ image/x-psd=gimp.desktop
image/x-fits=gimp.desktop
image/bmp=gnome-eog.desktop;gthumb.desktop;
image/gif=gnome-eog.desktop;gthumb.desktop;
-image/jpeg=gnome-eog.desktop;gthumb.desktop;
-image/jpg=gnome-eog.desktop;gthumb.desktop;
-image/pjpeg=gnome-eog.desktop;gthumb.desktop;
-image/png=gnome-eog.desktop;gthumb.desktop;
-image/tiff=gnome-eog.desktop;gthumb.desktop;
image/x-icb=gnome-eog.desktop;gthumb.desktop;
image/x-ico=gnome-eog.desktop;gthumb.desktop;
image/x-pcx=gnome-eog.desktop;gthumb.desktop;
@@ -91,8 +86,8 @@ x-content/video-svcd=totem.desktop
x-content/audio-cdda=rhythmbox.desktop
x-content/audio-dvd=rhythmbox.desktop
x-content/audio-player=rhythmbox.desktop
-x-content/image-dcf=gthumb-import.desktop
-x-content/image-picturecd=gthumb-import.desktop
+x-content/image-dcf=shotwell.desktop
+x-content/image-picturecd=shotwell.desktop
# URI scheme handlers
x-scheme-handler/mailto=evolution.desktop
x-scheme-handler/http=mozilla-firefox.desktop
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index fa364f0..2bd43eb 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,18 +1,21 @@
Summary: Shared MIME information database
Name: shared-mime-info
Version: 0.91
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://freedesktop.org/Software/shared-mime-info
Source0: http://people.freedesktop.org/~hadess/%{name}-%{version}.tar.xz
Source1: defaults.list
# Generated with:
-# for i in `totem-video-indexer -m | grep -v real` ; do if grep MimeType /home/hadess/Projects/Cvs/rhythmbox/data/rhythmbox.desktop.in.in | grep -q "$i;" ; then echo "$i=totem.desktop;rhythmbox.desktop;" >> totem-defaults.list ; else echo "$i=totem.desktop;" >> totem-defaults.list ; fi ; done ; for i in `cat /home/hadess/Projects/jhbuild/totem/data/uri-schemes-list.txt | grep -v ^#` ; do echo "x-scheme-handler/$i=totem.desktop;" >> totem-defaults.list ; done
+# for i in `cat /home/hadess/Projects/jhbuild/totem/data/mime-type-list.txt | grep -v real | grep -v ^#` ; do if grep MimeType /home/hadess/Projects/jhbuild/rhythmbox/data/rhythmbox.desktop.in.in | grep -q "$i;" ; then echo "$i=rhythmbox.desktop;totem.desktop;" >> totem-defaults.list ; else echo "$i=totem.desktop;" >> totem-defaults.list ; fi ; done ; for i in `cat /home/hadess/Projects/jhbuild/totem/data/uri-schemes-list.txt | grep -v ^#` ; do echo "x-scheme-handler/$i=totem.desktop;" >> totem-defaults.list ; done
Source2: totem-defaults.list
# Generated with:
# for i in `grep MimeType= /usr/share/applications/gnome-file-roller.desktop | sed 's/MimeType=//' | sed 's/;/ /g'` ; do if ! `grep -q $i defaults.list` ; then echo $i=gnome-file-roller.desktop\; >> file-roller-defaults.list ; fi ; done
Source3: file-roller-defaults.list
+# Generated with:
+# for i in `grep MimeType= /usr/share/applications/shotwell-viewer.desktop | sed 's/MimeType=//' | sed 's/;/ /g'` ; do echo $i=shotwell-viewer.desktop\; >> shotwell-viewer-defaults.list ; done
+Source4: shotwell-viewer-defaults.list
# Work-around for https://bugs.freedesktop.org/show_bug.cgi?id=40354
Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch
@@ -53,6 +56,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
install -m 644 %SOURCE1 $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
cat %SOURCE2 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
cat %SOURCE3 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
+cat %SOURCE4 >> $RPM_BUILD_ROOT/%{_datadir}/applications/defaults.list
## remove bogus translation files
## translations are already in the xml file installed
@@ -76,6 +80,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man*/*
%changelog
+* Thu Oct 13 2011 Bastien Nocera <bnocera at redhat.com> 0.91-3
+- Make shotwell the default for camera roll handling
+- Make shotwell-viewer the default image viewer (for the
+ image types it handles)
+- Prefer Rhythmbox to Totem for music files
+
* Sun Sep 18 2011 Bastien Nocera <bnocera at redhat.com> 0.91-2
- Update to 0.91
diff --git a/shotwell-viewer-defaults.list b/shotwell-viewer-defaults.list
new file mode 100644
index 0000000..e354157
--- /dev/null
+++ b/shotwell-viewer-defaults.list
@@ -0,0 +1,52 @@
+image/jpeg=shotwell-viewer.desktop;
+image/png=shotwell-viewer.desktop;
+image/x-canon-cr2=shotwell-viewer.desktop;
+image/x-canon-crw=shotwell-viewer.desktop;
+image/x-fuji-raf=shotwell-viewer.desktop;
+image/x-adobe-dng=shotwell-viewer.desktop;
+image/x-panasonic-raw=shotwell-viewer.desktop;
+image/x-minolta-mrw=shotwell-viewer.desktop;
+image/x-nikon-nef=shotwell-viewer.desktop;
+image/x-olympus-orf=shotwell-viewer.desktop;
+image/x-pentax-pef=shotwell-viewer.desktop;
+image/x-sony-arw=shotwell-viewer.desktop;
+image/x-sony-srf=shotwell-viewer.desktop;
+image/x-sony-sr2=shotwell-viewer.desktop;
+image/x-sigma-x3f=shotwell-viewer.desktop;
+image/x-dcraw=shotwell-viewer.desktop;
+image/x-3fr=shotwell-viewer.desktop;
+image/x-arw=shotwell-viewer.desktop;
+image/x-srf=shotwell-viewer.desktop;
+image/x-sr2=shotwell-viewer.desktop;
+image/x-bay=shotwell-viewer.desktop;
+image/x-crw=shotwell-viewer.desktop;
+image/x-cr2=shotwell-viewer.desktop;
+image/x-cap=shotwell-viewer.desktop;
+image/x-iiq=shotwell-viewer.desktop;
+image/x-eip=shotwell-viewer.desktop;
+image/x-dcs=shotwell-viewer.desktop;
+image/x-dcr=shotwell-viewer.desktop;
+image/x-drf=shotwell-viewer.desktop;
+image/x-k25=shotwell-viewer.desktop;
+image/x-kdc=shotwell-viewer.desktop;
+image/x-dng=shotwell-viewer.desktop;
+image/x-erf=shotwell-viewer.desktop;
+image/x-fff=shotwell-viewer.desktop;
+image/x-mef=shotwell-viewer.desktop;
+image/x-mos=shotwell-viewer.desktop;
+image/x-mrw=shotwell-viewer.desktop;
+image/x-nef=shotwell-viewer.desktop;
+image/x-nrw=shotwell-viewer.desktop;
+image/x-orf=shotwell-viewer.desktop;
+image/x-ptx=shotwell-viewer.desktop;
+image/x-pef=shotwell-viewer.desktop;
+image/x-pxn=shotwell-viewer.desktop;
+image/x-r3d=shotwell-viewer.desktop;
+image/x-raf=shotwell-viewer.desktop;
+image/x-raw=shotwell-viewer.desktop;
+image/x-rw2=shotwell-viewer.desktop;
+image/x-raw=shotwell-viewer.desktop;
+image/x-rwl=shotwell-viewer.desktop;
+image/x-rwz=shotwell-viewer.desktop;
+image/x-x3f=shotwell-viewer.desktop;
+image/tiff=shotwell-viewer.desktop;
diff --git a/totem-defaults.list b/totem-defaults.list
index 6aea48b..cdcf086 100644
--- a/totem-defaults.list
+++ b/totem-defaults.list
@@ -1,9 +1,10 @@
application/mxf=totem.desktop;
-application/ogg=totem.desktop;rhythmbox.desktop;
+application/ogg=rhythmbox.desktop;totem.desktop;
application/ram=totem.desktop;
application/sdp=totem.desktop;
application/smil=totem.desktop;
application/smil+xml=totem.desktop;
+application/vnd.apple.mpegurl=totem.desktop;
application/vnd.ms-wpl=totem.desktop;
application/x-extension-m4a=totem.desktop;
application/x-extension-mp4=totem.desktop;
@@ -11,7 +12,7 @@ application/x-flac=totem.desktop;
application/x-flash-video=totem.desktop;
application/x-matroska=totem.desktop;
application/x-netshow-channel=totem.desktop;
-application/x-ogg=totem.desktop;rhythmbox.desktop;
+application/x-ogg=rhythmbox.desktop;totem.desktop;
application/x-quicktime-media-link=totem.desktop;
application/x-quicktimeplayer=totem.desktop;
application/x-shorten=totem.desktop;
@@ -25,21 +26,21 @@ audio/basic=totem.desktop;
audio/midi=totem.desktop;
audio/mp2=totem.desktop;
audio/mp4=totem.desktop;
-audio/mpeg=totem.desktop;rhythmbox.desktop;
+audio/mpeg=rhythmbox.desktop;totem.desktop;
audio/mpegurl=totem.desktop;
audio/ogg=totem.desktop;
audio/prs.sid=totem.desktop;
audio/x-aiff=totem.desktop;
audio/x-ape=totem.desktop;
-audio/x-flac=totem.desktop;rhythmbox.desktop;
+audio/x-flac=rhythmbox.desktop;totem.desktop;
audio/x-gsm=totem.desktop;
audio/x-it=totem.desktop;
audio/x-m4a=totem.desktop;
audio/x-matroska=totem.desktop;
audio/x-mod=totem.desktop;
-audio/x-mp3=totem.desktop;rhythmbox.desktop;
-audio/x-mpeg=totem.desktop;rhythmbox.desktop;
-audio/x-mpegurl=totem.desktop;rhythmbox.desktop;
+audio/x-mp3=rhythmbox.desktop;totem.desktop;
+audio/x-mpeg=rhythmbox.desktop;totem.desktop;
+audio/x-mpegurl=rhythmbox.desktop;totem.desktop;
audio/x-ms-asf=totem.desktop;
audio/x-ms-asx=totem.desktop;
audio/x-ms-wax=totem.desktop;
@@ -49,21 +50,25 @@ audio/x-pn-aiff=totem.desktop;
audio/x-pn-au=totem.desktop;
audio/x-pn-wav=totem.desktop;
audio/x-pn-windows-acm=totem.desktop;
+audio/x-s3m=totem.desktop;
audio/x-sbc=totem.desktop;
-audio/x-scpls=totem.desktop;rhythmbox.desktop;
+audio/x-scpls=rhythmbox.desktop;totem.desktop;
audio/x-speex=totem.desktop;
+audio/x-stm=totem.desktop;
audio/x-tta=totem.desktop;
audio/x-wav=totem.desktop;
audio/x-wavpack=totem.desktop;
audio/x-vorbis=totem.desktop;
-audio/x-vorbis+ogg=totem.desktop;rhythmbox.desktop;
+audio/x-vorbis+ogg=rhythmbox.desktop;totem.desktop;
audio/x-xm=totem.desktop;
image/x-pict=totem.desktop;
misc/ultravox=totem.desktop;
text/google-video-pointer=totem.desktop;
text/x-google-video-pointer=totem.desktop;
+video/3gp=totem.desktop;
video/3gpp=totem.desktop;
video/dv=totem.desktop;
+video/divx=totem.desktop;
video/fli=totem.desktop;
video/flv=totem.desktop;
video/mp2t=totem.desktop;
@@ -75,6 +80,7 @@ video/ogg=totem.desktop;
video/quicktime=totem.desktop;
video/vivo=totem.desktop;
video/vnd.divx=totem.desktop;
+video/vnd.mpegurl=totem.desktop;
video/vnd.vivo=totem.desktop;
video/webm=totem.desktop;
video/x-anim=totem.desktop;
@@ -86,6 +92,7 @@ video/x-flv=totem.desktop;
video/x-m4v=totem.desktop;
video/x-matroska=totem.desktop;
video/x-mpeg=totem.desktop;
+video/x-mpeg2=totem.desktop;
video/x-ms-asf=totem.desktop;
video/x-ms-asx=totem.desktop;
video/x-msvideo=totem.desktop;
@@ -97,6 +104,9 @@ video/x-nsv=totem.desktop;
video/x-ogm+ogg=totem.desktop;
video/x-theora+ogg=totem.desktop;
video/x-totem-stream=totem.desktop;
+x-content/video-dvd=totem.desktop;
+x-content/video-vcd=totem.desktop;
+x-content/video-svcd=totem.desktop;
x-scheme-handler/pnm=totem.desktop;
x-scheme-handler/mms=totem.desktop;
x-scheme-handler/net=totem.desktop;
More information about the scm-commits
mailing list