QA: Do not use absolute path to icon when in standard dirs (in make_desktop_entry())

Package-Manager: portage--svn/cvs/Linux i686

4 files changed, 20 insertions, 15 deletions

diff --git a/sci-geosciences/merkaartor/ChangeLog b/sci-geosciences/merkaartor/ChangeLog
index da93100b0846..22545fa3dcb2 100644
--- a/sci-geosciences/merkaartor/ChangeLog
+++ b/sci-geosciences/merkaartor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/merkaartor
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.16 2009/05/04 22:04:23 hanno Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/ChangeLog,v 1.17 2010/03/09 13:08:42 abcd Exp $
+
+  09 Mar 2010; Jonathan Callen <abcd@gentoo.org> merkaartor-0.12.ebuild,
+  merkaartor-0.13.1.ebuild:
+  QA: Do not use absolute path to icon when in standard dirs (in
+  make_desktop_entry())
 
   04 May 2009; Hanno Boeck <hanno@gentoo.org> merkaartor-9999.ebuild:
   Sync live with latest ebuild.
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
index fc0eba83baa6..65ef719b8420 100644
--- a/sci-geosciences/merkaartor/Manifest
+++ b/sci-geosciences/merkaartor/Manifest
@@ -6,16 +6,16 @@ DIST merkaartor-0.12.tar.bz2 1266076 RMD160 4f37ec0789948adca299813500d067b15c59
 DIST merkaartor-0.13.1.tar.bz2 3011810 RMD160 c617fbf7001f0ba37d5117e3d101ba4e40f54df9 SHA1 ff92d31c7705c6c9b1d1963370ec930c5822e79b SHA256 1577d63cc6fd37ff548ea3836f1242755fbbdf8c2b5b1034b7d3b440b0532ef7
 DIST merkaartor-0.13.2.tar.bz2 3010664 RMD160 809139ef9a9361882802a813b0a90ba1988e2eac SHA1 e8e0d006ba6a4859425cccefacbf2bfc4352d883 SHA256 bc216c1785f84f1e554e0f457203f6ccb4f675c5871221f8b906b2cf79a0fd54
 EBUILD merkaartor-0.11.ebuild 876 RMD160 aa790c571a6765db408b9b0348d4e9e3e9060662 SHA1 2b80544aa5301a14c98f00f206c2aae5c487958a SHA256 98b75da6bab732f739365d96b489e818b28d37761bcfe9a1326615f39ad28f23
-EBUILD merkaartor-0.12.ebuild 1083 RMD160 02d446a222c6222f50d69eeebd20a7b165bc36c0 SHA1 21e04059dc1f0a1ffba49355fb38ef9a225fcaf7 SHA256 b8249feeedd91f2055ba0b7ff1d25d8c9dac5cb9b4ace0fb5285ee1856112c3a
-EBUILD merkaartor-0.13.1.ebuild 1462 RMD160 b9147946bf51c8c27c5dc5eb0919cdc5e464bdc7 SHA1 098136edfa3751f872784351cecf77f395e18ac8 SHA256 6fc448d2c6e4ac9d7a142ffd73316379e2f995e4e7eba9f95833b7c4938817e0
+EBUILD merkaartor-0.12.ebuild 1059 RMD160 f867a2e919ae949bea6778e204c2f0788f121308 SHA1 8868d68a0099a10364fb0a332b3aae230417a525 SHA256 9b73e2a805de0969f808df5e28498875908aa24d8e7d2ad43da4bb34b8dedbed
+EBUILD merkaartor-0.13.1.ebuild 1438 RMD160 31f9ab7d277b674fbcf815554035292995389c67 SHA1 3d375be983d70c9642ac4c1a8195fe54c5a66c7a SHA256 ca3493974d16fc9f0771cc2238dfb359d64e8e6f206bbe8d6cf7cc63f2d56c5b
 EBUILD merkaartor-0.13.2.ebuild 1443 RMD160 316da80d0453b68fc49d2f3fd54ba198f2377d4e SHA1 f18b7f87592544f0f3dee9ad0ddbc198d50f03ab SHA256 71dfae3120702232df6a19d5e95007c5697d32562f000177f070bd633f45304e
 EBUILD merkaartor-9999.ebuild 1487 RMD160 fe660af67aed1e435e8802d24b4223b5ae31a8b7 SHA1 03b40885ca998a24909ed9254fd6b91ce8cf9638 SHA256 4fb75cea8339b9ce79f26a5df877aa328e421203a2ef979184ab90a3e4fde6d4
-MISC ChangeLog 2372 RMD160 1dace1db17ac7e82b1d27c1b3cecb24f1380dee6 SHA1 43426f192cd0248816d615c2502172e3c0875155 SHA256 12e1c1e68e711f13044a58811b51227f8679643cbe41a9fd6c21b29727548f4e
+MISC ChangeLog 2562 RMD160 d0cefc06d275507bc5e9a76771ef0a645b59c77e SHA1 e53aaa59191677606a83df7083a7f4115116e0c9 SHA256 5644220e19e98cf444f0873833b29ad67246a29cd90c723609efe097c1eb22d6
 MISC metadata.xml 493 RMD160 e56e8b24007c8df757dbee8882cb4edfeab4b57b SHA1 a62f7c4c88d80ea1f672f1378d8932f2edaec07d SHA256 3c714874940a146868396f51b16aa95424de5fb8a5278d6b374253c7534d0fe7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkn/Zm8ACgkQr2QksT29OyDR1QCeOQbluxya3K2D+spvm6On8r20
-7ZMAn0Dwi5mw7LxZVhad0u8gKacr8bhE
-=ZNJi
+iEYEARECAAYFAkuWSGAACgkQOypDUo0oQOqrkACgh4sn1DsVdPBvIAHaIWNGYIrE
+MKAAoI43Y/xnVygyODYiV9AQm2MUJJJM
+=90Cc
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/merkaartor/merkaartor-0.12.ebuild b/sci-geosciences/merkaartor/merkaartor-0.12.ebuild
index 0efd9d8e46d0..10e6a61d4f8f 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.12.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.12.ebuild,v 1.4 2009/03/08 20:26:06 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.12.ebuild,v 1.5 2010/03/09 13:08:42 abcd Exp $
 
 EAPI="1"
 
@@ -34,5 +34,5 @@ src_install() {
 	dodoc AUTHORS CHANGELOG HACKING || die "dodoc failed"
 
 	doicon Icons/Mercator_100x100.png
-	make_desktop_entry merkaartor "Merkaartor" /usr/share/pixmaps/Mercator_100x100.png "Science;Geoscience"
+	make_desktop_entry merkaartor "Merkaartor" Mercator_100x100 "Science;Geoscience"
 }
diff --git a/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild
index c727650f2266..c7ce472e0493 100644
--- a/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild
+++ b/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild,v 1.1 2009/04/03 10:37:40 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/merkaartor/merkaartor-0.13.1.ebuild,v 1.2 2010/03/09 13:08:42 abcd Exp $
 
 EAPI="1"
 
@@ -43,5 +43,5 @@ src_install() {
 	dodoc AUTHORS CHANGELOG HACKING || die "dodoc failed"
 
 	doicon Icons/Mercator_100x100.png
-	make_desktop_entry merkaartor "Merkaartor" /usr/share/pixmaps/Mercator_100x100.png "Science;Geoscience"
+	make_desktop_entry merkaartor "Merkaartor" Mercator_100x100 "Science;Geoscience"
 }