media-gfx/blender: Fix desktop file of 2.60a

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 13 insertions, 9 deletions

diff --git a/media-gfx/blender/ChangeLog b/media-gfx/blender/ChangeLog
index 6904e562c92b..30c1fb031701 100644
--- a/media-gfx/blender/ChangeLog
+++ b/media-gfx/blender/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/blender
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.213 2011/11/13 22:43:48 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.214 2011/11/13 22:47:39 sping Exp $
+
+  13 Nov 2011; Sebastian Pipping <sping@gentoo.org>
+  files/blender-2.60a-desktop.patch, files/blender-2.60a-insecure.desktop:
+  Make desktop file announce "2.60a" rather than "2.6"
 
   13 Nov 2011; Sebastian Pipping <sping@gentoo.org> blender-2.60a.ebuild,
   +files/blender-2.60a-desktop.patch, -files/blender-desktop.patch:
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 2297b2d5567d..eb75548740cd 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -31,9 +31,9 @@ AUX blender-2.60-eigen.patch 13804 RMD160 67b2d444f35ac5b9f2e2fc1ee93a105feadc83
 AUX blender-2.60-glew.patch 1128 RMD160 392907190c8c970a1b2f0b20067d9f1bf108edbc SHA1 e9890bc4c420b16ce4f9c9c6cfc71c13852e4de3 SHA256 a43f0a0ac2a0cc5096e8488c926e7a32933a5910300440590a1cac5e1bb73f20
 AUX blender-2.60-openjpeg.patch 1731 RMD160 898318cfdc0c5daafd39d1f0f116531c6a2fd69f SHA1 5870c4f7b50f9edc4d12b68a684b8bb32548ad20 SHA256 3a684711e40ba365152593a6c90bbf38b190c84132e288c3dd3c7409dc6f9a62
 AUX blender-2.60a-CVE-2009-3850-v3.patch 7787 RMD160 02afc6ef3bcdf314c693c44be0cfc649ffd4ebf3 SHA1 031b42d09021b027dde631f08bc8e973299edab9 SHA256 1aebbdd475ccdb1d4e77c4c1ae4c3205e76a1a06f7dcd5e70624c141f42d204b
-AUX blender-2.60a-desktop.patch 641 RMD160 5be612d2836005e51e1bcfed10959e75315f201f SHA1 b0f99cdefc6c1a21b32ea97a237e214b22e5f9e6 SHA256 f52bc6f42eb07e693bfbe578747cf126b242b04273cbcd78a8ee4879eae8b514
+AUX blender-2.60a-desktop.patch 643 RMD160 43b8eaaef300fac4ebf463eb024356f65f76b7f5 SHA1 1b77d5a0c5ffe791117cfe140a7b3626bd3ba21b SHA256 8f2a7619d82a7ea64ade59aa067f2e6469129fe682b88f7c3ac6975650947ec1
 AUX blender-2.60a-enable_site_module.patch 974 RMD160 e93ddcd1372751951b6e56f72c764e2043747574 SHA1 84aed7ab30f5de1989ee63b4584db7acd6747b54 SHA256 dfafc00a08504c0c3259083d01e535e00f9a952db4a551dbacf0a62ad1a5c768
-AUX blender-2.60a-insecure.desktop 495 RMD160 b1c0610f828df44355dad5c0aab13d662a56006f SHA1 d22db462c2909ccd8af0c705f069b08167a06fb2 SHA256 b5bc477c6849f063ce1ad8ae4caa4a93b79d055fbb46c2ad174a3c5dbbb69eb1
+AUX blender-2.60a-insecure.desktop 497 RMD160 d7ccece6a66f045448bf523c4936fdcfeb853eef SHA1 f740aa35ef9f3f8d7e605bf6e6b817b54d422b7d SHA256 1f349c15970ff137883c59f825620baef1542207e678d5cd1a5506ffb3455a12
 AUX blender-2.60a-libav-0.7.patch 1069 RMD160 4cd584ce35a2846aec25536f26faa1ccb5fce0d0 SHA1 034488267f494c35198528736e9106755a9a7d4f SHA256 6f341d8b8e8f35fcecd1a0a394f40d3b17685d810e2adc7e818de4c2b6864a2e
 AUX blender-2.60a-linux-3.patch 414 RMD160 cb1cfc00e363e00c67a3c6d3567768418be78f39 SHA1 71f4701aa2e88de35843661cf5eecfe411ccd99b SHA256 4f1f8960e1b5706b426e272c17b70682b1eaa5903fa325e4d4db21efd540d732
 AUX blender.desktop 199 RMD160 a55286923d1422f620dff35226a42fcbaf8c60a9 SHA1 c5ad8c540571a254756ac541c64933e80406aa16 SHA256 3fbab5be3f52ce56f285e422c856aecd15627cffeadcb07af313e0d64c4803ad
@@ -48,12 +48,12 @@ EBUILD blender-2.49a.ebuild 4819 RMD160 109229feaf551d5c4829ecad0f4eb7c9cfea8c1e
 EBUILD blender-2.49b-r2.ebuild 5050 RMD160 87bba6723e7f083f395666581f568848154c3233 SHA1 105297aa72047f8501775933f1d4b51bf992d60e SHA256 39dec297a537d22f07576adc90211ec8806f8d63c6c30906f58f6e51dc2cc764
 EBUILD blender-2.57-r1.ebuild 13935 RMD160 e379b03c655891ed9bfc0c0542ab5a955cc3710b SHA1 2d988031adfed101d7c6bec64ae36b7bfefba460 SHA256 98934feed8e0cc661dac38746f1a8322088269c470fb32c84d1af2c494f8f834
 EBUILD blender-2.60a.ebuild 13799 RMD160 ef3db70e4cf2b0bee253435a8f60330e1817032e SHA1 27cd6ebc6e505076e76f8f2cd09e7f4261ac3300 SHA256 af6906ae77071826856a1d58ef023f3445034ccdc0c7aa1706e47af1f9399998
-MISC ChangeLog 33027 RMD160 a8f431280c1c45a5daaa0a3a660a5d8b10adeb4a SHA1 54ddece3de60856b17ca2e1bfb623666a8ef084f SHA256 8e6284069e477c53c8722dcc77029042f1cc1ba61c27a638b2bdca318d509f89
+MISC ChangeLog 33210 RMD160 c5cb9b421e37c66e7201d3acb3b0292dce93cc8c SHA1 e3a58a688dc8eeb1976b0200ccda381371c0a9ed SHA256 44a9b3f13ebd41f948e269e894a5d0dcf05a75ec36852aa7f39c93516af3f501
 MISC metadata.xml 1799 RMD160 7330ec5ccf7f7a86f31abf0b5f45bf84025c505a SHA1 a8bc4c5db954f24ea50e879b1bdbd5753430b3ee SHA256 f4bc849a0cc6a805fe6624699c5c1b9248336f7b879484f777f31b7c755759ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7ASC4ACgkQsAvGakAaFgC79wCgk8pTkNVctgndbZoWC33hM9wm
-+s8An3M3HYrHlYcfPSbdjFbP0Ff3NtzW
-=E6uZ
+iEYEARECAAYFAk7ASQ8ACgkQsAvGakAaFgDnFgCfUntMYNWWExvey54k6SQzecyd
+UNAAoMaqSSy11aJ7LDxQ5eOPu1UwMV/T
+=hNJC
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/blender/files/blender-2.60a-desktop.patch b/media-gfx/blender/files/blender-2.60a-desktop.patch
index 515a79d35138..c774cbe79a9d 100644
--- a/media-gfx/blender/files/blender-2.60a-desktop.patch
+++ b/media-gfx/blender/files/blender-2.60a-desktop.patch
@@ -3,7 +3,7 @@
 @@ -1,5 +1,5 @@
  [Desktop Entry]
 -Name=Blender
-+Name=Blender-2.6
++Name=Blender-2.60a
  GenericName=3D modeller
  GenericName[es]=modelador 3D
  GenericName[de]=3D Modellierer
diff --git a/media-gfx/blender/files/blender-2.60a-insecure.desktop b/media-gfx/blender/files/blender-2.60a-insecure.desktop
index 184c2ae4d6d2..01383d419dd0 100644
--- a/media-gfx/blender/files/blender-2.60a-insecure.desktop
+++ b/media-gfx/blender/files/blender-2.60a-insecure.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Blender-2.6 (reduced security)
+Name=Blender-2.60a (reduced security)
 GenericName=3D modeller
 GenericName[es]=modelador 3D
 GenericName[de]=3D Modellierer