From 964be19fb3d547e5c14a2f050f7fbc831c83e75b Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sat, 3 May 2008 18:30:28 +0200 Subject: [PATCH] [argus-clients] Updated (3.0.0.rc.46-2 -> 3.0.0) Note: After some upstream versioning limbo, this is the official first release of argus 3.0 considered to be an release-candidate. Bug fixes for this version will make its way into the upcoming 3.0.1! --- network/argus-clients/argus-clients.desc | 6 +++--- .../argus-clients/check-for-argusbug.patch | 19 ++++++++++++++----- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/network/argus-clients/argus-clients.desc b/network/argus-clients/argus-clients.desc index d8cfc5a99..613548f00 100644 --- a/network/argus-clients/argus-clients.desc +++ b/network/argus-clients/argus-clients.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../argus-clients/argus-clients.desc -[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -34,8 +34,8 @@ [L] OpenSource [S] Beta -[V] 3.0.0.rc.46-2 +[V] 3.0.0 [P] X -----5---9 180.100 -[D] 3735347272 argus-clients-3.0.0.rc.46-2.tar.gz !ftp://qosient.com/dev/argus-3.0/argus-clients-3.0.0.rc.46.tar.gz +[D] 69853162 argus-clients-3.0.0.tar.gz http://qosient.com/argus/src/ diff --git a/network/argus-clients/check-for-argusbug.patch b/network/argus-clients/check-for-argusbug.patch index 5f57b1755..3ba5e2bdd 100644 --- a/network/argus-clients/check-for-argusbug.patch +++ b/network/argus-clients/check-for-argusbug.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../argus-clients/check-for-argusbug.patch -# Copyright (C) 2006 The OpenSDE Project +# Copyright (C) 2006 - 2008 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,12 +14,21 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./Makefile.in.orig 2006-10-15 19:38:27.000000000 +0200 -+++ ./Makefile.in 2006-10-15 19:40:18.000000000 +0200 -@@ -86,7 +86,8 @@ - fi; \ +Author: Christian Wiese +Upstream Status: Problem was reported long time ago, but for the author it + doesn't seem to be a problem that has to be addressed. +Description: Both, argus and argus-clients do install the 'argusbug' script + supposed to be used for bug reporting. + Because installing the same file by 2 different packages is against + OpenSDE policy we do check for its existence before we are going + to install it or not. + +--- argus-clients-3.0.0/Makefile.in.orig 2008-03-11 00:41:33.000000000 +0100 ++++ argus-clients-3.0.0/Makefile.in 2008-05-03 18:09:15.000000000 +0200 +@@ -94,7 +94,8 @@ done $(INSTALL) -m 0644 $(srcdir)/support/Config/rarc $(DESTDIR)$(prefix)/argus + $(INSTALL) -m 0644 $(srcdir)/support/Config/delegated-ipv4-latest $(DESTDIR)$(prefix)/argus - $(INSTALL) -m 0755 $(srcdir)/bin/argusbug $(DESTDIR)@bindir@/argusbug + [ -f $(DESTDIR)@bindir@/argusbug ] || \ + $(INSTALL) -m 0755 $(srcdir)/bin/argusbug $(DESTDIR)@bindir@/argusbug