diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2007-03-15 12:46:26 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2007-03-15 12:46:26 +0000 |
| commit | bf02e0c79adc4d307de44a42ee4270c0ee547b70 (patch) | |
| tree | be61b45f95f1ee4ba662cff2eb6f51f7e4c9a328 /net-p2p/nicotine+ | |
| parent | sdl-mixer no longer has the oggvorbis flag (diff) | |
| download | gentoo-2-bf02e0c79adc4d307de44a42ee4270c0ee547b70.tar.gz gentoo-2-bf02e0c79adc4d307de44a42ee4270c0ee547b70.tar.bz2 gentoo-2-bf02e0c79adc4d307de44a42ee4270c0ee547b70.zip | |
Fix double installation of .desktop files, bug 170816
(Portage version: 2.1.2.2)
Diffstat (limited to 'net-p2p/nicotine+')
| -rw-r--r-- | net-p2p/nicotine+/ChangeLog | 6 | ||||
| -rw-r--r-- | net-p2p/nicotine+/files/digest-nicotine+-1.2.7 | 1 | ||||
| -rw-r--r-- | net-p2p/nicotine+/nicotine+-1.2.6.ebuild | 6 | ||||
| -rw-r--r-- | net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild | 6 | ||||
| -rw-r--r-- | net-p2p/nicotine+/nicotine+-1.2.7.ebuild | 6 |
5 files changed, 20 insertions, 5 deletions
diff --git a/net-p2p/nicotine+/ChangeLog b/net-p2p/nicotine+/ChangeLog index 1c47320db4fb..64f2c987a4cc 100644 --- a/net-p2p/nicotine+/ChangeLog +++ b/net-p2p/nicotine+/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-p2p/nicotine+ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.11 2007/03/07 21:49:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/ChangeLog,v 1.12 2007/03/15 12:46:26 armin76 Exp $ + + 15 Mar 2007; Raúl Porcel <armin76@gentoo.org> nicotine+-1.2.6.ebuild, + nicotine+-1.2.7.ebuild, nicotine+-1.2.7.1.ebuild: + Fix double installation of .desktop files, bug 170816 *nicotine+-1.2.7.1 (07 Mar 2007) diff --git a/net-p2p/nicotine+/files/digest-nicotine+-1.2.7 b/net-p2p/nicotine+/files/digest-nicotine+-1.2.7 index 7d77fc95d14d..7de23acf1d72 100644 --- a/net-p2p/nicotine+/files/digest-nicotine+-1.2.7 +++ b/net-p2p/nicotine+/files/digest-nicotine+-1.2.7 @@ -1,3 +1,2 @@ -MD5 09c41ba320f61b70ee1ee8840fbf1a1d nicotine+-1.2.7.tar.bz2 721490 RMD160 fa51f5ef635a9bff3a503d44fc4b58e2a8f465d7 nicotine+-1.2.7.tar.bz2 721490 SHA256 739dc783bb749d0d0933ffae2bf9337a71628283158728dc2eaf5da7c034c3cc nicotine+-1.2.7.tar.bz2 721490 diff --git a/net-p2p/nicotine+/nicotine+-1.2.6.ebuild b/net-p2p/nicotine+/nicotine+-1.2.6.ebuild index 98d289dd2576..076714de392a 100644 --- a/net-p2p/nicotine+/nicotine+-1.2.6.ebuild +++ b/net-p2p/nicotine+/nicotine+-1.2.6.ebuild @@ -1,6 +1,6 @@ # 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.2.6.ebuild,v 1.3 2007/02/18 14:37:36 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.6.ebuild,v 1.4 2007/03/15 12:46:26 armin76 Exp $ inherit distutils eutils multilib toolchain-funcs @@ -42,6 +42,10 @@ src_install() { cd "${S}"/trayicon/ emake DESTDIR="${D}" install || die "emake install failed" + # Remove the .desktop file installed by setup.py + rm ${D}/usr/share/applications/nicotine.desktop \ + ${D}/usr/share/pixmaps/nicotine-plus-32px.png + doicon ${FILESDIR}/nicotine-n.png domenu ${FILESDIR}/${PN}.desktop } diff --git a/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild b/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild index 06ccbb1dd548..dea38d024b17 100644 --- a/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild +++ b/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild @@ -1,6 +1,6 @@ # 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.2.7.1.ebuild,v 1.1 2007/03/07 21:49:37 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.7.1.ebuild,v 1.2 2007/03/15 12:46:26 armin76 Exp $ inherit distutils eutils multilib toolchain-funcs @@ -42,6 +42,10 @@ src_install() { cd "${S}"/trayicon/ emake DESTDIR="${D}" install || die "emake install failed" + # Remove the .desktop file installed by setup.py + rm ${D}/usr/share/applications/nicotine.desktop \ + ${D}/usr/share/pixmaps/nicotine-plus-32px.png + doicon ${FILESDIR}/nicotine-n.png domenu ${FILESDIR}/${PN}.desktop } diff --git a/net-p2p/nicotine+/nicotine+-1.2.7.ebuild b/net-p2p/nicotine+/nicotine+-1.2.7.ebuild index d81906173574..fdf5b4acdeab 100644 --- a/net-p2p/nicotine+/nicotine+-1.2.7.ebuild +++ b/net-p2p/nicotine+/nicotine+-1.2.7.ebuild @@ -1,6 +1,6 @@ # 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.2.7.ebuild,v 1.1 2007/02/26 15:55:00 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/nicotine+/nicotine+-1.2.7.ebuild,v 1.2 2007/03/15 12:46:26 armin76 Exp $ inherit distutils eutils multilib toolchain-funcs @@ -42,6 +42,10 @@ src_install() { cd "${S}"/trayicon/ emake DESTDIR="${D}" install || die "emake install failed" + # Remove the .desktop file installed by setup.py + rm ${D}/usr/share/applications/nicotine.desktop \ + ${D}/usr/share/pixmaps/nicotine-plus-32px.png + doicon ${FILESDIR}/nicotine-n.png domenu ${FILESDIR}/${PN}.desktop } |