Hello community, here is the log from the commit of package gnome-mime-data for openSUSE:Factory checked in at Tue Dec 8 10:36:50 CET 2009. -------- --- GNOME/gnome-mime-data/gnome-mime-data.changes 2009-04-06 11:39:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-mime-data/gnome-mime-data.changes 2009-12-03 11:07:04.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 3 11:06:12 CET 2009 - vuntz@opensuse.org + +- Rebase gnome-mime-data-more-apps.patch to apply without fuzz. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-mime-data.spec ++++++ --- /var/tmp/diff_new_pack.MVatpy/_old 2009-12-08 10:36:41.000000000 +0100 +++ /var/tmp/diff_new_pack.MVatpy/_new 2009-12-08 10:36:41.000000000 +0100 @@ -20,12 +20,12 @@ Name: gnome-mime-data BuildRequires: db-devel gcc-c++ gnome-common gtk2-devel indent intltool libidl-devel libxml2-devel orbit2-devel perl-XML-Parser translation-update-upstream update-desktop-files -License: GPL v2 or later +License: GPLv2+ Group: System/GUI/GNOME AutoReqProv: on Provides: %{name}-devel = %{version}-%{release} Version: 2.18.0 -Release: 139 +Release: 140 Summary: MIME Type and Application Database for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Patch: mozilla-call.dif ++++++ gnome-mime-data-more-apps.patch ++++++ --- /var/tmp/diff_new_pack.MVatpy/_old 2009-12-08 10:36:41.000000000 +0100 +++ /var/tmp/diff_new_pack.MVatpy/_new 2009-12-08 10:36:41.000000000 +0100 @@ -1,7 +1,8 @@ -diff -ruNp gnome-mime-data-2.4.1-old/gnome-vfs.keys.in gnome-mime-data-2.4.1/gnome-vfs.keys.in ---- gnome-mime-data-2.4.1-old/gnome-vfs.keys.in Mon Dec 22 20:05:12 2003 -+++ gnome-mime-data-2.4.1/gnome-vfs.keys.in Fri Aug 6 00:58:48 2004 -@@ -34,6 +34,7 @@ application/msword +Index: gnome-mime-data-2.18.0/gnome-vfs.keys.in +=================================================================== +--- gnome-mime-data-2.18.0.orig/gnome-vfs.keys.in ++++ gnome-mime-data-2.18.0/gnome-vfs.keys.in +@@ -32,6 +32,7 @@ application/msword short_list_application_ids_for_advanced_user_level=abiword,openoffice,staroffice,applix _category=Documents/Word Processor use_category_default=yes @@ -9,7 +10,7 @@ application/octet-stream can_be_executable=TRUE -@@ -63,6 +64,7 @@ application/pdf +@@ -61,6 +62,7 @@ application/pdf short_list_application_ids_for_advanced_user_level=acroread,gpdf,xpdf,ggv,gv _category=Documents/Published Materials use_category_default=yes @@ -17,7 +18,7 @@ application/pgp _description=PGP message -@@ -100,6 +102,7 @@ application/postscript +@@ -98,6 +100,7 @@ application/postscript short_list_application_ids_for_advanced_user_level=ggv,gv,ghostview _category=Documents/Published Materials use_category_default=yes @@ -25,7 +26,7 @@ application/qif _description=Quicken document -@@ -118,6 +121,26 @@ application/rtf +@@ -116,6 +119,26 @@ application/rtf short_list_application_ids_for_advanced_user_level=abiword,openoffice,staroffice,applix _category=Documents/Word Processor use_category_default=yes @@ -52,7 +53,7 @@ application/vnd.corel-draw _description=Corel Draw drawing -@@ -127,11 +150,12 @@ application/vnd.lotus-1-2-3 +@@ -125,11 +148,12 @@ application/vnd.lotus-1-2-3 _description=Lotus 1-2-3 spreadsheet icon_filename=i-spreadsheet default_action_type=application @@ -68,7 +69,7 @@ application/vnd.ms-excel _description=Microsoft Excel spreadsheet -@@ -142,6 +166,7 @@ application/vnd.ms-excel +@@ -140,6 +164,7 @@ application/vnd.ms-excel short_list_application_ids_for_advanced_user_level=gnumeric,openoffice,staroffice,applix _category=Documents/Spreadsheet use_category_default=yes @@ -76,7 +77,7 @@ application/vnd.ms-powerpoint _description=Microsoft PowerPoint document -@@ -151,6 +176,7 @@ application/vnd.ms-powerpoint +@@ -149,6 +174,7 @@ application/vnd.ms-powerpoint short_list_application_ids_for_advanced_user_level=openoffice,staroffice _category=Documents/Presentation use_category_default=yes @@ -84,7 +85,7 @@ # also audio/x-pn-realaudio, audio/x-real-audio application/vnd.rn-realmedia -@@ -162,6 +188,7 @@ application/vnd.rn-realmedia +@@ -160,6 +186,7 @@ application/vnd.rn-realmedia short_list_application_ids_for_advanced_user_level=realplayer _category=Video use_category_default=no @@ -92,7 +93,7 @@ application/vnd.stardivision.calc _description=StarCalc spreadsheet -@@ -940,6 +968,7 @@ application/x-shared-library-la +@@ -940,6 +967,7 @@ application/x-shared-library-la application/x-shockwave-flash _description=Macromedia Flash file _category=Documents/World Wide Web @@ -100,7 +101,7 @@ application/x-slp _description=Stampede package -@@ -952,6 +981,18 @@ application/x-smb-printer +@@ -952,6 +980,18 @@ application/x-smb-printer application/x-smil _description=SMIL script @@ -119,7 +120,7 @@ _category=Documents application/x-sms-rom -@@ -999,6 +1040,7 @@ application/x-toutdoux +@@ -999,6 +1039,7 @@ application/x-toutdoux application/x-troff _description=Troff document _category=Documents/Text Markup @@ -127,15 +128,15 @@ application/x-troff-man-compressed _description=Manual page (compressed) -@@ -1210,6 +1252,7 @@ audio/x-pn-realaudio +@@ -1219,6 +1260,7 @@ audio/x-pn-realaudio short_list_application_ids_for_intermediate_user_level=realplayer short_list_application_ids_for_advanced_user_level=realplayer _category=Audio + default_application_id=realplayer - # also audio/x-pn-realaudio, application/vnd.rn-realmedia - audio/x-real-audio -@@ -1220,6 +1263,7 @@ audio/x-real-audio + audio/x-pn-wav + _category=Audio +@@ -1235,6 +1277,7 @@ audio/x-real-audio short_list_application_ids_for_intermediate_user_level=realplayer short_list_application_ids_for_advanced_user_level=realplayer _category=Audio @@ -143,7 +144,7 @@ audio/x-riff _description=RIFF audio -@@ -1292,6 +1336,7 @@ image/bmp +@@ -1307,6 +1350,7 @@ image/bmp short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -151,7 +152,7 @@ image/cgm _description=CGM image -@@ -1315,6 +1360,7 @@ image/gif +@@ -1330,6 +1374,7 @@ image/gif short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -159,7 +160,7 @@ image/ief _description=IEF image -@@ -1331,6 +1377,7 @@ image/jpeg +@@ -1346,6 +1391,7 @@ image/jpeg short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -167,7 +168,7 @@ # also image/jpeg image/jpg -@@ -1344,6 +1391,7 @@ image/jpg +@@ -1359,6 +1405,7 @@ image/jpg short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -175,7 +176,7 @@ # also image/jpeg image/pjpeg -@@ -1357,6 +1405,7 @@ image/pjpeg +@@ -1372,6 +1419,7 @@ image/pjpeg short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -183,7 +184,7 @@ # also image/x-png image/png -@@ -1370,6 +1419,7 @@ image/png +@@ -1385,6 +1433,7 @@ image/png short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -191,7 +192,7 @@ image/svg _description=SVG art -@@ -1398,6 +1448,7 @@ image/tiff +@@ -1413,6 +1462,7 @@ image/tiff short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -199,7 +200,7 @@ image/vnd.djvu _description=DjVu image -@@ -1436,6 +1487,7 @@ image/x-bmp +@@ -1457,6 +1507,7 @@ image/x-bmp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp icon_filename=gnome-image-bmp _category=Images @@ -207,7 +208,7 @@ image/x-cmu-raster _description=CMU raster image -@@ -1491,6 +1543,7 @@ image/x-gray +@@ -1512,6 +1563,7 @@ image/x-gray short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -215,7 +216,7 @@ image/x-icb _description=Truevision Targa image -@@ -1503,6 +1556,7 @@ image/x-icb +@@ -1524,6 +1576,7 @@ image/x-icb short_list_application_ids_for_intermediate_user_level=eog short_list_application_ids_for_advanced_user_level=eog _category=Images @@ -223,7 +224,7 @@ image/x-ico _description=Windows icon image -@@ -1515,6 +1569,7 @@ image/x-ico +@@ -1536,6 +1589,7 @@ image/x-ico short_list_application_ids_for_novice_user_level=eog short_list_application_ids_for_intermediate_user_level=eog short_list_application_ids_for_advanced_user_level=eog @@ -231,7 +232,7 @@ image/x-iff _description=IFF image -@@ -1574,6 +1629,7 @@ image/x-png +@@ -1595,6 +1649,7 @@ image/x-png short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp icon_filename=gnome-image-png _category=Images @@ -239,7 +240,7 @@ image/x-portable-anymap _description=PNM image -@@ -1586,6 +1642,7 @@ image/x-portable-anymap +@@ -1607,6 +1662,7 @@ image/x-portable-anymap short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -247,7 +248,7 @@ image/x-portable-bitmap _description=PBM image -@@ -1599,6 +1656,7 @@ image/x-portable-bitmap +@@ -1620,6 +1676,7 @@ image/x-portable-bitmap short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp icon_filename=gnome-image-pbm _category=Images @@ -255,7 +256,7 @@ image/x-portable-graymap _description=PGM image -@@ -1611,6 +1669,7 @@ image/x-portable-graymap +@@ -1632,6 +1689,7 @@ image/x-portable-graymap short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -263,7 +264,7 @@ image/x-portable-pixmap _description=PPM image -@@ -1624,6 +1683,7 @@ image/x-portable-pixmap +@@ -1645,6 +1703,7 @@ image/x-portable-pixmap short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp icon_filename=gnome-image-ppm _category=Images @@ -271,7 +272,7 @@ image/x-psd _description=Photoshop document -@@ -1633,6 +1693,7 @@ image/x-psd +@@ -1654,6 +1713,7 @@ image/x-psd short_list_application_ids_for_advanced_user_level=eog,gimp icon_filename=gnome-image-psd _category=Images @@ -279,7 +280,7 @@ image/x-rgb _description=RGB image -@@ -1679,6 +1740,7 @@ image/x-xbitmap +@@ -1700,6 +1760,7 @@ image/x-xbitmap short_list_application_ids_for_advanced_user_level=eog,gimp icon_filename=gnome-image-xbm _category=Images @@ -287,7 +288,7 @@ image/x-xcf _description=GIMP document -@@ -1708,6 +1770,7 @@ image/x-xpixmap +@@ -1729,6 +1790,7 @@ image/x-xpixmap short_list_application_ids_for_intermediate_user_level=eog,electric_eyes,gimp short_list_application_ids_for_advanced_user_level=eog,electric_eyes,gimp _category=Images @@ -295,7 +296,7 @@ image/x-xwindowdump _description=X window image -@@ -1801,6 +1864,7 @@ text/* +@@ -1822,6 +1884,7 @@ text/* short_list_application_ids_for_intermediate_user_level=xemacs,emacs,nedit,gedit,xfte,pico short_list_application_ids_for_advanced_user_level=xemacs,gvim,emacs,vim,vi,nedit,gedit,xfte,pico _category=Documents/Plain Text @@ -303,7 +304,7 @@ # also application/x-abiword text/abiword -@@ -1823,6 +1887,7 @@ text/calendar +@@ -1844,6 +1907,7 @@ text/calendar text/css _description=Style sheet _category=Documents/World Wide Web @@ -311,15 +312,15 @@ text/directory _description=Directory information file -@@ -1845,6 +1910,7 @@ text/html - short_list_application_ids_for_advanced_user_level=epiphany,galeon,mozilla,netscape,lynx,firefox +@@ -1866,6 +1930,7 @@ text/html + short_list_application_ids_for_advanced_user_level=epiphany,galeon,mozilla,netscape,lynx _category=Documents/World Wide Web use_category_default=yes + default_application_id=epiphany text/htmlh _description=Help page -@@ -1855,6 +1921,7 @@ text/htmlh +@@ -1876,6 +1941,7 @@ text/htmlh short_list_component_iids_for_advanced_user_level=OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1 _category=Documents/World Wide Web use_category_default=yes @@ -327,7 +328,7 @@ text/mathml _description=MathML document -@@ -1873,18 +1940,16 @@ text/plain +@@ -1894,18 +1960,16 @@ text/plain short_list_application_ids_for_advanced_user_level=xemacs,gvim,emacs,vim,vi,nedit,gedit,xfte,pico _category=Documents/Plain Text use_category_default=yes @@ -348,7 +349,7 @@ text/spreadsheet _description=Spreadsheet Interchange document -@@ -1899,11 +1964,12 @@ text/spreadsheet +@@ -1920,11 +1984,12 @@ text/spreadsheet text/tab-separated-values _description=Tab-separated text document default_action_type=application @@ -364,7 +365,7 @@ # Note that text/tex should be text/x-tex, but a user reported # a complaint about text/tex in Nautilus, so some non-gnome-vfs -@@ -1911,62 +1977,75 @@ text/tab-separated-values +@@ -1932,62 +1997,75 @@ text/tab-separated-values text/tex _description=TeX document _category=Documents/TeX @@ -443,7 +444,7 @@ text/x-emacs-lisp _description=Emacs Lisp source code -@@ -1975,23 +2054,28 @@ text/x-emacs-lisp +@@ -1996,23 +2074,28 @@ text/x-emacs-lisp text/x-fortran _description=Fortran source code _category=Software Development/Source Code @@ -472,7 +473,7 @@ text/x-java _description=Java source code -@@ -2015,6 +2099,7 @@ text/x-ksh +@@ -2036,6 +2119,7 @@ text/x-ksh can_be_executable=TRUE _description=Korn shell script _category=Software Development/Source Code @@ -480,7 +481,7 @@ text/x-literate-haskell _description=Literate haskell source code -@@ -2032,24 +2117,29 @@ text/x-lyx +@@ -2058,24 +2142,29 @@ text/x-lyx text/x-makefile _description=Makefile _category=Software Development @@ -510,7 +511,7 @@ text/x-po _description=gettext translation -@@ -2059,15 +2149,18 @@ text/x-python +@@ -2085,15 +2174,18 @@ text/x-python can_be_executable=TRUE _description=Python source code _category=Software Development/Source Code @@ -529,7 +530,7 @@ text/x-setext _description=Setext document -@@ -2084,10 +2177,12 @@ text/x-speech +@@ -2110,10 +2202,12 @@ text/x-speech text/x-sql _description=SQL code _category=Software Development/Source Code @@ -542,7 +543,7 @@ # also text/tex text/x-tex -@@ -2103,24 +2198,29 @@ text/x-texinfo +@@ -2129,24 +2223,29 @@ text/x-texinfo text/x-troff _description=Troff document _category=Documents/Text Markup @@ -572,7 +573,7 @@ text/x-vcalendar _description=Calendar or event document -@@ -2244,6 +2344,7 @@ video/x-real-video +@@ -2277,6 +2376,7 @@ video/x-real-video short_list_application_ids_for_intermediate_user_level=realplayer short_list_application_ids_for_advanced_user_level=realplayer _category=Video ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org