diff options
| author |   Marcelo Góes <vanquirius@gentoo.org> | 2005-06-19 23:01:56 +0000 |
|---|---|---|
| committer | Marcelo Góes <vanquirius@gentoo.org> | 2005-06-19 23:01:56 +0000 |
| commit | 427f5b0d0313e681ab663d991cf7fbe1cda0b289 (patch) | |
| tree | d0d347501471dfc10ac3d7182a204a12fa1b2d9d /net-analyzer/nessus-core | |
| parent | desktop-misc accepting responsibility for the package; ebuild cleanup (diff) | |
| download | historical-427f5b0d0313e681ab663d991cf7fbe1cda0b289.tar.gz historical-427f5b0d0313e681ab663d991cf7fbe1cda0b289.tar.bz2 historical-427f5b0d0313e681ab663d991cf7fbe1cda0b289.zip | |
file conflict
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'net-analyzer/nessus-core')
| -rw-r--r-- | net-analyzer/nessus-core/ChangeLog | 6 | ||||
| -rw-r--r-- | net-analyzer/nessus-core/Manifest | 6 | ||||
| -rw-r--r-- | net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-analyzer/nessus-core/nessus-core-2.2.4.ebuild | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog index 3a5d91b0c193..fa7ee8d96295 100644 --- a/net-analyzer/nessus-core/ChangeLog +++ b/net-analyzer/nessus-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-analyzer/nessus-core # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.76 2005/06/19 21:19:13 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.77 2005/06/19 23:01:56 vanquirius Exp $ + + 19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> + nessus-core-2.2.4.ebuild, nessus-core-2.2.4-r1.ebuild: + Fix file conflict with includes from nessus-libraries. 19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -nessus-core-2.0.12.ebuild, -nessus-core-2.2.0.ebuild, diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest index ba2448797c75..5a5215eae40c 100644 --- a/net-analyzer/nessus-core/Manifest +++ b/net-analyzer/nessus-core/Manifest @@ -1,7 +1,7 @@ -MD5 74facfc44f51bb1c77d803eb91faa126 nessus-core-2.2.4.ebuild 1250 +MD5 28e5f2bcdfd7fbac444b243499b340de nessus-core-2.2.4.ebuild 1342 MD5 aa32787a5b67b6a1883ad8a14dc68d50 nessus-core-2.3.1.ebuild 1420 -MD5 cff7e6a923cc8e4611a0b3cbdbc696f8 nessus-core-2.2.4-r1.ebuild 1325 -MD5 db92ff879058cef6012a9a0dbeb18340 ChangeLog 12001 +MD5 0e2089dfc4043fd951c01327a1b9ef04 nessus-core-2.2.4-r1.ebuild 1413 +MD5 5efc65cdbe188b0b9d49e9c92247ed0c ChangeLog 12168 MD5 883d45d6092c114bdf3d35a3ce45161a metadata.xml 244 MD5 775fc61d9c8d625c61c79319138b5432 files/digest-nessus-core-2.2.4-r1 69 MD5 775fc61d9c8d625c61c79319138b5432 files/digest-nessus-core-2.2.4 69 diff --git a/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild index d3519874a4ed..efd48f772ea9 100644 --- a/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild +++ b/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild,v 1.6 2005/06/19 21:19:13 vanquirius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild,v 1.7 2005/06/19 23:01:56 vanquirius Exp $ inherit toolchain-funcs eutils gnuconfig @@ -50,4 +50,6 @@ src_install() { newins ${FILESDIR}/nessusd-r7 nessusd keepdir /var/lib/nessus/logs keepdir /var/lib/nessus/users + # newer version is provided by nessus-libraries + rm ${D}/usr/include/nessus/includes.h } diff --git a/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild index 1dc35ba46725..ccee46d50653 100644 --- a/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild +++ b/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild,v 1.7 2005/06/02 14:58:42 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4.ebuild,v 1.8 2005/06/19 23:01:56 vanquirius Exp $ inherit toolchain-funcs @@ -45,4 +45,6 @@ src_install() { newins ${FILESDIR}/nessusd-r7 nessusd keepdir /var/lib/nessus/logs keepdir /var/lib/nessus/users + # newer version is provided by nessus-libraries + rm ${D}/usr/include/nessus/includes.h } |