[Openvas-commits] r12019 - in trunk/openvas-client: . openvas

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2011-11-07 12:39:43 +0100 (Mon, 07 Nov 2011)
New Revision: 12019

Removed:
   trunk/openvas-client/openvas/globals.w32
Modified:
   trunk/openvas-client/COPYING.README
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/MANIFEST
   trunk/openvas-client/openvas/globals.h
Log:
Remove last LGPL licensed file and references to the LGPL.

  * openvas/globals.w32: Removed.

  * openvas/globals.h: Remove obsolete include of globals.w32.

  * MANIFEST: Remove globals.w32 from manifest.

  * COPYING.README: Remove now obsolete references to the LGPL.


Modified: trunk/openvas-client/COPYING.README
===================================================================
--- trunk/openvas-client/COPYING.README	2011-11-07 11:27:17 UTC (rev 12018)
+++ trunk/openvas-client/COPYING.README	2011-11-07 11:39:43 UTC (rev 12019)
@@ -48,11 +48,10 @@
 
 License:
 
-This package holds software with three four different licenses:
+This package holds software with two different licenses:
 
 - GNU General Public License version 2 or later: the GUI itself (the frontend)
 - GNU General Public License version 2: the nessus backend
-- GNU Library General Public License version 2 or later: some files of the nessus backend
 
 The following text explains which licenses apply to which parts of the code. In
 case of doubt the interested party should review the copyright headers of the

Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2011-11-07 11:27:17 UTC (rev 12018)
+++ trunk/openvas-client/ChangeLog	2011-11-07 11:39:43 UTC (rev 12019)
@@ -1,5 +1,17 @@
 2011-11-07  Michael Wiegand <michael.wiegand at greenbone.net>
 
+	Remove last LGPL licensed file and references to the LGPL.
+
+	* openvas/globals.w32: Removed.
+
+	* openvas/globals.h: Remove obsolete include of globals.w32.
+
+	* MANIFEST: Remove globals.w32 from manifest.
+
+	* COPYING.README: Remove now obsolete references to the LGPL.
+
+2011-11-07  Michael Wiegand <michael.wiegand at greenbone.net>
+
 	* COPYING, openvas/COPYING: Update with fresh copies obtained
 	from http://www.gnu.org/licenses/old-licenses/ to ensure the licenses
 	contains the correct address of the Free Software Foundation and to

Modified: trunk/openvas-client/MANIFEST
===================================================================
--- trunk/openvas-client/MANIFEST	2011-11-07 11:27:17 UTC (rev 12018)
+++ trunk/openvas-client/MANIFEST	2011-11-07 11:39:43 UTC (rev 12019)
@@ -41,7 +41,6 @@
 openvas/filter.c
 openvas/filter.h
 openvas/globals.h
-openvas/globals.w32
 openvas/gtk-compat.h
 openvas/html_graph_output.c
 openvas/html_graph_output.h

Modified: trunk/openvas-client/openvas/globals.h
===================================================================
--- trunk/openvas-client/openvas/globals.h	2011-11-07 11:27:17 UTC (rev 12018)
+++ trunk/openvas-client/openvas/globals.h	2011-11-07 11:39:43 UTC (rev 12019)
@@ -9,10 +9,6 @@
 extern int F_quiet_mode;
 extern int ListOnly;
 
-#ifdef _WIN32
-# include "globals.w32"
-#endif /* _WIN32 */
-
 #define HANDLE int
 
 #endif

Deleted: trunk/openvas-client/openvas/globals.w32
===================================================================
--- trunk/openvas-client/openvas/globals.w32	2011-11-07 11:27:17 UTC (rev 12018)
+++ trunk/openvas-client/openvas/globals.w32	2011-11-07 11:39:43 UTC (rev 12019)
@@ -1,28 +0,0 @@
-/* OpenVAS Client
- * Copyright (C) 1998 Renaud Deraison
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef _OPENVAS_GLOBALS_W32
-#define _OPENVAS_GLOBALS_W32
-
-#undef getpid
-#undef getcwd
-#undef close
-#undef open
-#undef read
-
-#endif