Use make_desktop_entry so that we get a .desktop file that passes desktop-file-validate.

Package-Manager: portage-2.1.4_rc3

4 files changed, 29 insertions, 29 deletions

diff --git a/net-p2p/nicotine/ChangeLog b/net-p2p/nicotine/ChangeLog
index 62633530857c..90796dd9f866 100644
--- a/net-p2p/nicotine/ChangeLog
+++ b/net-p2p/nicotine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/nicotine
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/ChangeLog,v 1.27 2006/10/30 02:55:18 the_paya Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/ChangeLog,v 1.28 2007/12/10 07:25:47 betelgeuse Exp $
+
+  10 Dec 2007; Petteri Räty <betelgeuse@gentoo.org>
+  -files/nicotine.desktop, nicotine-1.0.8.ebuild:
+  Use make_desktop_entry so that we get a .desktop file that passes
+  desktop-file-validate.
 
   30 Oct 2006; Javier Villavicencio <the_paya@gentoo.org>
   nicotine-1.0.8.ebuild:
diff --git a/net-p2p/nicotine/Manifest b/net-p2p/nicotine/Manifest
index 448ad499ee54..8e64e1dfbc38 100644
--- a/net-p2p/nicotine/Manifest
+++ b/net-p2p/nicotine/Manifest
@@ -1,20 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX nicotine-n.png 6723 RMD160 b31a29f12b0652ba25070ffdb0f12e2f82bad2d0 SHA1 d88f8f2549cc8b38dc6390cefe675b26236d6622 SHA256 18f5380b571622b3fa1368ffeb44ad98635a4087284dfc2cb62f75aa7c5a9420
 MD5 78b6c9a0f315f06a45fb52448ea77c26 files/nicotine-n.png 6723
 RMD160 b31a29f12b0652ba25070ffdb0f12e2f82bad2d0 files/nicotine-n.png 6723
 SHA256 18f5380b571622b3fa1368ffeb44ad98635a4087284dfc2cb62f75aa7c5a9420 files/nicotine-n.png 6723
-AUX nicotine.desktop 176 RMD160 5b5527b75cb96c2b4146cc19f9e74a4a3a56bfa6 SHA1 32749cf7b7dfc7e66c3d24a27be290c7ffd9ffb8 SHA256 66dd954eacc52a6bbe1ea6a7ef2fbbc6a973b9127d76891759b3625315f85491
-MD5 c480abc8a1ded5a696e66c9447c88e6b files/nicotine.desktop 176
-RMD160 5b5527b75cb96c2b4146cc19f9e74a4a3a56bfa6 files/nicotine.desktop 176
-SHA256 66dd954eacc52a6bbe1ea6a7ef2fbbc6a973b9127d76891759b3625315f85491 files/nicotine.desktop 176
 DIST nicotine-1.0.8.tar.bz2 305645 RMD160 eaf4b0496f563ebf4521954b8d309ad3fcf5376d SHA1 8549172106c8f59da5a244382cbc5951dfbbc3fa SHA256 8e9d8707991316603363a9198fa4a3510e66aecfcead6f6f721b0500916bf4d2
-EBUILD nicotine-1.0.8.ebuild 866 RMD160 29d04e46d493048bc38195fb1217a96b6f0ac634 SHA1 9d29c1f72ca0d54291833e2300d9e6321a340b31 SHA256 ed4faeb0a6584a7d43b85f2d904700c2a6bfc55e909c5c51be175b63281de548
-MD5 8ff1403fb7930d357744e9dbb3041a72 nicotine-1.0.8.ebuild 866
-RMD160 29d04e46d493048bc38195fb1217a96b6f0ac634 nicotine-1.0.8.ebuild 866
-SHA256 ed4faeb0a6584a7d43b85f2d904700c2a6bfc55e909c5c51be175b63281de548 nicotine-1.0.8.ebuild 866
-MISC ChangeLog 3681 RMD160 d21aef66ff5af92a972bd14d16aae4240fec7297 SHA1 cb22b12a32fb489f63cabeeac405a6c670017c0b SHA256 5306efa9e300270c308ccd18b6308dd6549dad89e13311b55b6eb8f5f3cdf368
-MD5 41f4fe8699f93c14a102498ca1278509 ChangeLog 3681
-RMD160 d21aef66ff5af92a972bd14d16aae4240fec7297 ChangeLog 3681
-SHA256 5306efa9e300270c308ccd18b6308dd6549dad89e13311b55b6eb8f5f3cdf368 ChangeLog 3681
+EBUILD nicotine-1.0.8.ebuild 826 RMD160 fde2d17612776e17ac8d56da2b02e004a9d814ed SHA1 f13baadc845f4d535c5dbdceb9a134d42cb246c3 SHA256 e3168cd997ac8d610c9b15076ff0aad5f6dcc6e83e2cb5e7f505f5081331da4b
+MD5 d5b328083b307c511d244af161b2b23d nicotine-1.0.8.ebuild 826
+RMD160 fde2d17612776e17ac8d56da2b02e004a9d814ed nicotine-1.0.8.ebuild 826
+SHA256 e3168cd997ac8d610c9b15076ff0aad5f6dcc6e83e2cb5e7f505f5081331da4b nicotine-1.0.8.ebuild 826
+MISC ChangeLog 3880 RMD160 bde6c5ede46d486f75a79abed9716ed211071620 SHA1 1154cef5a6b9610ceb84af246f60731986da47ba SHA256 fba1987aedf7d8b3d08d187965f94e38cc60f94a331aaa51ae91ce7a650b3cd8
+MD5 8ebfba8f285ddb8c465d52c66e9d3241 ChangeLog 3880
+RMD160 bde6c5ede46d486f75a79abed9716ed211071620 ChangeLog 3880
+SHA256 fba1987aedf7d8b3d08d187965f94e38cc60f94a331aaa51ae91ce7a650b3cd8 ChangeLog 3880
 MISC metadata.xml 221 RMD160 f0771cc4f1f6f3c792d95e7a29f261f757042b58 SHA1 f419a40290febaecf91b849cada041c09d44249a SHA256 1bf5787e57f7fa447ffe8ea45f8be8f66a5878076e9b9e65c4f911bdaa136ea4
 MD5 952583dc0fcffc549febb7c754168574 metadata.xml 221
 RMD160 f0771cc4f1f6f3c792d95e7a29f261f757042b58 metadata.xml 221
@@ -22,3 +21,10 @@ SHA256 1bf5787e57f7fa447ffe8ea45f8be8f66a5878076e9b9e65c4f911bdaa136ea4 metadata
 MD5 88c69616d3d66fc2c27d2c50de083bd1 files/digest-nicotine-1.0.8 247
 RMD160 e442886cda1979f61234a68aa1d70fea0c64d098 files/digest-nicotine-1.0.8 247
 SHA256 aea1acf854e41fd2f1a389921eb5489cfab1944c10a83dd5a0baf8e0df4295a9 files/digest-nicotine-1.0.8 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHXOmPcxLzpIGCsLQRAnp4AJ0bWAV6MFuxT1AgcPHrPRFsSuMSNwCfZ47F
+0U9s/dAzVVpncil54nnUUwQ=
+=Qe1n
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/nicotine/files/nicotine.desktop b/net-p2p/nicotine/files/nicotine.desktop
deleted file mode 100644
index 3c7265c9fe5d..000000000000
--- a/net-p2p/nicotine/files/nicotine.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Nicotine
-Comment=Nicotine SoulSeek Client
-Exec=nicotine
-Icon=nicotine-n.png
-Terminal=false
-Categories=Application;Network;
-Type=Application
diff --git a/net-p2p/nicotine/nicotine-1.0.8.ebuild b/net-p2p/nicotine/nicotine-1.0.8.ebuild
index eeae67661093..a9d2d0956f18 100644
--- a/net-p2p/nicotine/nicotine-1.0.8.ebuild
+++ b/net-p2p/nicotine/nicotine-1.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/nicotine-1.0.8.ebuild,v 1.9 2007/07/13 05:52:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine/nicotine-1.0.8.ebuild,v 1.10 2007/12/10 07:25:47 betelgeuse Exp $
 
 inherit distutils
 
@@ -25,9 +25,7 @@ src_install() {
 
 	distutils_src_install
 
-	insinto /usr/share/pixmaps
-	doins ${FILESDIR}/nicotine-n.png
+	doicon "${FILESDIR}/nicotine-n.png"
 
-	insinto /usr/share/applications
-	doins ${FILESDIR}/${PN}.desktop
+	make_desktop_entry nicotine Nicotine nicotine-n
 }