Fix redundand and obsolete .dekstop keys.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

3 files changed, 20 insertions, 7 deletions

diff --git a/app-text/mupdf/ChangeLog b/app-text/mupdf/ChangeLog
index 87a3c342f1e7..4b3fb1ed2758 100644
--- a/app-text/mupdf/ChangeLog
+++ b/app-text/mupdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/mupdf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.59 2013/03/25 09:50:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/ChangeLog,v 1.60 2013/03/25 16:44:44 xmw Exp $
+
+  25 Mar 2013; Michael Weber <xmw@gentoo.org>
+  files/mupdf-1.1_p20121127-desktop-integration.patch:
+  Fix redundand and obsolete .dekstop keys.
 
   25 Mar 2013; Michael Weber <xmw@gentoo.org> -mupdf-1.1_p20120816.ebuild,
   mupdf-1.1_p20121127.ebuild,
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 062723bed93a..27686418baaa 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX mupdf-1.0-buildsystem.patch 454 SHA256 a56f4fd16512aa21dd7af91c634398ede2a8a82a148f41b91f8eb25b32fefc48 SHA512 a0a0fe9a153c55d4fc03e282ce158137c2f22f5998b1803c8c6c558731ea7f1d385e445f168580c1f136833f20031e71ed011dd741ca0f2533723750354a782b WHIRLPOOL efb79768edbe1da7d478eccadcd152cb37deac7b8b6af311e6df06f6d9cd2f7cbc78b2d0932b8c6c9adfb6c880eb04950899fb9f9683b718ae785c9d050754f2
 AUX mupdf-1.0-zoom.patch 355 SHA256 e079ab9c832feb80f0669353606d665378188355bc699a0431241a303ad421a4 SHA512 ee1f6d8f174563454a6cae5e8a8e5c1f6aad237bd5a91d264510d7d939b44c165527b1daf3e5e10b31e4984bbbe8eb75dfa8a89ffff1dc465f96687e4dbc9706 WHIRLPOOL 13d2a509eec81dfe9474435428acb193fe37fe2e9cab6b5ba3df603fddfde4667c9fee67cf9d8ad0b5d48302b2f465c1be77f4230d5a3628e9306aa5cf873cbf
 AUX mupdf-1.1_p20121127-buildsystem.patch 638 SHA256 a069157b29f15d9e7efd904ce4b3558b397889be2e8982cc51b6272e3e7e73e1 SHA512 b4d65c3df3cf32241b5bd6296a62a62750a33535f2bab5acc2fbbe2f3deb8420cbab335c74b6d50898f2edc101a28cec23d70f2ae1f720d2a5a62b7e6da2dbc9 WHIRLPOOL 1d57cf9126be7590fe1fd03b63f3b92335b20921958a754a69f79801a8bbef74d9e68f38f97e2ee232c0ed4fc552f845e3af248b38952ea978076ea4d634f9f3
-AUX mupdf-1.1_p20121127-desktop-integration.patch 257 SHA256 cce513157bd64228743976d8eb1db2760d22431524d334b1bd4d9868dae1bcec SHA512 5f1a6e3048a35c56db067bcded4f6b049693c48bd9fbf83a739e88e2e45e190772a89b75154ff97013f4b4893acfc995a2e3ca517e07e9062daff1c33a2ce0a0 WHIRLPOOL 7c4c8ef630bc87edf344d86f424e4242afaa1c6dc1c8da0586b9a2cd6e7631ba6906017d42898e3475f7e824abf38a85cf2e9f34d5af5b840d169b99f67ff1d6
+AUX mupdf-1.1_p20121127-desktop-integration.patch 413 SHA256 b32f6a4a403e887935b6a0eb9f79f960b709601d31c695b5f6200b004c070f53 SHA512 6198c6d9beae6375dad4a3ca475eceadc6e98237e7d6f84de34170db00d61214c858eebc43e252a356f2515e4a573f2f8d895ad19e7fa4681fbf151ae457c390 WHIRLPOOL c1b991f6c24417e9130ee08bb6f024282795b801fabb76ca46fe6016cc5656e610f762253d824a9591ec99bc4a44d655435e4be11a976d88038e7809569583a5
 AUX mupdf-1.1_rc1-buildsystem.patch 521 SHA256 b98072f9fab9a687fddd2ba13a08836467b8a70bbda409a28153feca5d9c1ee6 SHA512 5ee24ce5d18c73e028f8e7e33ac9dd67fc851cb9ffbbbd55739a2252b61e58497c6231157299e2a7605144d1f1931029295d7fad1f725b81ecc1b071edbf6be1 WHIRLPOOL c27869b32d5828d1f1bffaca4b4b1615ec3c2472d4a21dbf37a174674b6b81c071841a7c33fb37c511d202d43faef3732e8d44b3214308c3581467977cac5040
 AUX mupdf-1.1_rc1-zoom-2.patch 200 SHA256 c0b9d6bbe627dc12492bf91d2e742a9801580eec69c137f6474a3791b5d94191 SHA512 793ba40424a41aec2c758b7f1ae433fa2ff118f72b984b914ae3ea1734faec4d281ff59d2821ecdb077037afd0e2f5482305fe4b4102c810e602792f766271f8 WHIRLPOOL 52c5d18389f1fc9f5441d0a0f8bf6d152a4e6ef7ccd99b76d8b638a22ce967405b237373437f9297239256aaf89250217217296e5d2ed3ee3b06e46e21cdcaf1
 AUX mupdf-1.2-mubusy_rename_fix.patch 621 SHA256 63b2c440da458c470b276fa59271c6d2fe58b1f254937e621be4580ce16b2ad6 SHA512 7b9d3d8c10bc09bc2b755cc7d27fba8b78bbf7eaf83c93f76f31bb214a61346eca92469f0f1c8ae9ea2b15354fd280b6b0b478175928daa66c84fb4927d805f2 WHIRLPOOL c659fa6e5e29aae26b29e58d96acbe975c2dc847c6819d5648853505d64967f4b6c15b26156652ad5689dfa821f2a9f0a0f0130f686334c8df853dd3705335e1
@@ -18,12 +18,12 @@ EBUILD mupdf-1.1.ebuild 1498 SHA256 51ec7fe0291b2708d250311853759d5effec27909ad7
 EBUILD mupdf-1.1_p20121127.ebuild 1488 SHA256 21dc1d03595c87ebc85602a0a00315daf0b09c4237def12787ec78265befe2a0 SHA512 c3ac97c40af5a0ca61919e889982c856437ec28ab6e5fc348c6db14b56e2ffde98dd407bcfc942ac94bcf6fea391cdd887e25178da9d2fcb4e9bc3dd04b9cf0d WHIRLPOOL 123f88f19a1ebc8fbd4e9463555363c50d5f83d174310cefcc1ccaff090733aa0e6e581c1adc46d2fb8323b93ccc5108d443ef26f2ade850788012e72170c79c
 EBUILD mupdf-1.2.ebuild 1648 SHA256 b0129759e53b731342e8e2d6a5ff9ff1198529fcb052b671b757d9295c2f1189 SHA512 68256260e9e978047c9c758c19812e9dab1579a5bd42964a94ebe9c56d796948e6dfb123eb6e4ebf9b2c160549dcc674fe6df48f1b0fffe9f522b46a9fab3b6b WHIRLPOOL d822969624756d707fb32a4b9789e2f0419bab627dd5f71aaa9682b0935f71139a7adf6ced22a57b2e4549476d0b4c9bbd1965ea273d27f72fdba1115a2fd880
 EBUILD mupdf-9999.ebuild 1442 SHA256 635634521b9b7aebc6da4644491ae9a11dbbe737880875b6d0edbdea775f566d SHA512 70c6d15a8c9844243103ff8dd965bde5294ec756bb177b3a393f2ff88ec881732834c696addb37bde3d2cabfa2dbfcbdf35b5cb7c5a7d6c3c38a2fe989525686 WHIRLPOOL 1799f25598c047b5630bfc5cfac67fd3b9ce9c4f72cec08edda17773622adb42e110d5cc4196fdac9b411a0cf4a02b55f5c707a325abfd5cfc97b5c8bc7ecdad
-MISC ChangeLog 9571 SHA256 e41e00b289f06342a5a8c7a0c8973320b712eb2e9f7c3dccea9eb23139ca3c6f SHA512 660244b1061e479674a3c27baa1073bfaaeabf28c258a2cff340d435a78b735ba4222d5763dcfcffdf0bac68c8ac93f9b924b4ff9c87710bd13903f8491234a7 WHIRLPOOL bf979779fe64d845cf20216f56e91d5c8658b96500243077d55717161a85ecf9377e4e57bae8ba616a806926030c07d895f4fd38346590b0a4a00de4446acd38
+MISC ChangeLog 9717 SHA256 7a57bd506fe13a8a7eca58d3a09c025df222f5f1cd018b41ec1003f4e28bcdfa SHA512 ac08b21a1b0f78d4376fe6290b69f88f9d1a27d72255f4d7327f86f97dba47d22dfb14726712d17190ecc393f031361ebae297fd53913e6da0997341917d134c WHIRLPOOL a853a3dfb656f57c25a30cfa421fafcf88936a0f88ec058dc5932ed2b3841dc3ddef1a9cbc9423724e81c2ba9ac932bc71805aa978d2c60a8c601d6f0ae95753
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFQHgYACgkQknrdDGLu8JB9wQD+Ke10Ud68xzj2oOEJMDL3snXc
-Z+ybQ/ffQV/fL0fifagA/jF0fLMGdNyNqpuoiiiystK/NPo3N7gZfvJbhAylBFwi
-=AO5j
+iF4EAREIAAYFAlFQfvwACgkQknrdDGLu8JCc5QD/UaOYuo/poZM9sSDxTqt1/y0H
+FdBzO0LhqadDbQLw8qIA/j7YBylPipfPDLDKfJmhLLWRiivZzUrh0s7QN/Y0sKMC
+=ebvf
 -----END PGP SIGNATURE-----
diff --git a/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch b/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
index f8598d902107..e666197cac4b 100644
--- a/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
+++ b/app-text/mupdf/files/mupdf-1.1_p20121127-desktop-integration.patch
@@ -1,6 +1,15 @@
 --- mupdf-1.1/debian/mupdf.desktop
 +++ mupdf-1.1/debian/mupdf.desktop
-@@ -10,6 +10,8 @@
+@@ -1,8 +1,6 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=MuPDF
+ GenericName=PDF file viewer
+-Comment=PDF file viewer
+ Exec=mupdf %f
+ TryExec=mupdf
+ Icon=mupdf
+@@ -10,6 +8,8 @@
  Type=Application
  MimeType=application/pdf;application/x-pdf;
  Categories=Viewer;Graphics;