--- nessusclient-1.0.2.orig/debian/dirs
+++ nessusclient-1.0.2/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man/man1
--- nessusclient-1.0.2.orig/debian/control.doc
+++ nessusclient-1.0.2/debian/control.doc
@@ -0,0 +1,19 @@
+Source: nessusclient
+Section: admin
+Priority: optional
+Maintainer: Javier Fernandez-Sanguino Pen~a <jfs@computer.org>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, xlibs-dev, libnessus-dev (>= 2.2.3), libglib1.2-dev, libglib2.0-dev, libgtk2.0-dev, libssl-dev, lyx-qt |lyx-xforms, textex-bin, tetex-base, tetex-extra, latex2html
+Standards-Version: 3.6.2
+
+Package: nessusclient
+Architecture: any
+Recommends: htmldoc
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: nessus 
+Description: Remote network security auditor, the client
+ This package provides the new client for the Nessus vulnerability
+ scanner. It has a nicer GUI than the old client and also supports
+ "Scopes" and "Tasks" which keep track of all the past scans and 
+ past plugins settings. It also supports for multiple scans at the 
+ same time and has the ability to export reports as PDF (if htmldoc 
+ is installed) 
--- nessusclient-1.0.2.orig/debian/nessus.menu
+++ nessusclient-1.0.2/debian/nessus.menu
@@ -0,0 +1,2 @@
+?package(nessus): needs="X11" section="Apps/System" title="Nessus" command="nessus" icon="/usr/share/pixmaps/nessus.xpm"           
+
--- nessusclient-1.0.2.orig/debian/docs
+++ nessusclient-1.0.2/debian/docs
@@ -0,0 +1 @@
+README_SSL
--- nessusclient-1.0.2.orig/debian/changelog
+++ nessusclient-1.0.2/debian/changelog
@@ -0,0 +1,46 @@
+nessusclient (1.0.2-1) unstable; urgency=low
+
+  * Remove non-free documents: doc/WARNING.En and doc/WARNING.Fr from the
+    source code, repackage the original tarball.
+  * Included information of BSD-licensed files in debian/copyright, the
+    OpenSSL exception allowing linkage of NessusClient to OpenSSL as 
+    well as more (c) statements that were missing.
+  * Remove xlibs-dev from Build-Deps
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@debian.org>  Tue, 12 Jun 2007 00:54:12 +0200
+
+nessusclient (1.0.0rc5-1) unstable; urgency=low
+
+  * New Release Candidate.
+    - Tested and ready to upload to NEW.
+  * Add Build-Depends on libx11-dev (>= 2:1.0.0), libxinerama-dev (>= 1:1.0.1),
+    and libxrandr-dev ( >= 2:1.1.0.2), since pkg-config is used and the
+    package will not build with old X11 libraries.
+  * Properly disable doc-base now
+  * Modify "nessusclient-mkcert.in" so that it uses the same location 
+    for the CA as the nessus package.
+  * Have debian/dirs create /usr/share/man/man1 so that the symlink is 
+    created properly.
+  * Fix the creation of the symbolic link to the NessusClient manpage.
+  * Remove the mkrand binary and manpage since they are provided by nessusd
+    and we do not want to conflict with it.
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Tue, 17 Oct 2006 23:30:26 +0200
+
+nessusclient (1.0.0.rc1-1) unstable; urgency=low
+
+  * Initial release based on the 'nessus' package patches:
+    - same menu file is used for registering and the main binary is called 'nessus'
+    (although NessusClient is a symlink to it)
+    - patched to use libgdchart-gd2
+    - Nessus stat files are under /var, sysconfig in /etc, etc.
+  * This package Conflicts: on nessus (the client) as it provides the same
+    functionality and same files are the same
+  * This package does not include the User's manual since it is not possible
+    to automatically compile the LyX files (LyX needs to regenerate the
+    references to TeX classes and that seems not to be possible from CLI). It
+    provides some of the files to add support for that in the future (if
+    upstream does not provide a TeX file I'll add it and compile that one)
+
+ -- Javier Fernandez-Sanguino Pen~a <jfs@computer.org>  Mon, 24 Oct 2005 10:50:23 +0200
+
--- nessusclient-1.0.2.orig/debian/copyright
+++ nessusclient-1.0.2/debian/copyright
@@ -0,0 +1,122 @@
+This package was first debianized by Javier Fernandez-Sanguino Peņa
+on Mon, 24 Oct 2005 13:41:22 +0200
+
+Original source can be found at: http://www.nessus.org/
+
+Upstream authors: 
+   Renaud Deraison <deraison_AT_cvs.nessus.org>
+   SSL support: Michel Arboi
+   HLST and Harglists libraries: Jordan Hrycaj <jordan_AT_mjh.teddy-net.com>
+
+Copyright:
+
+  Copyright (C) 1998 - 2005 Renaud Deraison
+  Copyright (C) 2004 by Intevation GmbH
+
+some portions are:
+
+  [ ./include/harglists.h ] 
+  Copyright (c) Nessus Consulting S.A.R.L., 2000 - 2001
+
+  [ ./include/hlst.h - HLST - a simple hash list manager ]
+  Copyright (c) mjh-EDV Beratung, 1996-1999
+
+  [ SSL support under libnessus/ and ssl/ ]
+  Copyright (C) 2001 - 2002 Michel Arboi
+
+  [ auto-configuration scripts ]
+  Copyright (C) 1992 - 2005 Free Software Foundation, Inc.
+
+  [ ./nessus/regex.c ]
+  Copyright (C) 1993 Free Software Foundation, Inc.
+
+  [ ./libnessus/getopt1.c ]
+  [ ./libnessus/getopt.c ]
+  Copyright (C) 1987, 88, 89, 90, 91, 1992 Free Software Foundation, Inc.
+
+
+The source code contains the gdchard library which is Copyright (C) 1989 by Jef
+Poskanzer. Although it is not used when building the binaries in the Debian
+package.
+
+This library also includes code with:
+
+ - Portions copyright 1994, 1995, 1996, 1997, 1998, by Cold Spring Harbor
+   Laboratory. Funded under Grant P41-RR02188 by the National Institutes of
+   Health.
+
+ - Portions copyright 1996, 1997, 1998, by Boutell.Com, Inc. 
+
+ - GIF decompression code copyright 1990, 1991, 1993, by David Koblas
+   (koblas@netcom.com).
+
+ - Non-LZW-based GIF compression code copyright 1998, by Hutchison Avenue
+   Software Corporation 
+
+License:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program 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 General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, 
+  MA  02110-1301  USA
+
+  In addition, as a special exception, Renaud Deraison
+  gives permission to link the code of this program with any
+  version of the OpenSSL library which is distributed under a
+  license identical to that listed in the included COPYING.OpenSSL
+  file, and distribute linked combinations including the two.
+  You must obey the GNU General Public License in all respects
+  for all of the code used other than OpenSSL.  If you modify
+  this file, you may extend this exception to your version of the
+  file, but you are not obligated to do so.  If you do not wish to
+  do so, delete this exception statement from your version.
+
+On Debian systems, the full text of the GNU GPL can always be
+found in the /usr/share/common-licenses/GPL file.
+
+In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the
+OpenSSL library under certain conditions as described in each
+individual source file, and distribute linked combinations
+including the two.
+You must obey the GNU General Public License in all respects
+for all of the code used other than OpenSSL.  If you modify
+file(s) with this exception, you may extend this exception to your
+version of the file(s), but you are not obligated to do so.  If
+you do not wish to do so, delete this exception statement from your
+version.  If you delete this exception statement from all source
+files in the program, then also delete it here.
+
+-------------------------------------------------------------------
+
+The GDchart license is the following: 
+
+Permission has been granted to copy and distribute gd in any
+context, including a commercial application, provided that this notice
+is present in user-accessible supporting documentation.
+
+This does not affect your ownership of the derived work itself, and the intent
+is to assure proper credit for the authors of gd, not to interfere
+with your productive use of gd. If you have questions, ask.
+"Derived works" includes all programs that utilize the library.
+Credit must be given in user-accessible documentation.
+
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.  This software is provided "as is" without express or
+implied warranty.
+
+-------------------------------------------------------------------
+
--- nessusclient-1.0.2.orig/debian/nessus.xpm
+++ nessusclient-1.0.2/debian/nessus.xpm
@@ -0,0 +1,482 @@
+/* XPM */
+static char * nessus_xpm[] = {
+"32 31 448 2",
+"  	c None",
+". 	c #FFFFFF",
+"+ 	c #FFFFFE",
+"@ 	c #FFFFFD",
+"# 	c #FFFEF8",
+"$ 	c #FFFEF5",
+"% 	c #FFFEF4",
+"& 	c #FFFEF6",
+"* 	c #FFFFFA",
+"= 	c #F9EBB4",
+"- 	c #F3D158",
+"; 	c #F1C939",
+"> 	c #F0C220",
+", 	c #F0BF18",
+"' 	c #EEBD13",
+") 	c #EEBD12",
+"! 	c #EFBE16",
+"~ 	c #F0C01A",
+"{ 	c #F0C324",
+"] 	c #F1C730",
+"^ 	c #F0CA3D",
+"/ 	c #F1CE4C",
+"( 	c #F4D35B",
+"_ 	c #F4D566",
+": 	c #F5DA75",
+"< 	c #F5DC80",
+"[ 	c #F4DE86",
+"} 	c #F4DF88",
+"| 	c #F6E08D",
+"1 	c #F6DF89",
+"2 	c #F5DF89",
+"3 	c #F4D76B",
+"4 	c #F3D053",
+"5 	c #F0CB3E",
+"6 	c #F1C835",
+"7 	c #F1D057",
+"8 	c #FFFEF9",
+"9 	c #F3D25B",
+"0 	c #F0BA00",
+"a 	c #F0BA01",
+"b 	c #EEBA07",
+"c 	c #FEF9E3",
+"d 	c #F6DF8A",
+"e 	c #E1AF07",
+"f 	c #EFBA04",
+"g 	c #FDF7DC",
+"h 	c #F9F0C5",
+"i 	c #EFBA02",
+"j 	c #E4B106",
+"k 	c #EFBA00",
+"l 	c #E4B206",
+"m 	c #CFA109",
+"n 	c #EAB504",
+"o 	c #EFBA05",
+"p 	c #EEBF1A",
+"q 	c #C89D0F",
+"r 	c #AC860C",
+"s 	c #ECB805",
+"t 	c #CEA00C",
+"u 	c #E5B205",
+"v 	c #FEF9E2",
+"w 	c #FFFDF3",
+"x 	c #EFBD10",
+"y 	c #AF8A0E",
+"z 	c #EFBA01",
+"A 	c #8B6E12",
+"B 	c #DAAB08",
+"C 	c #B8900C",
+"D 	c #EFB901",
+"E 	c #EDBA0A",
+"F 	c #FEFCEA",
+"G 	c #FCF6DC",
+"H 	c #EFBA03",
+"I 	c #EAB604",
+"J 	c #E2B005",
+"K 	c #917313",
+"L 	c #70590F",
+"M 	c #886B0F",
+"N 	c #EBB705",
+"O 	c #EDB803",
+"P 	c #C5990D",
+"Q 	c #EFBD11",
+"R 	c #FEFDF2",
+"S 	c #F9F1CB",
+"T 	c #C2970D",
+"U 	c #94740D",
+"V 	c #E4B207",
+"W 	c #93730C",
+"X 	c #775E0F",
+"Y 	c #A9840F",
+"Z 	c #EBB704",
+"` 	c #EFC01A",
+" .	c #FBF5D9",
+"..	c #C4990B",
+"+.	c #EDB904",
+"@.	c #D9AA09",
+"#.	c #B9910A",
+"$.	c #A9850C",
+"%.	c #9B7F10",
+"&.	c #9C8012",
+"*.	c #AB890F",
+"=.	c #C49A08",
+"-.	c #E2B209",
+";.	c #CEA209",
+">.	c #C19709",
+",.	c #C79C0A",
+"'.	c #AC860A",
+").	c #F1C529",
+"!.	c #FEFCEF",
+"~.	c #EFBB0A",
+"{.	c #EEB903",
+"].	c #97760E",
+"^.	c #98780F",
+"/.	c #AF8809",
+"(.	c #BE9F19",
+"_.	c #558F79",
+":.	c #0C7CB0",
+"<.	c #087CB3",
+"[.	c #0877AC",
+"}.	c #096997",
+"|.	c #15576E",
+"1.	c #595728",
+"2.	c #85690E",
+"3.	c #CB9F09",
+"4.	c #C1970A",
+"5.	c #E6B305",
+"6.	c #FFFFF8",
+"7.	c #EEC11E",
+"8.	c #BB920A",
+"9.	c #8F710F",
+"0.	c #C39909",
+"a.	c #ECB806",
+"b.	c #C79B0A",
+"c.	c #A0861A",
+"d.	c #2B6D74",
+"e.	c #096695",
+"f.	c #076593",
+"g.	c #076491",
+"h.	c #0A557A",
+"i.	c #0D4764",
+"j.	c #086FA1",
+"k.	c #228EAB",
+"l.	c #B89F20",
+"m.	c #785F0F",
+"n.	c #5A4912",
+"o.	c #BF960C",
+"p.	c #F0C835",
+"q.	c #FFFFFB",
+"r.	c #F0C42B",
+"s.	c #E6B306",
+"t.	c #94740F",
+"u.	c #C2980A",
+"v.	c #EAB706",
+"w.	c #AE880D",
+"x.	c #D4A609",
+"y.	c #669D75",
+"z.	c #0089CA",
+"A.	c #0383C0",
+"B.	c #066C9F",
+"C.	c #066594",
+"D.	c #0676AC",
+"E.	c #0482BE",
+"F.	c #0E415B",
+"G.	c #0C5E87",
+"H.	c #529984",
+"I.	c #D0A309",
+"J.	c #4F4013",
+"K.	c #786012",
+"L.	c #EFC11C",
+"M.	c #FFFFFC",
+"N.	c #EFC328",
+"O.	c #DCAC07",
+"P.	c #9D7B0E",
+"Q.	c #E7B406",
+"R.	c #C09609",
+"S.	c #97760F",
+"T.	c #DEAE07",
+"U.	c #E5B90D",
+"V.	c #118AB7",
+"W.	c #0A608C",
+"X.	c #08608B",
+"Y.	c #067CB5",
+"Z.	c #067BB3",
+"`.	c #0E4764",
+" +	c #0C5A81",
+".+	c #0385C2",
+"++	c #132F3F",
+"@+	c #0D7BAA",
+"#+	c #D7B618",
+"$+	c #EAB605",
+"%+	c #6D5813",
+"&+	c #5F4C13",
+"*+	c #ECB804",
+"=+	c #F0C62E",
+"-+	c #EEC01E",
+";+	c #E2B006",
+">+	c #B48D10",
+",+	c #EEB904",
+"'+	c #94740E",
+")+	c #A7830D",
+"!+	c #C5B226",
+"~+	c #09709E",
+"{+	c #0E4967",
+"]+	c #057DB7",
+"^+	c #11394E",
+"/+	c #0F4D6C",
+"(+	c #0B5F87",
+"_+	c #B0AD36",
+":+	c #5A4914",
+"<+	c #8E710F",
+"[+	c #F4D974",
+"}+	c #ECBC16",
+"|+	c #C4990F",
+"1+	c #947610",
+"2+	c #886C0F",
+"3+	c #C8B324",
+"4+	c #0C628A",
+"5+	c #0E5070",
+"6+	c #0579B3",
+"7+	c #076B9B",
+"8+	c #0A557B",
+"9+	c #096693",
+"0+	c #0F4E6D",
+"a+	c #0A628B",
+"b+	c #B1AD35",
+"c+	c #B79011",
+"d+	c #393015",
+"e+	c #F5DB7B",
+"f+	c #FEFCF1",
+"g+	c #E8B60B",
+"h+	c #EEB902",
+"i+	c #382F15",
+"j+	c #9B7B11",
+"k+	c #E8BA0B",
+"l+	c #1886AB",
+"m+	c #0F3B53",
+"n+	c #047FBA",
+"o+	c #0188C9",
+"p+	c #0575AC",
+"q+	c #047FB9",
+"r+	c #0386C4",
+"s+	c #10394F",
+"t+	c #0D80B0",
+"u+	c #D8B617",
+"v+	c #D9AA08",
+"w+	c #6C5714",
+"x+	c #4A3C14",
+"y+	c #A8840C",
+"z+	c #FEFBEC",
+"A+	c #EEBA04",
+"B+	c #D9AA07",
+"C+	c #5E4C13",
+"D+	c #645012",
+"E+	c #D7A809",
+"F+	c #74A067",
+"G+	c #0480BB",
+"H+	c #0A5981",
+"I+	c #086898",
+"J+	c #047CB6",
+"K+	c #0380BC",
+"L+	c #0571A5",
+"M+	c #0B557A",
+"N+	c #0676AD",
+"O+	c #5B9B7B",
+"P+	c #EAB705",
+"Q+	c #95760F",
+"R+	c #473A14",
+"S+	c #A2800D",
+"T+	c #EDB804",
+"U+	c #F2CE4A",
+"V+	c #FEFBEB",
+"W+	c #B18B0C",
+"X+	c #524313",
+"Y+	c #7B6211",
+"Z+	c #D6A709",
+"`+	c #E5B90C",
+" @	c #3E9593",
+".@	c #0089C9",
+"+@	c #0287C6",
+"@@	c #057CB5",
+"#@	c #0577AF",
+"$@	c #0189C9",
+"%@	c #2C8EA3",
+"&@	c #938020",
+"*@	c #5C4A12",
+"=@	c #F1CC45",
+"-@	c #FEFAE9",
+";@	c #EDB903",
+">@	c #B8910A",
+",@	c #6F5811",
+"'@	c #6C5610",
+")@	c #9D7B0C",
+"!@	c #BC9B17",
+"~@	c #639873",
+"{@	c #1189BB",
+"]@	c #0585C2",
+"^@	c #047EB9",
+"/@	c #086C9A",
+"(@	c #205966",
+"_@	c #685D1F",
+":@	c #AE890B",
+"<@	c #F1CD47",
+"[@	c #FEFAE8",
+"}@	c #E9B606",
+"|@	c #C79C08",
+"1@	c #A27F0B",
+"2@	c #947509",
+"3@	c #877114",
+"4@	c #8B7819",
+"5@	c #A2820F",
+"6@	c #C59B09",
+"7@	c #E8B507",
+"8@	c #F1C937",
+"9@	c #FDF9E5",
+"0@	c #C99D0A",
+"a@	c #947510",
+"b@	c #695412",
+"c@	c #5B4A13",
+"d@	c #D3A508",
+"e@	c #FDF8E1",
+"f@	c #B68F0D",
+"g@	c #5E4C16",
+"h@	c #EBB706",
+"i@	c #A7840F",
+"j@	c #7A6111",
+"k@	c #E6B406",
+"l@	c #DBAB0A",
+"m@	c #D6A70B",
+"n@	c #D7A80B",
+"o@	c #DDAC09",
+"p@	c #EAB603",
+"q@	c #DAAA0A",
+"r@	c #F0BA02",
+"s@	c #EEBB0C",
+"t@	c #FEFCEC",
+"u@	c #FCF7DD",
+"v@	c #B68F0E",
+"w@	c #776016",
+"x@	c #C59B0D",
+"y@	c #685416",
+"z@	c #CDA009",
+"A@	c #534313",
+"B@	c #634F11",
+"C@	c #886C10",
+"D@	c #6D5712",
+"E@	c #6A5613",
+"F@	c #AC870A",
+"G@	c #604D12",
+"H@	c #6F5A14",
+"I@	c #B48D0A",
+"J@	c #403516",
+"K@	c #685413",
+"L@	c #B9920F",
+"M@	c #413614",
+"N@	c #745C0F",
+"O@	c #DBAA06",
+"P@	c #FCF4D5",
+"Q@	c #FCF6DB",
+"R@	c #876B12",
+"S@	c #59491A",
+"T@	c #77601B",
+"U@	c #634F16",
+"V@	c #A9860F",
+"W@	c #614E12",
+"X@	c #A07F0D",
+"Y@	c #635012",
+"Z@	c #C0960B",
+"`@	c #3F3518",
+" #	c #675415",
+".#	c #C3990B",
+"+#	c #785F10",
+"@#	c #705A11",
+"##	c #DFAD06",
+"$#	c #F8ECB9",
+"%#	c #FBF6D9",
+"&#	c #C59A0D",
+"*#	c #685417",
+"=#	c #AD880C",
+"-#	c #5D4C15",
+";#	c #9D7D12",
+">#	c #CA9D09",
+",#	c #B28C0B",
+"'#	c #927515",
+")#	c #5C4A13",
+"!#	c #8A6E17",
+"~#	c #695413",
+"{#	c #493C15",
+"]#	c #9B7B12",
+"^#	c #3D3418",
+"/#	c #9A790E",
+"(#	c #625018",
+"_#	c #A7830C",
+":#	c #F7E6A2",
+"<#	c #DAAA06",
+"[#	c #C3980A",
+"}#	c #E0AE06",
+"|#	c #BD940B",
+"1#	c #BD950A",
+"2#	c #AA850C",
+"3#	c #E6B304",
+"4#	c #CC9F08",
+"5#	c #A5820B",
+"6#	c #A6830B",
+"7#	c #E1AF06",
+"8#	c #D2A408",
+"9#	c #A8840B",
+"0#	c #AF8A0D",
+"a#	c #DEAD05",
+"b#	c #B08A0A",
+"c#	c #F7E49D",
+"d#	c #FEF9E7",
+"e#	c #F7EAB2",
+"f#	c #EEBC0E",
+"g#	c #EEBD11",
+"h#	c #F0C322",
+"i#	c #F0C526",
+"j#	c #F0C21D",
+"k#	c #F2C21A",
+"l#	c #F1C21E",
+"m#	c #EFC21C",
+"n#	c #F0BE0C",
+"o#	c #F0BC05",
+"p#	c #EFBC0F",
+"q#	c #FDFAE8",
+"r#	c #F5DB7D",
+"s#	c #F1C93A",
+"t#	c #F3D35B",
+"u#	c #F4D76C",
+"v#	c #F4D871",
+"w#	c #F6DC80",
+"x#	c #F7E293",
+"y#	c #F8EAB2",
+"z#	c #FAF1CC",
+"A#	c #FDF9E2",
+"B#	c #FAF2D2",
+"C#	c #F6E190",
+"D#	c #F6E193",
+"E#	c #F7E49B",
+"F#	c #F6E7A5",
+"G#	c #F2D872",
+"H#	c #F2D564",
+"I#	c #F3D871",
+"J#	c #F3D564",
+"K#	c #F1C734",
+"L#	c #EEBB0A",
+"M#	c #F5DD84",
+"N#	c #FEFCEE",
+"O#	c #FBF3D0",
+". . . + @ # $ % % & * + + . . . . . . . . . . . . . . + + . . . ",
+". = - ; > , ' ) ) ! ~ { ] ^ / ( _ : < [ } [ | 1 2 3 4 5 6 7 8 . ",
+". 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 a 0 0 0 0 0 0 b c . ",
+". d 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 e 0 0 0 0 0 0 0 0 0 0 f g . ",
+". h i 0 0 0 0 0 0 0 0 0 0 j k 0 0 l m 0 0 0 0 n 0 0 0 0 0 o g . ",
+". & p 0 0 0 0 0 0 0 0 0 0 q 0 0 0 r s 0 0 0 t u 0 0 0 0 0 b v . ",
+". w x 0 0 0 0 0 0 0 0 0 0 y 0 0 z A a 0 0 B C 0 0 D 0 0 0 E F . ",
+". G H 0 0 0 0 0 0 I J 0 0 K a 0 s L 0 0 a M N 0 O P a 0 0 Q R . ",
+". S i 0 0 0 0 0 0 i T 0 0 U N 0 V W 0 0 B X 0 a Y Z 0 0 0 ` * . ",
+".  .H 0 0 0 0 0 0 0 ..+.@.#.$.%.&.*.=.-.;.>.0 ,.'.0 0 0 0 ).@ . ",
+". !.~.0 0 0 0 0 {.>.].^./.(._.:.<.[.}.|.1.2.3.4.5.0 0 0 0 ^ + . ",
+". 6.7.0 0 0 i 8.9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.a 0 0 0 p.+ . ",
+". q.r.0 0 s.t.u.v.w.Y x.y.z.A.B.C.D.E.F.G.H.H I.J.K.I 0 0 L.M.. ",
+". q.N.0 O.P.Q.R.S.T.0 U.V.W.X.Y.Z.`. +.+++@+#+0 $+%+&+*+0 =+@ . ",
+". 6.-+;+>+,+'+)+i 0 0 !+~+{+z.z.z.]+^+z./+(+_+0 0 O :+<+0 [+. . ",
+". $ }+|+i 1+2+a 0 0 0 3+4+5+z.6+7+8+9+z.0+a+b+0 0 a c+d+H e+. . ",
+". f+g+h+*+i+j+i 0 0 0 k+l+m+n+o+p+q+z.r+s+t+u+0 v+w+x+y+z 4 + . ",
+". z+A+0 0 B+C+D+E+0 0 a F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+0 0 U++ . ",
+". V+f 0 0 0 i W+X+Y+Z+a `+ @.@+@@@#@E.$@%@&@*@Q+$+0 0 0 0 =@+ . ",
+". -@f 0 0 0 0 0 ;@>@,@'@)@!@~@{@]@^@/@(@_@:@N 0 0 0 0 0 0 <@+ . ",
+". [@f 0 0 0 0 a z 0 a }@|@1@2@3@4@5@6@7@a 0 0 0 0 0 0 0 0 8@+ . ",
+". 9@f 0 0 0@a@b@c@d@0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ` * . ",
+". e@H 0 0 f@g@h@i@j@0 k@l@a {.m@Z T+m@T+n@a o@p@s.q@r@0 0 s@t@. ",
+". u@H 0 0 v@w@0 x@y@z@A@B@C@D@E@F@G@H@I@J@o K@L@M@N@O@0 0 i P@. ",
+". Q@H 0 0 v@w@0 x@y@R@S@T@U@V@W@C X@Y@Z@`@o  #.#+#@###0 0 0 $#. ",
+". %#H 0 0 v@w@0 &#*#=#-#;#>#,#'#)#=#!#~#{#]#^#.#/#(#_#0 0 0 :#. ",
+". u@H 0 0 <#[#0 }#|#i 1#2#3#4#5#O.|@6#7#8#9#0#a#,#b#O 0 0 0 c#. ",
+". d#f 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 e#. ",
+". R f#0 0 0 0 0 0 0 a b g#h#i#j#k#l#m#n#o#0 0 0 0 0 0 0 0 p#q#. ",
+". + r#s#t#u#v#w#x#y#z#A#R M.B#C#D#E#F#G#H#3 I#[+J#K#L#i o M#+ . ",
+". . + + . . . . . . . . . . . . . . . . . . . . . @ N#O#Q@@ . . "};
--- nessusclient-1.0.2.orig/debian/compat
+++ nessusclient-1.0.2/debian/compat
@@ -0,0 +1 @@
+4
--- nessusclient-1.0.2.orig/debian/rules
+++ nessusclient-1.0.2/debian/rules
@@ -0,0 +1,122 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
+		--mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info  \
+		--sysconfdir=/etc --localstatedir=/var --sharedstatedir=/var \
+		-libdir='$${localstatedir}/lib'
+		--enable-gtk --with-ssl --enable-client
+# For debugging
+               # --enable-debug
+
+
+build: build-stamp
+
+build-stamp:  config.status
+	dh_testdir
+
+	$(MAKE)
+	# Unfortunately, this cannot work as we need to reconfigure
+	# LyX after installation and there is no way to do it from the CLI
+	# cd doc/man/ && $(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	-$(MAKE) distclean
+	# Just in case we build it to test it out
+	cd doc/man/ && $(MAKE) clean || true
+
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs usr/share/pixmaps
+	install -m 644 debian/nessus.xpm $(CURDIR)/debian/nessusclient/usr/share/pixmaps
+
+	# Add here commands to install the package into debian/nessusclient.
+	$(MAKE) install prefix=$(CURDIR)/debian/nessusclient/usr
+	# Make the NessusClient 'nessus' (the manpage refers to that as the client and
+	# people moving from the nessus package might be more comfortable with that one)
+	mv $(CURDIR)/debian/nessusclient/usr/bin/NessusClient $(CURDIR)/debian/nessusclient/usr/bin/nessus
+	# Symlink to NessusClient, however
+	(cd $(CURDIR)/debian/nessusclient/usr/bin/ && ln -s nessus NessusClient)
+	(cd $(CURDIR)/debian/nessusclient/usr/share/man/man1/ && ln -s NessusClient.1.gz nessus.1.gz)
+	# Remove the nessus-mkrand contents, we don't distribute that binary
+	# and it is in nessusd
+	-rm -f $(CURDIR)/debian/nessusclient/usr/bin/nessus-mkrand*
+	-rm -f $(CURDIR)/debian/nessusclient/usr/share/man/man1/nessus-mkrand.1*
+
+	# Documentation (user manual)
+	# cd doc/man/ && $(MAKE) install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs CHANGES
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+	dh_installmenu
+#	dh_installdebconf	
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- nessusclient-1.0.2.orig/debian/control
+++ nessusclient-1.0.2/debian/control
@@ -0,0 +1,19 @@
+Source: nessusclient
+Section: admin
+Priority: optional
+Maintainer: Javier Fernandez-Sanguino Pen~a <jfs@computer.org>
+Build-Depends: debhelper (>= 4.0.0), autotools-dev, libnessus-dev (>= 2.2.3), libglib1.2-dev, libglib2.0-dev, libgtk2.0-dev, libssl-dev, libgdchart-gd2-noxpm-dev, libx11-dev (>= 2:1.0.0), libxinerama-dev (>= 1:1.0.1), libxrandr-dev (>= 2:1.1.0.2)
+Standards-Version: 3.6.2
+
+Package: nessusclient
+Architecture: any
+Recommends: htmldoc
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: nessus 
+Description: Remote network security auditor, the client
+ This package provides the new client for the Nessus vulnerability
+ scanner. It has a nicer GUI than the old client and also supports
+ "Scopes" and "Tasks" which keep track of all the past scans and 
+ past plugins settings. It also supports for multiple scans at the 
+ same time and has the ability to export reports as PDF (if htmldoc 
+ is installed) 
--- nessusclient-1.0.2.orig/debian/nessusclient.doc-DISABLED-base
+++ nessusclient-1.0.2/debian/nessusclient.doc-DISABLED-base
@@ -0,0 +1,18 @@
+Document: nessusmanual
+Title: Nessus User's Manual
+Author: Renaud Deraison and Jan-Oliver Wagner 
+Abstract: This document describes how to use a Nessus Server via the 
+ NessusClient (also called 'nessus') GTK+ GUI.
+Section: unknown
+
+Format: postscript
+Files: /usr/share/doc/nessusclient/users-manual.ps.gz
+
+Format: text
+Files: /usr/share/doc/nessusclient/users-manual.text.gz
+
+Format: HTML
+Index: /usr/share/doc/nessusclient/html/index.html
+Files: /usr/share/doc/nessusclient/html/*.html
+
+  
--- nessusclient-1.0.2.orig/config.guess
+++ nessusclient-1.0.2/config.guess
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-06-30'
+timestamp='2007-03-06'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,7 +107,7 @@
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -125,7 +126,7 @@
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -160,6 +161,7 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -206,8 +208,11 @@
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -623,8 +628,7 @@
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+	    eval $set_cc_for_build
 
 	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
@@ -765,12 +769,19 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -780,9 +791,15 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
+    *:Interix*:[3456]*)
+    	case ${UNAME_MACHINE} in
+	    x86) 
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    EM64T | authenticamd)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
@@ -795,7 +812,7 @@
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
@@ -818,6 +835,9 @@
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
@@ -852,7 +872,11 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
@@ -871,9 +895,16 @@
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
@@ -917,9 +948,15 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -962,7 +999,7 @@
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@@ -972,7 +1009,11 @@
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@@ -1174,6 +1215,15 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1183,7 +1233,6 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1262,6 +1311,9 @@
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
--- nessusclient-1.0.2.orig/config.sub
+++ nessusclient-1.0.2/config.sub
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2005-07-04'
+timestamp='2007-01-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +120,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -171,6 +173,10 @@
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +193,10 @@
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,15 +241,16 @@
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
+	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -257,28 +268,27 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -286,6 +296,9 @@
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -305,18 +318,18 @@
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -336,31 +349,30 @@
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -696,6 +708,9 @@
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -803,6 +818,12 @@
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -859,6 +880,10 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -885,6 +910,10 @@
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -896,6 +925,9 @@
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1101,7 +1133,7 @@
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1174,20 +1206,23 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1205,7 +1240,7 @@
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1339,6 +1374,12 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1348,9 +1389,9 @@
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1376,6 +1417,9 @@
 	m68*-cisco)
 		os=-aout
 		;;
+        mep-*)
+		os=-elf
+		;;
 	mips*-cisco)
 		os=-elf
 		;;
@@ -1394,6 +1438,9 @@
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
--- nessusclient-1.0.2.orig/configure.in
+++ nessusclient-1.0.2/configure.in
@@ -507,14 +507,14 @@
 
 
 NESSUSD_CONFDIR='${sysconfdir}'
-NESSUSD_STATEDIR='${localstatedir}/nessus'
-NESSUSD_SHAREDSTATEDIR='${sharedstatedir}/nessus'
+NESSUSD_STATEDIR='${localstatedir}/lib/nessus'
+NESSUSD_SHAREDSTATEDIR='${sharedstatedir}/lib/nessus'
 NESSUSD_DATADIR='${sysconfdir}/nessus'
 NESSUSD_LIBDIR='${libdir}/nessus'
-NESSUSD_LOGDIR='${localstatedir}/nessus/logs'
+NESSUSD_LOGDIR='${localstatedir}/log/nessus'
 
 NESSUSD_PLUGINS='${NESSUSD_LIBDIR}/plugins'
-NESSUSD_REPORTS='${NESSUSD_LIBDIR}/reports'
+NESSUSD_REPORTS='${NESSUSD_LOGDIR}/reports'
 
  
 man_nessus_1=doc/NessusClient.1
--- nessusclient-1.0.2.orig/nessus/Makefile
+++ nessusclient-1.0.2/nessus/Makefile
@@ -1,9 +1,9 @@
 include ../nessus.tmpl
 
 GTKLIBS= $(GTKCONFIG_LIBS)
-INCLUDE = ${include} $(GTKCONFIG_CFLAGS) -Igdchart0.94b -Igdchart0.94b/gd1.3
+INCLUDE = ${include} $(GTKCONFIG_CFLAGS)
 LIBS = $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) \
-	$(RUN_LIBS) $(C_R_LIB) gdchart0.94b/gd1.3/libgd.a -lm  -L../libnessus -lnessus-client -lssl -lcrypto $(DL_LIB) -lz $(SOCKET_LIB)
+	$(RUN_LIBS) $(C_R_LIB) -lm -lgdc -L../libnessus -lnessus-client -lssl -lcrypto $(DL_LIB) -lz $(SOCKET_LIB)
 
 NESSUS_INCLUDE=`sh ./cflags`	
 
@@ -49,10 +49,6 @@
        prefs_kb.o \
        listnotebook.o \
        read_target_file.o \
-       gdchart0.94b/gdc.o \
-       gdchart0.94b/price_conv.o \
-       gdchart0.94b/gdc_pie.o \
-       gdchart0.94b/gdchart.o \
        regex.o \
        filter.o \
        dirutils.o \
--- nessusclient-1.0.2.orig/nessus/html_graph_output.c
+++ nessusclient-1.0.2/nessus/html_graph_output.c
@@ -66,9 +66,13 @@
  -------------------------------------------------------------------*/	
 #include <includes.h>
 #include "nessus_i18n.h"
-#include "gdchart0.94b/gdc.h"
-#include "gdchart0.94b/gdchart.h"
-#include "gdchart0.94b/gdcpie.h"
+#ifndef HAVE_LIBFREETYPE
+/* prevent undefined references in gdc (http://bugs.debian.org/242936) */
+# define HAVE_LIBFREETYPE 0
+#endif
+#include <gdc.h>
+#include <gdchart.h>
+#include <gdcpie.h>
 #include "report.h"
 #include "report_utils.h"
 #include "error_dialog.h"
@@ -79,8 +83,6 @@
 static void insert_img(FILE *, char*);
 
 
-extern int out_graph(short, short, FILE *, GDC_CHART_T, int, char **, int, ...);
-
 
 
 /*
@@ -968,7 +970,7 @@
     GDCPIE_label_dist = 15;
     GDCPIE_LineColor = 0x000000L;
     GDCPIE_PlotColor =  0xC0C0C0L;
-    GDCPIE_EdgeColor = 0x000000L;
+    GDCPIE_EdgeColor = GDC_NOCOLOR; /* http://bugs.debian.org/326502 */
     GDCPIE_label_size = GDC_SMALL;
     GDCPIE_title_size = GDC_MEDBOLD;
     GDCPIE_3d_angle  = 45;
@@ -978,8 +980,10 @@
     GDC_generate_gif = TRUE;
     GDC_hold_img = GDC_DESTROY_IMAGE;
     GDC_image = NULL;
+    GDC_image_type = GDC_GIF;
     GDCPIE_missing = NULL;
     GDCPIE_percent_labels = GDCPIE_PCT_RIGHT;
+    GDCPIE_percent_fmt = " (%.0f%%)";
 
     /* remove zero elements */
     {
@@ -1119,9 +1123,11 @@
     GDCPIE_explode   = expl;
     GDCPIE_Color = clr;
     GDCPIE_BGColor = 0xFFFFFFL;
-    GDCPIE_EdgeColor = 0x000000L;
+    GDCPIE_EdgeColor = GDC_NOCOLOR; /* http://bugs.debian.org/326502 */
     GDCPIE_missing = NULL;
     GDCPIE_percent_labels = GDCPIE_PCT_RIGHT;
+    GDCPIE_percent_fmt = " (%.0f%%)";
+    GDC_image_type = GDC_GIF;
     pie_gif(480, 360, pie, GDC_3DPIE, num_risks, lbl, risks_f);
     fclose(pie);
     insert_img(f, "pie_risks.gif");
@@ -1154,6 +1160,7 @@
      GDC_BGColor   = 0xFFFFFFL;                  /* backgound color (white) */
      GDC_LineColor = 0x000000L;                  /* line color      (black) */
      GDC_SetColor = &(color);
+     GDC_image_type = GDC_GIF;
      out_graph(480, 360, chart, GDC_3DBAR, num, services, 1, value);
      fclose(chart);
      insert_img(f, "chart_dangerous_services.gif");
@@ -1187,6 +1194,7 @@
      GDC_BGColor   = 0xFFFFFFL;                  /* backgound color (white) */
      GDC_LineColor = 0x000000L;                  /* line color      (black) */
      GDC_SetColor = color;
+     GDC_image_type = GDC_GIF;
      out_graph(480, 360, chart, GDC_3DBAR, num, services, 1, value);
      fclose(chart);
      insert_img(f, "chart_services_occurences.gif");
@@ -1218,6 +1226,7 @@
      GDC_BGColor   = 0xFFFFFFL;                  /* backgound color (white) */
      GDC_LineColor = 0x000000L;                  /* line color      (black) */
      GDC_SetColor = &(color);
+     GDC_image_type = GDC_GIF;
      out_graph(480, 360, chart, GDC_3DBAR, num, oses, 1, value);
      fclose(chart);
      insert_img(f, "chart_operating_systems.gif");
@@ -1270,9 +1279,11 @@
     GDCPIE_explode   = expl;
     GDCPIE_Color = clr;
     GDCPIE_BGColor = 0xFFFFFFL;
-    GDCPIE_EdgeColor = 0x000000L;
+    GDCPIE_EdgeColor = GDC_NOCOLOR; /* http://bugs.debian.org/326502 */
     GDCPIE_missing = NULL;
     GDCPIE_percent_labels = GDCPIE_PCT_RIGHT;
+    GDCPIE_percent_fmt = " (%.0f%%)";
+    GDC_image_type = GDC_GIF;
     pie_gif(480, 360, pie, GDC_3DPIE, 2,names, values);
     fclose(pie);
     insert_img(f, "pie_most.gif");
--- nessusclient-1.0.2.orig/nessusclient-mkcert.in
+++ nessusclient-1.0.2/nessusclient-mkcert.in
@@ -112,8 +112,8 @@
 
 
 
-NESSUSPRIV="$localstatedir/nessus/CA"
-NESSUSPUB="$sharedstatedir/nessus/CA"
+NESSUSPRIV="${localstatedir}/lib/nessus/private/CA"
+NESSUSPUB="${sharedstatedir}/lib/nessus/CA"
 
 while [ ! -d "$NESSUSPRIV" ]; do
     gettext "Nessus server 'private' directory: "
--- nessusclient-1.0.2.orig/doc/man/Makefile
+++ nessusclient-1.0.2/doc/man/Makefile
@@ -2,9 +2,16 @@
 
 all: users-manual.pdf users-manual-de.pdf users-manual.html users-manual-de.html
 
-LYX=lyx
+#LYX=lyx
+LYX = /usr/bin/lyx-qt
+# Alternatives:
+# LYX = /usr/bin/lyx
+# LYX = /usr/bin/lyx-xforms
 
 %.pdf: %.lyx
+	# Reconfigure lyx, just in case it is not, to make it
+	# find the article class
+	$(LYX) -x reconfigure
 	$(LYX) -e pdf $< && $(LYX) -e pdf $<
 
 %.tex: %.lyx