remove duplicate desktop entry - bug #208806 thanks to Stefan Briesenick

Package-Manager: portage-2.1.4.4

5 files changed, 20 insertions, 21 deletions

diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index 0dab60642602..a516f20a4e35 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/dvdstyler
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.29 2007/12/24 03:01:47 dragonheart Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.30 2008/04/01 15:17:39 dragonheart Exp $
+
+  01 Apr 2008; Daniel Black <dragonheart@gentoo.org>
+  dvdstyler-1.5-r1.ebuild, dvdstyler-1.5.1.ebuild,
+  dvdstyler-1.5.1_p2.ebuild:
+  remove duplicate desktop entry - bug #208806 thanks to Stefan Briesenick
 
 *dvdstyler-1.5.1_p2 (24 Dec 2007)
 
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 80642e72e373..1966e7f7e9f7 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,8 +1,8 @@
 DIST DVDStyler-1.5.1.tar.gz 824171 RMD160 9fe9821f4fdd44464148397968d042c2d54cb1e0 SHA1 c466dca9a5ff318dd43eb73d1acd0a360a68efd4 SHA256 14347cc366f32452f7d345d7593ab3393dbdad599193c8177a96f630b2cf8817
 DIST DVDStyler-1.5.1_2.tar.gz 834479 RMD160 d6e16af0743d29867428f55409dd30dbd6b152dd SHA1 ef3de9debdd55a051b185e89381e12a14bbab14d SHA256 e3d2c60834b611d26fd8ae9d8bd20785a65878014a42e10669668a844403f740
 DIST DVDStyler-1.5.tar.gz 813069 RMD160 1dc77a2aafdee884b20d1be0b259091c8b3028a0 SHA1 4c090fd5308014b0f0fae0bea88fe7eec0f03354 SHA256 76271ed542951a06c69e10ca7d9567608949f8d166fe5c82a59d59dbf4d741f3
-EBUILD dvdstyler-1.5-r1.ebuild 1318 RMD160 36dc503a935483c1edcc67b5ba3e411fdb23ec2c SHA1 a52acd9b70c72b0ec5d8efc4da0ad3b112e19469 SHA256 80bea87362568c5464a889e3d0a5b6ed265143b2f00a79617046b21462764347
-EBUILD dvdstyler-1.5.1.ebuild 1379 RMD160 7ee22911ba005a58fec2f1890dd2f00b6d1abb87 SHA1 3002feca091ee991637cd1d98cb3436152e52f8b SHA256 f39b866ec186c98a25b814f512e4e29f6545412ef200a258038485e9a438a1dc
-EBUILD dvdstyler-1.5.1_p2.ebuild 1332 RMD160 4948509bbce1b300ba1bdc040a6b079dcef0c1a1 SHA1 a022667e8722ff8322753ec5894901e5d76d6ade SHA256 c86ef6c3f8e3621346b5902aa5d3946f82b1ee8da5f46db1d6b8f7484d5a315a
-MISC ChangeLog 5247 RMD160 dd7259a5c3f0728a14ea84254e700727c59accae SHA1 749301686e3272242bf4328b329ec49fcb1bfbcb SHA256 9c61cfd05a68dd697d2fc54098c5fe81a031302192ca4b037fc6e51b59fa837c
+EBUILD dvdstyler-1.5-r1.ebuild 1227 RMD160 47ecf9a2d89b82fd64dcf96ce4158b59e1f217ef SHA1 09f587e43e7fa695d49475ee2dafca7b737342d2 SHA256 5ba47897e666ea616db56c7a36e51578ca506779601e8be15a8b7d026107b8d3
+EBUILD dvdstyler-1.5.1.ebuild 1282 RMD160 9f20b01f5d025ffb28b60e329ecb8d904baeb010 SHA1 6a061d8f0ddcb3edd9a4007a59f328c123d1c0ab SHA256 5c1e1bbdfd8d07a82d0071e44343edf5c539f8ee22ce7e66662a5b3c686fd6ce
+EBUILD dvdstyler-1.5.1_p2.ebuild 1235 RMD160 7050caa64fce9004e67edf3a9c003eb0199b65af SHA1 74cd690df693e4db8f6021ffde405e8873d051e2 SHA256 68e919216f42e0124b1502ab1bc14dee63c3870d70fb822b06ad76144587dfd7
+MISC ChangeLog 5456 RMD160 7b347c7eb31fbe728c8ead7502007247bf96fe96 SHA1 61f2553ed7db1242f76bf9bbf7e8699d6be5c20d SHA256 38cbe78b561a0ce87926f6f82a812a83ae0f386354023cb4f3357ef9cb4ccb69
 MISC metadata.xml 253 RMD160 4017dbee50ab0fca6eee1ae8103bdcba5e3ec08c SHA1 eba5ea7101cd9bb7d2e8acbd28507cd49268d8b2 SHA256 4d56e96fb54c7825dbf341dbac673b7bbae83b48ee32352091126c632ac09239
diff --git a/media-video/dvdstyler/dvdstyler-1.5-r1.ebuild b/media-video/dvdstyler/dvdstyler-1.5-r1.ebuild
index f337da7effdc..048e06d49119 100644
--- a/media-video/dvdstyler/dvdstyler-1.5-r1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5-r1.ebuild,v 1.3 2007/07/24 17:17:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5-r1.ebuild,v 1.4 2008/04/01 15:17:39 dragonheart Exp $
 
-inherit eutils wxwidgets
+inherit wxwidgets
 
 MY_P=DVDStyler-${PV}
 
@@ -43,6 +43,4 @@ src_install() {
 	emake DESTDIR="${D}" install || die "failed to install"
 	rm  "${D}"usr/share/doc/${PN}/COPYING "${D}"usr/share/doc/${PN}/INSTALL
 	mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF}
-
-	make_desktop_entry dvdstyler DVDStyler /usr/share/dvdstyler/rc/dvdstyler.png AudioVideo
 }
diff --git a/media-video/dvdstyler/dvdstyler-1.5.1.ebuild b/media-video/dvdstyler/dvdstyler-1.5.1.ebuild
index d26bfbf42522..9e7f04835120 100644
--- a/media-video/dvdstyler/dvdstyler-1.5.1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1.ebuild,v 1.1 2007/08/16 09:20:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1.ebuild,v 1.2 2008/04/01 15:17:39 dragonheart Exp $
 
-inherit eutils wxwidgets
+inherit wxwidgets
 
 MY_P=DVDStyler-${PV}
 
@@ -44,6 +44,4 @@ src_install() {
 	emake DESTDIR="${D}" install || die "failed to install"
 	rm  "${D}"usr/share/doc/${PN}/COPYING "${D}"usr/share/doc/${PN}/INSTALL
 	mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF}
-
-	make_desktop_entry dvdstyler DVDStyler /usr/share/dvdstyler/rc/dvdstyler.png AudioVideo
 }
diff --git a/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild b/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild
index 8bc7d498ffe0..3963ccb5b565 100644
--- a/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild,v 1.1 2007/12/24 03:01:47 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.5.1_p2.ebuild,v 1.2 2008/04/01 15:17:39 dragonheart Exp $
 
-inherit eutils wxwidgets
+inherit wxwidgets
 
 MY_P=DVDStyler-${PV/_p/_}
 
@@ -43,6 +43,4 @@ src_install() {
 	emake DESTDIR="${D}" install || die "failed to install"
 	rm  "${D}"usr/share/doc/${PN}/COPYING "${D}"usr/share/doc/${PN}/INSTALL
 	mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF}
-
-	make_desktop_entry dvdstyler DVDStyler /usr/share/dvdstyler/rc/dvdstyler.png AudioVideo
 }